Merge pull request #192 from motoshima1150/fix-page-control-issue

Fix page control padding on iPhone X
mamaral · Nov 28, 2017 · fd44e44 · fd44e44
2 parents 8f9c573 + 740673f
commit fd44e44
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Source/OnboardingContentViewController.m b/Source/OnboardingContentViewController.m
@@ -265,7 +265,12 @@ - (void)viewWillLayoutSubviews {
     if (self.videoURL) {
         self.moviePlayerController.view.frame = self.view.frame;
     }
-
+
+    CGFloat safedUnderPageControlPadding = self.underPageControlPadding;
+    if (@available(iOS 11.0, *)) {
+        safedUnderPageControlPadding += [self.view safeAreaInsets].bottom;
+    }
+
     CGFloat viewWidth = CGRectGetWidth(self.view.frame);
     CGFloat contentWidth = viewWidth * kContentWidthMultiplier;
     CGFloat xPadding = (viewWidth - contentWidth) / 2.0;
@@ -284,7 +289,7 @@ - (void)viewWillLayoutSubviews {
     [self.bodyLabel sizeToFit];
     self.bodyLabel.frame = CGRectMake(xPadding, bodyYOrigin, contentWidth, CGRectGetHeight(self.bodyLabel.frame));
 
-    self.actionButton.frame = CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kMainPageControlHeight - kActionButtonHeight - self.bottomPadding, contentWidth, kActionButtonHeight);
+    self.actionButton.frame = CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - safedUnderPageControlPadding - kMainPageControlHeight - kActionButtonHeight - self.bottomPadding, contentWidth, kActionButtonHeight);
 }
 
 

diff --git a/Source/OnboardingViewController.m b/Source/OnboardingViewController.m
@@ -145,10 +145,15 @@ - (void)viewWillDisappear:(BOOL)animated {
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
 
+    CGFloat safedUnderPageControlPadding = self.underPageControlPadding;
+    if (@available(iOS 11.0, *)) {
+        safedUnderPageControlPadding += [self.view safeAreaInsets].bottom;
+    }
+
     self.pageVC.view.frame = self.view.frame;
     self.moviePlayerController.view.frame = self.view.frame;
-    self.skipButton.frame = CGRectMake(CGRectGetMaxX(self.view.frame) - kSkipButtonWidth, CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kSkipButtonHeight, kSkipButtonWidth, kSkipButtonHeight);
-    self.pageControl.frame = CGRectMake(0, CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kPageControlHeight, self.view.frame.size.width, kPageControlHeight);
+    self.skipButton.frame = CGRectMake(CGRectGetMaxX(self.view.frame) - kSkipButtonWidth, CGRectGetMaxY(self.view.frame) - safedUnderPageControlPadding - kSkipButtonHeight, kSkipButtonWidth, kSkipButtonHeight);
+    self.pageControl.frame = CGRectMake(0, CGRectGetMaxY(self.view.frame) - safedUnderPageControlPadding - kPageControlHeight, self.view.frame.size.width, kPageControlHeight);
 }
 
 - (void)generateView {