Perfected main content transition

Author: TimOliver

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.h

@@ -19,11 +19,14 @@
 
 /* The Title Label Explaining the Passcode View */
 @property (nonatomic, assign) CGFloat titleLabelBottomSpacing;    // Space from the title label to the input view
+
 @property (nonatomic, strong) UIFont *titleLabelFont;             // The font of the title label
 
 /* Title Label properties when the view is laid out horizontally */
 @property (nonatomic, assign) CGFloat titleHorizontalLayoutWidth;   // When laid out horizontally, the width of the title view
 @property (nonatomic, assign) CGFloat titleHorizontalLayoutSpacing; // The amount of spacing between the title label and the passcode keypad
+@property (nonatomic, assign) CGFloat titleViewHorizontalBottomSpacing; // Space from the bottom of the title view when iPhone is horizontal
+@property (nonatomic, assign) CGFloat titleLabelHorizontalBottomSpacing; // Spacing from the title label to input view in horizontal mode
 
 /* Circle Row Configuration */
 @property (nonatomic, assign) CGFloat circleRowDiameter; // The diameter of each circle representing a PIN number

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.m

@@ -25,8 +25,10 @@ + (TOPasscodeViewContentLayout *)defaultScreenContentLayout
     contentLayout.titleLabelFont = [UIFont systemFontOfSize: 22.0f];
 
     /* Horizontal title constraints */
-    contentLayout.titleHorizontalLayoutWidth = 185.0f;
-    contentLayout.titleHorizontalLayoutSpacing = 16.0f;
+    contentLayout.titleHorizontalLayoutWidth = 250.0f;
+    contentLayout.titleHorizontalLayoutSpacing = 35.0f;
+    contentLayout.titleViewHorizontalBottomSpacing = 20.0f;
+    contentLayout.titleLabelHorizontalBottomSpacing = 20.0f;
 
     /* Circle Row Configuration */
     contentLayout.circleRowDiameter = 15.5f;
@@ -75,6 +77,8 @@ + (TOPasscodeViewContentLayout *)mediumScreenContentLayout
     /* Horizontal title constraints */
     contentLayout.titleHorizontalLayoutWidth = 185.0f;
     contentLayout.titleHorizontalLayoutSpacing = 16.0f;
+    contentLayout.titleViewHorizontalBottomSpacing = 18.0f;
+    contentLayout.titleLabelHorizontalBottomSpacing = 18.0f;
 
     /* Circle Row Configuration */
     contentLayout.circleRowDiameter = 12.5f;
@@ -121,6 +125,8 @@ + (TOPasscodeViewContentLayout *)smallScreenContentLayout
     /* Horizontal title constraints */
     contentLayout.titleHorizontalLayoutWidth = 185.0f;
     contentLayout.titleHorizontalLayoutSpacing = 16.0f;
+    contentLayout.titleViewHorizontalBottomSpacing = 18.0f;
+    contentLayout.titleLabelHorizontalBottomSpacing = 18.0f;
 
     /* Circle Row Configuration */
     contentLayout.circleRowDiameter = 12.5f;

TOPasscodeViewController/TOPasscodeViewController.m

@@ -451,6 +451,7 @@ - (TOPasscodeView *)passcodeView
         [weakSelf keypadButtonTapped];
     };
 
+    // Set initial layout to horizontal if we're rotated on an iPhone
     if (self.passcodeType != TOPasscodeTypeCustomAlphanumeric && UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
         CGSize boundsSize = self.view.bounds.size;
         _passcodeView.horizontalLayout = boundsSize.width > boundsSize.height;

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -66,7 +66,7 @@ - (void)setUp
     _currentLayout = _defaultContentLayout;
     _contentLayouts = @[[TOPasscodeViewContentLayout mediumScreenContentLayout],
                         [TOPasscodeViewContentLayout smallScreenContentLayout]];
-    _titleText = @"Enter Passcode";
+    _titleText = NSLocalizedString(@"Enter Passcode", @"");
 
     // Start configuring views
     [self setUpViewForType:self.passcodeType];
@@ -144,36 +144,33 @@ - (void)horizontallyLayoutSubviews
     CGSize midViewSize = (CGSize){self.frame.size.width * 0.5f, self.frame.size.height * 0.5f};
     CGRect frame = CGRectZero;
 
-    // Work out total height of header content
-    CGFloat headerHeight = 0.0f;
+    // Work out the y offset, assuming the input field is in the middle
+    frame.origin.y = midViewSize.height - (self.inputField.frame.size.height * 0.5f);
+    frame.origin.y -= (self.titleLabel.frame.size.height + self.currentLayout.titleLabelHorizontalBottomSpacing);
+
+    // Include offset for title view if present
     if (self.titleView) {
-        headerHeight += self.titleView.frame.size.height;
-        headerHeight += self.currentLayout.titleViewBottomSpacing;
+        frame.origin.y -= (self.titleView.frame.size.height + self.currentLayout.titleViewHorizontalBottomSpacing);
     }
 
-    headerHeight += self.titleLabel.frame.size.height;
-    headerHeight += self.currentLayout.titleLabelBottomSpacing;
-
-    headerHeight += self.inputField.frame.size.height;
-
     // Set initial Y offset
-    frame.origin.y = midViewSize.height - (headerHeight * 0.5f);
+    frame.origin.y = MAX(frame.origin.y, 0.0f);
 
     // Set frame of title view
     if (self.titleView) {
         frame.size = self.titleView.frame.size;
         frame.origin.x = (self.currentLayout.titleHorizontalLayoutWidth - frame.size.width) * 0.5f;
         self.titleView.frame = CGRectIntegral(frame);
 
-        frame.origin.y += (frame.size.height + self.currentLayout.titleViewBottomSpacing);
+        frame.origin.y += (frame.size.height + self.currentLayout.titleViewHorizontalBottomSpacing);
     }
 
     // Set frame of title label
     frame.size = self.titleLabel.frame.size;
     frame.origin.x = (self.currentLayout.titleHorizontalLayoutWidth - frame.size.width) * 0.5f;
     self.titleLabel.frame = CGRectIntegral(frame);
 
-    frame.origin.y += (frame.size.height + self.currentLayout.titleLabelBottomSpacing);
+    frame.origin.y += (frame.size.height + self.currentLayout.titleLabelHorizontalBottomSpacing);
 
     // Set frame of the input field
     frame.size = self.inputField.frame.size;