Adjusted iPhone 7 sizing

Author: TimOliver

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.h

@@ -14,6 +14,9 @@
 /* The width of the PIN view in which this layout object is sizing the content to fit. */
 @property (nonatomic, assign) CGFloat viewWidth;
 
+/* Extra padding at the bottom in order to shift the content slightly up */
+@property (nonatomic, assign) CGFloat bottomPadding;
+
 /* The title view at the very top */
 @property (nonatomic, assign) CGFloat titleViewBottomSpacing;   // Space from the bottom of the title view to the title label
 

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.m

@@ -17,6 +17,9 @@ + (TOPasscodeViewContentLayout *)defaultScreenContentLayout
     /* Width of the PIN View */
     contentLayout.viewWidth = 414.0f;
 
+    /* Bottom Padding */
+    contentLayout.bottomPadding = 25.0f;
+
     /* Title View Constraints */
     contentLayout.titleViewBottomSpacing = 34.0f;
 
@@ -67,11 +70,14 @@ + (TOPasscodeViewContentLayout *)mediumScreenContentLayout
     /* Width of the PIN View */
     contentLayout.viewWidth = 375.0f;
 
+    /* Bottom Padding */
+    contentLayout.bottomPadding = 17.0f;
+
     /* Title View Constraints */
     contentLayout.titleViewBottomSpacing = 27.0f;
 
     /* The Title Label Explaining the PIN View */
-    contentLayout.titleLabelBottomSpacing = 27.0f;
+    contentLayout.titleLabelBottomSpacing = 24.0f;
     contentLayout.titleLabelFont = [UIFont systemFontOfSize: 20.0f];
 
     /* Horizontal title constraints */
@@ -115,6 +121,9 @@ + (TOPasscodeViewContentLayout *)smallScreenContentLayout
     /* Width of the PIN View */
     contentLayout.viewWidth = 320.0f;
 
+    /* Bottom Padding */
+    contentLayout.bottomPadding = 12.0f;
+
     /* Title View Constraints */
     contentLayout.titleViewBottomSpacing = 23.0f;
 
@@ -124,7 +133,7 @@ + (TOPasscodeViewContentLayout *)smallScreenContentLayout
 
     /* Horizontal title constraints */
     contentLayout.titleHorizontalLayoutWidth = 185.0f;
-    contentLayout.titleHorizontalLayoutSpacing = 16.0f;
+    contentLayout.titleHorizontalLayoutSpacing = 5.0f;
     contentLayout.titleViewHorizontalBottomSpacing = 18.0f;
     contentLayout.titleLabelHorizontalBottomSpacing = 18.0f;
 
@@ -147,13 +156,13 @@ + (TOPasscodeViewContentLayout *)smallScreenContentLayout
     contentLayout.submitButtonSpacing  = 3.0f;
 
     /* Circle Button Shape and Layout */
-    contentLayout.circleButtonDiameter = 64.0f;
-    contentLayout.circleButtonSpacing = (CGSize){22.0f, 10.5f};
+    contentLayout.circleButtonDiameter = 76.0f;
+    contentLayout.circleButtonSpacing = (CGSize){20.0f, 12.5f};
     contentLayout.circleButtonStrokeWidth = 1.5f;
 
     /* Circle Button Label */
-    contentLayout.circleButtonTitleLabelFont = [UIFont systemFontOfSize:32.0f weight:UIFontWeightThin];
-    contentLayout.circleButtonLetteringLabelFont = [UIFont systemFontOfSize:7.0f weight:UIFontWeightThin];
+    contentLayout.circleButtonTitleLabelFont = [UIFont systemFontOfSize:35.0f weight:UIFontWeightThin];
+    contentLayout.circleButtonLetteringLabelFont = [UIFont systemFontOfSize:9.0f weight:UIFontWeightThin];
     contentLayout.circleButtonLabelSpacing = 4.5f;
     contentLayout.circleButtonLetteringSpacing = 2.0f;
 

TOPasscodeViewController/TOPasscodeViewController.m

