Got horizontal rotation roughly working

Author: TimOliver

TOPasscodeViewController/TOPasscodeViewController.m

@@ -25,8 +25,6 @@ @interface TOPasscodeViewController () <UIViewControllerTransitioningDelegate>
 @property (nonatomic, strong, readwrite) UIButton *biometricButton;
 @property (nonatomic, strong, readwrite) UIButton *cancelButton;
 
-
-
 @end
 
 @implementation TOPasscodeViewController
@@ -262,9 +260,8 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVi
     // Work out if we need to transition to horizontal
     BOOL horizontalLayout = size.height < size.width;
 
-    [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
-        [self.passcodeView setHorizontalLayout:horizontalLayout animated:YES duration:context.transitionDuration];
-    } completion:nil];
+    // Perform layout animation
+    [self.passcodeView setHorizontalLayout:horizontalLayout animated:coordinator.animated duration:coordinator.transitionDuration];
 }
 
 #pragma mark - View Styling -
@@ -415,8 +412,6 @@ - (void)keyboardWillChangeFrame:(NSNotification *)notification
     // Animate the content sliding up and down with the keyboard
     [UIView animateWithDuration:animationDuration
                           delay:0.0f
-//         usingSpringWithDamping:1.0f
-//          initialSpringVelocity:1.0f
                         options:animationCurve
                      animations:^{ [self.view layoutIfNeeded]; }
                      completion:nil];
@@ -456,6 +451,11 @@ - (TOPasscodeView *)passcodeView
         [weakSelf keypadButtonTapped];
     };
 
+    if (self.passcodeType != TOPasscodeTypeCustomAlphanumeric && UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
+        CGSize boundsSize = self.view.bounds.size;
+        _passcodeView.horizontalLayout = boundsSize.width > boundsSize.height;
+    }
+
     return _passcodeView;
 }
 

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -17,10 +17,12 @@ @interface TOPasscodeView ()
 /* The current layout object used to configure this view */
 @property (nonatomic, weak) TOPasscodeViewContentLayout *currentLayout;
 
+/* The main views */
 @property (nonatomic, strong, readwrite) UILabel *titleLabel;
-@property (nonatomic, strong, readwrite) TOPasscodeKeypadView *keypadView;
 @property (nonatomic, strong, readwrite) TOPasscodeInputField *inputField;
+@property (nonatomic, strong, readwrite) TOPasscodeKeypadView *keypadView;
 
+/* The type of passcode we're displaying */
 @property (nonatomic, assign, readwrite) TOPasscodeType passcodeType;
 
 @end
@@ -77,7 +79,7 @@ - (void)setUp
 }
 
 #pragma mark - View Layout -
-- (void)layoutSubviews
+- (void)verticallyLayoutSubviews
 {
     CGSize viewSize = self.frame.size;
     CGSize midViewSize = (CGSize){self.frame.size.width * 0.5f, self.frame.size.height * 0.5f};
@@ -137,6 +139,64 @@ - (void)layoutSubviews
     }
 }
 
+- (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;
+    if (self.titleView) {
+        headerHeight += self.titleView.frame.size.height;
+        headerHeight += self.currentLayout.titleViewBottomSpacing;
+    }
+
+    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);
+
+    // 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);
+    }
+
+    // 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);
+
+    // Set frame of the input field
+    frame.size = self.inputField.frame.size;
+    frame.origin.x = (self.currentLayout.titleHorizontalLayoutWidth - frame.size.width) * 0.5f;
+    self.inputField.frame = CGRectIntegral(frame);
+
+    // Set the frame of the keypad view
+    frame.size = self.keypadView.frame.size;
+    frame.origin.y = 0.0f;
+    frame.origin.x = self.currentLayout.titleHorizontalLayoutWidth + self.currentLayout.titleHorizontalLayoutSpacing;
+    self.keypadView.frame = CGRectIntegral(frame);
+}
+
+- (void)layoutSubviews
+{
+    if (self.horizontalLayout) {
+        [self horizontallyLayoutSubviews];
+    }
+    else {
+        [self verticallyLayoutSubviews];
+    }
+}
+
 - (void)sizeToFitSize:(CGSize)size
 {
     CGFloat width = size.width;
@@ -164,7 +224,7 @@ - (void)sizeToFitSize:(CGSize)size
     [self sizeToFit];
 }
 
-- (void)sizeToFit
+- (void)verticalSizeToFit
 {
     CGRect frame = self.frame;
     frame.size.width = 0.0f;
@@ -217,6 +277,32 @@ - (void)sizeToFit
     self.frame = CGRectIntegral(frame);
 }
 
+- (void)horizontalSizeToFit
+{
+    CGRect frame = self.frame;
+
+    [self.keypadView sizeToFit];
+    [self.inputField sizeToFit];
+
+    frame.size.width = self.currentLayout.titleHorizontalLayoutWidth;
+    frame.size.width += self.currentLayout.titleHorizontalLayoutSpacing;
+    frame.size.width += self.keypadView.frame.size.width;
+
+    frame.size.height = self.keypadView.frame.size.height;
+
+    self.frame = CGRectIntegral(frame);
+}
+
+- (void)sizeToFit
+{
+    if (self.horizontalLayout) {
+        [self horizontalSizeToFit];
+    }
+    else {
+        [self verticalSizeToFit];
+    }
+}
+
 #pragma mark - View Setup -
 - (void)setUpViewForType:(TOPasscodeType)type
 {