Adding more logig for horizontal rotation

Author: TimOliver

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.h

@@ -14,12 +14,16 @@
 /* The width of the PIN view in which this layout object is sizing the content to fit. */
 @property (nonatomic, assign) CGFloat viewWidth;
 
-/* The title View at the very top */
+/* The title view at the very top */
 @property (nonatomic, assign) CGFloat titleViewBottomSpacing;   // Space from the bottom of the title view to the title label
 
-/* The Title Label Explaining the PIN View */
-@property (nonatomic, assign) CGFloat titleLabelBottomSpacing;  // Space from the title label to the circles row
-@property (nonatomic, strong) UIFont *titleLabelFont;           // The font of the title label
+/* 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
 
 /* Circle Row Configuration */
 @property (nonatomic, assign) CGFloat circleRowDiameter; // The diameter of each circle representing a PIN number
@@ -51,6 +55,6 @@
 /* Default layout configurations for the various sizes */
 + (TOPasscodeViewContentLayout *)defaultScreenContentLayout;       /* Default layout values. Designed for iPhone 6 Plus and above. */
 + (TOPasscodeViewContentLayout *)mediumScreenContentLayout;        /* For medium screen sizes, like iPhone 6, or 1/4 view on iPad Pro. */
-+ (TOPasscodeViewContentLayout *)smallScreenContentLayout;  /* For the smallest screens, like iPhone SE, and 1/4 on standard size iPads/ */
++ (TOPasscodeViewContentLayout *)smallScreenContentLayout;         /* For the smallest screens, like iPhone SE, and 1/4 on standard size iPads/ */
 
 @end

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.m

@@ -24,6 +24,10 @@ + (TOPasscodeViewContentLayout *)defaultScreenContentLayout
     contentLayout.titleLabelBottomSpacing = 34.0f;
     contentLayout.titleLabelFont = [UIFont systemFontOfSize: 22.0f];
 
+    /* Horizontal title constraints */
+    contentLayout.titleHorizontalLayoutWidth = 185.0f;
+    contentLayout.titleHorizontalLayoutSpacing = 16.0f;
+
     /* Circle Row Configuration */
     contentLayout.circleRowDiameter = 15.5f;
     contentLayout.circleRowSpacing = 30.0f;
@@ -68,6 +72,10 @@ + (TOPasscodeViewContentLayout *)mediumScreenContentLayout
     contentLayout.titleLabelBottomSpacing = 27.0f;
     contentLayout.titleLabelFont = [UIFont systemFontOfSize: 20.0f];
 
+    /* Horizontal title constraints */
+    contentLayout.titleHorizontalLayoutWidth = 185.0f;
+    contentLayout.titleHorizontalLayoutSpacing = 16.0f;
+
     /* Circle Row Configuration */
     contentLayout.circleRowDiameter = 12.5f;
     contentLayout.circleRowSpacing = 26.0f;
@@ -110,6 +118,10 @@ + (TOPasscodeViewContentLayout *)smallScreenContentLayout
     contentLayout.titleLabelBottomSpacing = 23.0f;
     contentLayout.titleLabelFont = [UIFont systemFontOfSize: 17.0f];
 
+    /* Horizontal title constraints */
+    contentLayout.titleHorizontalLayoutWidth = 185.0f;
+    contentLayout.titleHorizontalLayoutSpacing = 16.0f;
+
     /* Circle Row Configuration */
     contentLayout.circleRowDiameter = 12.5f;
     contentLayout.circleRowSpacing = 22.0f;

TOPasscodeViewController/TOPasscodeViewController.m

@@ -202,15 +202,21 @@ - (void)viewDidAppear:(BOOL)animated
 - (void)viewDidLayoutSubviews
 {
     CGSize bounds = self.view.bounds.size;
+    CGFloat width = bounds.width;
+
+    // If on an iPhone (and we're potentially rotated), work out the minimum width we can be
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+        width = MIN(bounds.width, bounds.height);
+    }
 
     // Update the accessory button sizes
-    [self updateAccessoryButtonFontsForWidth:bounds.width];
+    [self updateAccessoryButtonFontsForWidth:width];
 
     // Re-layout the accessory buttons
-    [self layoutAccessoryButtonsForWidth:bounds.width];
+    [self layoutAccessoryButtonsForWidth:width];
 
     // Resize the pin view to scale to the new size
-    [self.passcodeView sizeToFitWidth:bounds.width];
+    [self.passcodeView sizeToFitWidth:width];
 
     // Re-center the pin view
     CGRect frame = self.passcodeView.frame;