@@ -201,12 +201,6 @@ - (void)viewDidLayoutSubviews
 {
     CGSize bounds = self.view.bounds.size;
 
-    // Update the accessory button sizes
-    [self updateAccessoryButtonFontsForSize:bounds];
-
-    // Re-layout the accessory buttons
-    [self layoutAccessoryButtonsForSize:bounds];
-
     // Resize the pin view to scale to the new size
     [self.passcodeView sizeToFitSize:bounds];
 
@@ -215,6 +209,14 @@ - (void)viewDidLayoutSubviews
     frame.origin.x = (bounds.width - frame.size.width) * 0.5f;
     frame.origin.y = ((bounds.height - self.keyboardHeight) - frame.size.height) * 0.5f;
     self.passcodeView.frame = CGRectIntegral(frame);
+
+    // --------------------------------------------------
+
+    // Update the accessory button sizes
+    [self updateAccessoryButtonFontsForSize:bounds];
+
+    // Re-layout the accessory buttons
+    [self layoutAccessoryButtonsForSize:bounds];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -306,10 +308,8 @@ - (void)updateAccessoryButtonFontsForSize:(CGSize)size
     self.rightAccessoryButton.titleLabel.font = accessoryFont;
 }
 
-- (void)layoutAccessoryButtonsForSize:(CGSize)size
+- (void)verticalLayoutAccessoryButtonsForSize:(CGSize)size
 {
-    if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPhone) { return; }
-
     CGFloat width = MIN(size.width, size.height);
 
     CGFloat verticalInset = 54.0f;
@@ -338,6 +338,55 @@ - (void)layoutAccessoryButtonsForSize:(CGSize)size
     }
 }
 
+- (void)horizontalLayoutAccessoryButtonsForSize:(CGSize)size
+{
+    CGRect passcodeViewFrame = self.passcodeView.frame;
+    CGFloat buttonInset = self.passcodeView.keypadButtonInset;
+    CGFloat width = MIN(size.width, size.height);
+    CGFloat verticalInset = 35.0f;
+    if (width < TOPasscodeViewContentSizeMedium) {
+        verticalInset = 30.0f;
+    }
+    else if (width < TOPasscodeViewContentSizeDefault) {
+        verticalInset = 35.0f;
+    }
+
+
+    UIButton *leftButton = self.leftAccessoryButton ? self.leftAccessoryButton : self.biometricButton;
+    if (leftButton) {
+        [leftButton sizeToFit];
+        CGRect frame = leftButton.frame;
+        frame.origin.y = (self.view.bounds.size.height - verticalInset) - (frame.size.height * 0.5f);
+        frame.origin.x = (CGRectGetMaxX(passcodeViewFrame) - buttonInset) - (frame.size.width * 0.5f);
+        leftButton.frame = CGRectIntegral(frame);
+    }
+
+    UIButton *rightButton = self.rightAccessoryButton ? self.rightAccessoryButton : self.cancelButton;
+    if (rightButton) {
+        [rightButton sizeToFit];
+        CGRect frame = rightButton.frame;
+        frame.origin.y = verticalInset - (frame.size.height * 0.5f);
+        frame.origin.x = (CGRectGetMaxX(passcodeViewFrame) - buttonInset) - (frame.size.width * 0.5f);
+        rightButton.frame = CGRectIntegral(frame);
+    }
+
+    [self.view bringSubviewToFront:rightButton];
+    [self.view bringSubviewToFront:leftButton];
+}
+
+- (void)layoutAccessoryButtonsForSize:(CGSize)size
+{
+    // The buttons are always embedded in the keypad view on iPad
+    if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPhone) { return; }
+
+    if (self.passcodeView.horizontalLayout) {
+        [self horizontalLayoutAccessoryButtonsForSize:size];
+    }
+    else {
+        [self verticalLayoutAccessoryButtonsForSize:size];
+    }
+}
+
 #pragma mark - Interactions -
 - (void)accessoryButtonTapped:(id)sender
 {

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -270,6 +270,9 @@ - (void)verticalSizeToFit
         frame.size.height += maxHeight;
     }
 
+    // Add extra padding at the bottom
+    frame.size.height += self.currentLayout.bottomPadding;
+
     // Set the frame back
     self.frame = CGRectIntegral(frame);
 }

TOPasscodeViewController/Views/Shared/TOPasscodeFixedInputView.m

@@ -109,7 +109,7 @@ - (void)setCircleViewsForLength:(NSInteger)length
 
 - (void)setCircleImagesForDiameter:(CGFloat)diameter
 {
-    self.circleImage = [TOPasscodeCircleImage hollowCircleImageOfSize:diameter strokeWidth:1.0f padding:1.0f];
+    self.circleImage = [TOPasscodeCircleImage hollowCircleImageOfSize:diameter strokeWidth:1.2f padding:1.0f];
     self.highlightedCircleImage = [TOPasscodeCircleImage circleImageOfSize:diameter inset:0.5f padding:1.0f antialias:NO];
 
     for (TOPasscodeCircleView *circleView in self.circleViews) {