Skip to content

Commit 304b7f7

Browse files
committed
Constraints priorities updated for page content
1 parent f48d80e commit 304b7f7

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

EAIntroView/EAIntroView.m

+8-4
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,9 @@ - (UIView *)viewForPage:(EAIntroPage *)page atXIndex:(CGFloat)xIndex {
374374
titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
375375

376376
[pageView addSubview:titleLabel];
377-
[pageView addConstraint:[NSLayoutConstraint constraintWithItem:pageView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:titleLabel attribute:NSLayoutAttributeTop multiplier:1.0 constant:page.titlePositionY]];
377+
NSLayoutConstraint *weakConstraint = [NSLayoutConstraint constraintWithItem:pageView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:titleLabel attribute:NSLayoutAttributeTop multiplier:1.0 constant:page.titlePositionY];
378+
weakConstraint.priority = UILayoutPriorityDefaultHigh;
379+
[pageView addConstraint:weakConstraint];
378380
[pageView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-10-[titleLabel]-10-|" options:NSLayoutFormatAlignAllTop metrics:nil views:@{@"titleLabel" : titleLabel}]];
379381
}
380382

@@ -391,7 +393,9 @@ - (UIView *)viewForPage:(EAIntroPage *)page atXIndex:(CGFloat)xIndex {
391393
descLabel.translatesAutoresizingMaskIntoConstraints = NO;
392394

393395
[pageView addSubview:descLabel];
394-
[pageView addConstraint:[NSLayoutConstraint constraintWithItem:pageView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:descLabel attribute:NSLayoutAttributeTop multiplier:1.0 constant:page.descPositionY]];
396+
NSLayoutConstraint *weakConstraint = [NSLayoutConstraint constraintWithItem:pageView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:descLabel attribute:NSLayoutAttributeTop multiplier:1.0 constant:page.descPositionY];
397+
weakConstraint.priority = UILayoutPriorityDefaultHigh;
398+
[pageView addConstraint:weakConstraint];
395399
[pageView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[descLabel]-|" options:NSLayoutFormatAlignAllTop metrics:nil views:@{@"descLabel" : descLabel}]];
396400
}
397401

@@ -440,7 +444,7 @@ - (void)buildTitleView {
440444
NSDictionary *views = @{@"titleView" : self.titleView};
441445
NSDictionary *metrics = @{@"titleViewTopPadding" : @(self.titleViewY), @"titleViewHeight" : @(self.titleView.frame.size.height), @"titleViewWidth" : @(self.titleView.frame.size.width)};
442446

443-
[self.titleViewConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-titleViewTopPadding-[titleView(titleViewHeight)]" options:NSLayoutFormatAlignAllLeft metrics:metrics views:views]];
447+
[self.titleViewConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-titleViewTopPadding@750-[titleView(titleViewHeight)]" options:NSLayoutFormatAlignAllLeft metrics:metrics views:views]];
444448
[self.titleViewConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:[titleView(titleViewWidth)]" options:NSLayoutFormatAlignAllTop metrics:metrics views:views]];
445449
[self.titleViewConstraints addObject:[NSLayoutConstraint constraintWithItem:self.titleView attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeCenterX multiplier:1.0 constant:0.0]];
446450

@@ -471,7 +475,7 @@ - (void)buildFooterView {
471475
NSDictionary *metrics = @{@"pageControlBottomPadding" : @(self.pageControlY - self.pageControl.frame.size.height), @"pageControlHeight" : @(self.pageControl.frame.size.height), @"skipButtonBottomPadding" : @(self.skipButtonY - self.skipButton.frame.size.height), @"skipButtonSideMargin" : @(self.skipButtonSideMargin), @"skipButtonWidth" : @(self.skipButton.frame.size.width), @"skipButtonHeight" : @(self.skipButton.frame.size.height)};
472476

473477
[self.footerConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[pageControl]-|" options:NSLayoutFormatAlignAllCenterX metrics:metrics views:views]];
474-
[self.footerConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[pageControl(pageControlHeight)]-pageControlBottomPadding-|" options:NSLayoutFormatAlignAllBottom metrics:metrics views:views]];
478+
[self.footerConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[pageControl(pageControlHeight)]-pageControlBottomPadding@750-|" options:NSLayoutFormatAlignAllBottom metrics:metrics views:views]];
475479

476480
if (self.skipButton && !self.skipButton.hidden) {
477481
if(self.skipButtonAlignment == EAViewAlignmentCenter) {

0 commit comments

Comments
 (0)