@@ -230,7 +236,7 @@ - (void)viewWillAppear:(BOOL)animated
         [self.view layoutIfNeeded];
     }];
 
-    // Show the keyboard if we're
+    // Show the keyboard if we're entering alphanumeric characters
     if (self.passcodeType == TOPasscodeTypeCustomAlphanumeric) {
         [self.passcodeView.inputField becomeFirstResponder];
     }
@@ -251,6 +257,22 @@ - (UIStatusBarStyle)preferredStatusBarStyle
     return TOPasscodeViewStyleIsDark(self.style) ? UIStatusBarStyleLightContent : UIStatusBarStyleDefault;
 }
 
+#pragma mark - View Rotations -
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
+{
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+
+    // We don't need to do anything special on iPad
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { return; }
+
+    // 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];
+}
+
 #pragma mark - View Styling -
 - (void)applyThemeForStyle:(TOPasscodeViewStyle)style
 {

TOPasscodeViewController/Views/Main/TOPasscodeKeypadView.h

@@ -12,17 +12,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class TOPasscodeCircleButton;
 
-/* The direction this keypad is laid out.
-   When horizontal, the '0' button is on the right side */
-typedef NS_ENUM(NSInteger, TOPasscodeKeypadLayout) {
-    TOPasscodeKeypadLayoutVertical,
-    TOPasscodeKeypadLayoutHorizontal
-};
-
 @interface TOPasscodeKeypadView : UIView
 
 /** The type of layout for the buttons (Default is vertical) */
-@property (nonatomic, assign) TOPasscodeKeypadLayout layout;
+@property (nonatomic, assign) BOOL horizontalLayout;
 
 /** The vibrancy effect to be applied to each button background */
 @property (nonatomic, strong, nullable) UIVibrancyEffect *vibrancyEffect;
@@ -77,7 +70,7 @@ typedef NS_ENUM(NSInteger, TOPasscodeKeypadLayout) {
 @property (nonatomic, copy) void (^buttonTappedHandler)(NSInteger buttonNumber);
 
 /* Perform an animation of a set duration to the new layout */
-- (void)setLayout:(TOPasscodeKeypadLayout)layout animated:(BOOL)animated duration:(CGFloat)duration;
+- (void)setHorizontalLayout:(BOOL)horizontalLayout animated:(BOOL)animated duration:(CGFloat)duration;
 
 @end
 

TOPasscodeViewController/Views/Main/TOPasscodeKeypadView.m

@@ -98,7 +98,7 @@ - (void)setUpButtons
             self.verticalZeroButton = circleButton;
 
             // Hide the button if it's not vertically laid out
-            if (self.layout != TOPasscodeKeypadLayoutVertical) {
+            if (self.horizontalLayout) {
                 self.verticalZeroButton.contentAlpha = 0.0f;
                 self.verticalZeroButton.hidden = YES;
             }
@@ -107,7 +107,7 @@ - (void)setUpButtons
             self.horizontalZeroButton = circleButton;
 
             // Hide the button if it's not horizontally laid out
-            if (self.layout != TOPasscodeKeypadLayoutHorizontal) {
+            if (!self.horizontalLayout) {
                 self.horizontalZeroButton.contentAlpha = 0.0f;
                 self.horizontalZeroButton.hidden = YES;
             }
@@ -122,7 +122,7 @@ - (void)sizeToFit
     CGFloat padding = 2.0f;
 
     CGRect frame = self.frame;
-    if (self.layout == TOPasscodeKeypadLayoutHorizontal) {
+    if (self.horizontalLayout) {
         frame.size.width  = ((self.buttonDiameter + padding) * 4) + (self.buttonSpacing.width * 3);
         frame.size.height = ((self.buttonDiameter + padding) * 3) + (self.buttonSpacing.height * 2);
     }
@@ -228,20 +228,18 @@ - (UIImage *)tappedButtonImage
 
 #pragma mark - Public Layout Setters -
 
-- (void)setLayout:(TOPasscodeKeypadLayout)layout
+- (void)setHorizontalLayout:(BOOL)horizontalLayout
 {
-    [self setLayout:layout animated:NO duration:0.0f];
+    [self setHorizontalLayout:horizontalLayout animated:NO duration:0.0f];
 }
 
-- (void)setLayout:(TOPasscodeKeypadLayout)layout animated:(BOOL)animated duration:(CGFloat)duration
+- (void)setHorizontalLayout:(BOOL)horizontalLayout animated:(BOOL)animated duration:(CGFloat)duration
 {
-    if (layout == _layout) {
+    if (horizontalLayout== _horizontalLayout) {
         return;
     }
 
-    _layout = layout;
-
-    BOOL toHorizontal = (layout == TOPasscodeKeypadLayoutHorizontal);
+    _horizontalLayout = horizontalLayout;
 
     // Resize itself now so the frame value is up to date externally
     [self sizeToFit];
@@ -250,17 +248,17 @@ - (void)setLayout:(TOPasscodeKeypadLayout)layout animated:(BOOL)animated duratio
     self.verticalZeroButton.hidden = NO;
     self.horizontalZeroButton.hidden = NO;
 
-    self.verticalZeroButton.contentAlpha = toHorizontal ? 1.0f : 0.0f;
-    self.horizontalZeroButton.contentAlpha = toHorizontal ? 0.0f : 1.0f;
+    self.verticalZeroButton.contentAlpha = _horizontalLayout ? 1.0f : 0.0f;
+    self.horizontalZeroButton.contentAlpha = _horizontalLayout ? 0.0f : 1.0f;
 
     void (^animationBlock)() = ^{
-        self.verticalZeroButton.contentAlpha = toHorizontal ? 0.0f : 1.0f;
-        self.horizontalZeroButton.contentAlpha = toHorizontal ? 1.0f : 0.0f;
+        self.verticalZeroButton.contentAlpha = _horizontalLayout ? 0.0f : 1.0f;
+        self.horizontalZeroButton.contentAlpha = _horizontalLayout ? 1.0f : 0.0f;
     };
 
     void (^completionBlock)(BOOL) = ^(BOOL complete) {
-        self.verticalZeroButton.hidden = toHorizontal;
-        self.horizontalZeroButton.hidden = !toHorizontal;
+        self.verticalZeroButton.hidden = _horizontalLayout;
+        self.horizontalZeroButton.hidden = !_horizontalLayout;
     };
 
     // Don't animate if not needed
@@ -394,8 +392,8 @@ - (void)setContentAlpha:(CGFloat)contentAlpha
 
     for (TOPasscodeCircleButton *button in self.keypadButtons) {
         // Skip whichever '0' button is not presently being used
-        if ((self.layout == TOPasscodeKeypadLayoutHorizontal && button == self.verticalZeroButton) ||
-            (self.layout == TOPasscodeKeypadLayoutVertical && button == self.horizontalZeroButton))
+        if ((self.horizontalLayout && button == self.verticalZeroButton) ||
+            (!self.horizontalLayout && button == self.horizontalZeroButton))
         {
             continue;
         }

TOPasscodeViewController/Views/Main/TOPasscodeView.h

@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 /* The type of passcode being managed by it */
 @property (nonatomic, readonly) TOPasscodeType passcodeType;
 
+/* Whether the content is laid out vertically or horizontally (iPhone only) */
+@property (nonatomic, assign) BOOL horizontalLayout;
+
 /* The text in the title view (Default is 'Enter Passcode') */
 @property (nonatomic, copy) NSString *titleText;
 
@@ -78,6 +81,9 @@ NS_ASSUME_NONNULL_BEGIN
 /* Delete the last character from the passcode */
 - (void)deleteLastPasscodeCharacterAnimated:(BOOL)animated;
 
+/* Animate the transition between horizontal and vertical layouts */
+- (void)setHorizontalLayout:(BOOL)horizontalLayout animated:(BOOL)animated duration:(CGFloat)duration;
+
 @end
 
 NS_ASSUME_NONNULL_END

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -270,8 +270,6 @@ - (void)setUpViewForType:(TOPasscodeType)type
             }
         };
         [self addSubview:self.keypadView];
-
-        self.keypadView.layout = TOPasscodeKeypadLayoutHorizontal;
     }
     else {
         [self.keypadView removeFromSuperview];
@@ -402,6 +400,18 @@ - (UIBlurEffect *)blurEffectForStyle:(TOPasscodeViewStyle)style
 }
 
 #pragma mark - Accessors -
+- (void)setHorizontalLayout:(BOOL)horizontalLayout
+{
+    [self setHorizontalLayout:horizontalLayout animated:NO duration:0.0f];
+}
+
+- (void)setHorizontalLayout:(BOOL)horizontalLayout animated:(BOOL)animated duration:(CGFloat)duration
+{
+    if (horizontalLayout == _horizontalLayout) { return; }
+    _horizontalLayout = horizontalLayout;
+    [self.keypadView setHorizontalLayout:horizontalLayout animated:animated duration:duration];
+}
+
 - (void)setDefaultContentLayout:(TOPasscodeViewContentLayout *)defaultContentLayout
 {
     if (defaultContentLayout == _defaultContentLayout) { return; }