Added vertical layout to input view

Author: TimOliver

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -501,6 +501,7 @@ - (void)setHorizontalLayout:(BOOL)horizontalLayout animated:(BOOL)animated durat
     if (horizontalLayout == _horizontalLayout) { return; }
     _horizontalLayout = horizontalLayout;
     [self.keypadView setHorizontalLayout:horizontalLayout animated:animated duration:duration];
+    [self.inputField setHorizontalLayout:horizontalLayout animated:animated duration:duration];
 }
 
 - (void)setDefaultContentLayout:(TOPasscodeViewContentLayout *)defaultContentLayout

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.h

@@ -39,6 +39,9 @@ typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
 /* The amount of spacing between the 'OK' button and the passcode field */
 @property (nonatomic, assign) CGFloat submitButtonSpacing;
 
+/* The amount of spacing between the 'OK' button and the passcode field */
+@property (nonatomic, assign) CGFloat submitButtonVerticalSpacing;
+
 /* The font size of the submit button */
 @property (nonatomic, assign) CGFloat submitButtonFontSize;
 
@@ -60,6 +63,9 @@ typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
 /** Called when the number of digits has been entered, or the user tapped 'Done' on the keyboard */
 @property (nonatomic, copy) void (^passcodeCompletedHandler)(NSString *code);
 
+/** Horizontal layout. The 'OK' button will be placed under the text field */
+@property (nonatomic, assign) BOOL horizontalLayout;
+
 /* Init with the target length needed for this passcode */
 - (instancetype)initWithStyle:(TOPasscodeInputFieldStyle)style;
 
@@ -75,6 +81,9 @@ typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
 /* Plays a shaking animation and resets the passcode back to empty */
 - (void)resetPasscodeAnimated:(BOOL)animated playImpact:(BOOL)impact;
 
+/* Animates the OK button changing location */
+- (void)setHorizontalLayout:(BOOL)horizontalLayout animated:(BOOL)animated duration:(CGFloat)duration;
+
 @end
 
 NS_ASSUME_NONNULL_END

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.m

@@ -52,7 +52,9 @@ - (instancetype)initWithStyle:(TOPasscodeInputFieldStyle)style
 
 - (void)setUp
 {
+    self.backgroundColor = [UIColor clearColor];
     _submitButtonSpacing = 4.0f;
+    _submitButtonVerticalSpacing = 5.0f;
 }
 
 - (void)setUpForStyle:(TOPasscodeInputFieldStyle)style
@@ -86,6 +88,9 @@ - (void)sizeToFit
     CGRect frame = self.frame;
     [self.inputField sizeToFit];
     frame.size = self.inputField.frame.size;
+    if (self.horizontalLayout) {
+        frame.size.height += self.submitButtonVerticalSpacing + CGRectGetHeight(self.submitButton.frame);
+    }
     self.frame = CGRectIntegral(frame);
 }
 
@@ -97,8 +102,14 @@ - (void)layoutSubviews
 
     [self.submitButton sizeToFit];
     CGRect frame = self.submitButton.frame;
-    frame.origin.x = CGRectGetMaxX(self.bounds) + self.submitButtonSpacing;
-    frame.origin.y = (CGRectGetHeight(self.bounds) - CGRectGetHeight(frame)) * 0.5f;
+    if (!self.horizontalLayout) {
+        frame.origin.x = CGRectGetMaxX(self.bounds) + self.submitButtonSpacing;
+        frame.origin.y = (CGRectGetHeight(self.bounds) - CGRectGetHeight(frame)) * 0.5f;
+    }
+    else {
+        frame.origin.x = (CGRectGetWidth(self.frame) - frame.size.width) * 0.5f;
+        frame.origin.y = CGRectGetMaxY(self.inputField.frame) + self.submitButtonVerticalSpacing;
+    }
     self.submitButton.frame = CGRectIntegral(frame);
 }
 
@@ -124,6 +135,7 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
 {
     CGRect frame = self.bounds;
     frame.size.width += self.submitButton.frame.size.width + (self.submitButtonSpacing * 2.0f);
+    frame.size.height += self.submitButtonVerticalSpacing;
 
     if (CGRectContainsPoint(frame, point)) {
         return YES;
@@ -340,4 +352,48 @@ - (void)setContentAlpha:(CGFloat)contentAlpha
     self.submitButton.alpha = contentAlpha;
 }
 
+- (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;
+    }
+
+    UIView *snapshotView = nil;
+
+    if (self.submitButton.hidden == NO && animated) {
+        snapshotView = [self.submitButton snapshotViewAfterScreenUpdates:NO];
+        snapshotView.frame = self.submitButton.frame;
+        [self addSubview:snapshotView];
+    }
+
+    _horizontalLayout = horizontalLayout;
+
+    if (!animated) {
+        [self sizeToFit];
+        [self setNeedsLayout];
+        return;
+    }
+
+    self.submitButton.alpha = 0.0f;
+    [self setNeedsLayout];
+    [self layoutIfNeeded];
+
+    id animationBlock = ^{
+        self.submitButton.alpha = 1.0f;
+        snapshotView.alpha = 0.0f;
+    };
+
+    id completionBlock = ^(BOOL complete) {
+        [snapshotView removeFromSuperview];
+        [self bringSubviewToFront:self.submitButton];
+    };
+
+    [UIView animateWithDuration:duration animations:animationBlock completion:completionBlock];
+}
+
 @end