Added logic for keyboard-based passcode view

Author: TimOliver

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.h

@@ -26,6 +26,17 @@
 @property (nonatomic, assign) CGFloat circleRowSpacing;  // The spacing between each circle
 @property (nonatomic, assign) CGFloat circleRowBottomSpacing; // Space between the view used to indicate input
 
+/* Text Field Configuration */
+@property (nonatomic, assign) CGFloat textFieldBorderThickness; // The thickness of the border stroke
+@property (nonatomic, assign) CGFloat textFieldBorderRadius;    // The corner radius of the border
+@property (nonatomic, assign) CGFloat textFieldCircleDiameter;  // The size of the circles in the password field
+@property (nonatomic, assign) CGFloat textFieldCircleSpacing;   // The amount of spacing between each circle
+@property (nonatomic, assign) CGSize textFieldBorderPadding;   // The amount of padding between the circles and the border
+@property (nonatomic, assign) NSInteger textFieldNumericCharacterLength; // The amount of circles to have in this field when set to numeric
+@property (nonatomic, assign) NSInteger textFieldAlphanumericCharacterLength; // The amount of circles to have in this field when set to alphanumeric
+@property (nonatomic, assign) CGFloat submitButtonFontSize;     // The font size of the 'OK' button
+@property (nonatomic, assign) CGFloat submitButtonSpacing;      // The spacing of the 'OK' button from the input
+
 /* Circle Button Shape and Layout */
 @property (nonatomic, assign) CGFloat circleButtonDiameter;     // The size of each PIN button
 @property (nonatomic, assign) CGSize  circleButtonSpacing;      // The vertical/horizontal spacing between buttons

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.m

@@ -29,6 +29,17 @@ + (TOPasscodeViewContentLayout *)defaultScreenContentLayout
     contentLayout.circleRowSpacing = 30.0f;
     contentLayout.circleRowBottomSpacing = 61.0f;
 
+    /* Text Field Input Configuration */
+    contentLayout.textFieldBorderThickness  = 1.5f;
+    contentLayout.textFieldBorderRadius     = 5.0f;
+    contentLayout.textFieldCircleDiameter   = 10.0f;
+    contentLayout.textFieldCircleSpacing    = 6.0f;
+    contentLayout.textFieldBorderPadding    = (CGSize){10, 10};
+    contentLayout.textFieldNumericCharacterLength  = 10;
+    contentLayout.textFieldAlphanumericCharacterLength = 15;
+    contentLayout.submitButtonFontSize = 17.0f;
+    contentLayout.submitButtonSpacing  = 4.0f;
+
     /* Circle Button Shape and Layout */
     contentLayout.circleButtonDiameter = 81.0f;
     contentLayout.circleButtonSpacing = (CGSize){25.0f, 20.0f};
@@ -67,6 +78,15 @@ + (TOPasscodeViewContentLayout *)mediumScreenContentLayout
     contentLayout.circleButtonSpacing = (CGSize){28.0f, 15.0f};
     contentLayout.circleButtonStrokeWidth = 1.5f;
 
+    /* Text Field Input Configuration */
+    contentLayout.textFieldBorderThickness  = 1.5f;
+    contentLayout.textFieldBorderRadius     = 5.0f;
+    contentLayout.textFieldCircleDiameter   = 9.0f;
+    contentLayout.textFieldCircleSpacing    = 5.0f;
+    contentLayout.textFieldBorderPadding    = (CGSize){10, 10};
+    contentLayout.textFieldNumericCharacterLength  = 10;
+    contentLayout.textFieldAlphanumericCharacterLength = 15;
+
     /* Circle Button Label */
     contentLayout.circleButtonTitleLabelFont = [UIFont systemFontOfSize:36.5f weight:UIFontWeightThin];
     contentLayout.circleButtonLetteringLabelFont = [UIFont monospacedDigitSystemFontOfSize:8.5f weight:UIFontWeightThin];
@@ -95,6 +115,19 @@ + (TOPasscodeViewContentLayout *)smallScreenContentLayout
     contentLayout.circleRowSpacing = 22.0f;
     contentLayout.circleRowBottomSpacing = 44.0f;
 
+    /* Text Field Input Configuration */
+    contentLayout.textFieldBorderThickness  = 1.5f;
+    contentLayout.textFieldBorderRadius     = 5.0f;
+    contentLayout.textFieldCircleDiameter   = 8.0f;
+    contentLayout.textFieldCircleSpacing    = 4.0f;
+    contentLayout.textFieldBorderPadding    = (CGSize){8, 8};
+    contentLayout.textFieldNumericCharacterLength  = 10;
+    contentLayout.textFieldAlphanumericCharacterLength = 15;
+
+    /* Submit Button */
+    contentLayout.submitButtonFontSize = 15.0f;
+    contentLayout.submitButtonSpacing  = 3.0f;
+
     /* Circle Button Shape and Layout */
     contentLayout.circleButtonDiameter = 64.0f;
     contentLayout.circleButtonSpacing = (CGSize){22.0f, 10.5f};

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -212,17 +212,23 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
         case TOPasscodeSettingsViewStateEnterCurrentPassword:
             self.titleLabel.text = NSLocalizedString(@"Enter your passcode", @"");
             self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.nextBarButtonItem : nil;
+            self.inputField.returnKeyType = UIReturnKeyContinue;
             break;
         case TOPasscodeSettingsViewStateEnterNewPassword:
             self.titleLabel.text = NSLocalizedString(@"Enter a new passcode", @"");
             self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.nextBarButtonItem : nil;
+            self.inputField.returnKeyType = UIReturnKeyContinue;
             break;
         case TOPasscodeSettingsViewStateConfirmNewPassword:
             self.titleLabel.text = NSLocalizedString(@"Confirm new passcode", @"");
             self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.doneBarButtonItem : nil;
+            self.inputField.returnKeyType = UIReturnKeyDone;
             break;
     }
 
+    // Reload the 'Done' button
+    [self.inputField reloadInputViews];
+
     // Resize text label to fit new text
     [self.titleLabel sizeToFit];
     frame = self.titleLabel.frame;

TOPasscodeViewController/TOPasscodeViewController.h

@@ -53,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) TOPasscodeViewStyle style;
 
 /** The type of passcode that is expected to be entered. */
-@property (nonatomic, assign) TOPasscodeType passcodeType;
+@property (nonatomic, readonly) TOPasscodeType passcodeType;
 
 /** Will show a 'Touch ID' button for that the user can tap to initiate Touch ID verification. (Default is NO) */
 @property (nonatomic, assign) BOOL allowBiometricValidation;
@@ -100,8 +100,15 @@ NS_ASSUME_NONNULL_BEGIN
 /** The right accessory button. Setting this will override the 'Cancel' button. */
 @property (nonatomic, strong, nullable) UIButton *rightAccessoryButton;
 
+/** Whether all of the content views are hidden or not, but the background translucent view remains.
+     Useful for obscuring the content while the app is suspended. */
+@property (nonatomic, assign) BOOL contentHidden;
+
 /** Create a new instance of this view controller with the preset style. */
-- (instancetype)initWithStyle:(TOPasscodeViewStyle)style;
+- (instancetype)initWithStyle:(TOPasscodeViewStyle)style passcodeType:(TOPasscodeType)type;
+
+/** Hide all of the content views with a crossfade animation */
+- (void)setContentHidden:(BOOL)hidden animated:(BOOL)animated;
 
 @end
 

TOPasscodeViewController/TOPasscodeViewController.m

@@ -19,17 +19,19 @@ @interface TOPasscodeViewController () <UIViewControllerTransitioningDelegate>
 @property (nonatomic, strong, readwrite) TOPasscodeView *passcodeView;
 @property (nonatomic, strong, readwrite) UIButton *biometricButton;
 @property (nonatomic, strong, readwrite) UIButton *cancelButton;
+@property (nonatomic, assign, readwrite) TOPasscodeType passcodeType;
 
 @end
 
 @implementation TOPasscodeViewController
 
 #pragma mark - Instance Creation -
 
-- (instancetype)initWithStyle:(TOPasscodeViewStyle)style
+- (instancetype)initWithStyle:(TOPasscodeViewStyle)style passcodeType:(TOPasscodeType)type
 {
     if (self = [super initWithNibName:nil bundle:nil]) {
         _style = style;
+        _passcodeType = type;
         [self setUp];
     }
 
@@ -347,7 +349,7 @@ - (TOPasscodeView *)passcodeView
 {
     if (_passcodeView) { return _passcodeView; }
 
-    _passcodeView = [[TOPasscodeView alloc] initWithStyle:self.style];
+    _passcodeView = [[TOPasscodeView alloc] initWithStyle:self.style passcodeType:self.passcodeType];
     _passcodeView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin |
                                     UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
     [_passcodeView sizeToFit];
@@ -366,22 +368,6 @@ - (TOPasscodeView *)passcodeView
     return _passcodeView;
 }
 
-- (void)setPasscodeType:(TOPasscodeType)passcodeType
-{
-    if (_passcodeType == passcodeType) { return; }
-    _passcodeType = passcodeType;
-
-    if (_passcodeType <= TOPasscodeTypeSixDigits) {
-        self.passcodeView.inputField.style = TOPasscodeInputFieldStyleFixed;
-        self.passcodeView.inputField.fixedInputView.length = (_passcodeType == TOPasscodeTypeSixDigits) ? 6 : 4;
-    }
-    else {
-        self.passcodeView.inputField.style = TOPasscodeInputFieldStyleVariable;
-    }
-
-    [self.passcodeView setNeedsLayout];
-}
-
 - (void)setStyle:(TOPasscodeViewStyle)style
 {
     if (style == _style) { return; }

TOPasscodeViewController/Views/Main/TOPasscodeCircleButton.m

@@ -132,7 +132,7 @@ - (void)setBackgroundImage:(UIImage *)backgroundImage
     self.circleView.circleImage = backgroundImage;
     CGRect frame = self.frame;
     frame.size = backgroundImage.size;
-    self.frame = frame;
+    self.frame = CGRectIntegral(frame);
 }
 
 - (UIImage *)backgroundImage { return self.circleView.circleImage; }

TOPasscodeViewController/Views/Main/TOPasscodeKeypadView.m

@@ -91,7 +91,7 @@ - (void)sizeToFit
     CGRect frame = self.frame;
     frame.size.width  = ((self.buttonDiameter + padding) * 3) + (self.buttonSpacing.width * 2);
     frame.size.height = ((self.buttonDiameter + padding) * 4) + (self.buttonSpacing.height * 3);
-    self.frame = frame;
+    self.frame = CGRectIntegral(frame);
 }
 
 - (void)layoutSubviews

TOPasscodeViewController/Views/Main/TOPasscodeView.h

@@ -21,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN
 /* The visual style of the view */
 @property (nonatomic, assign) TOPasscodeViewStyle style;
 
+/* The type of passcode being managed by it */
+@property (nonatomic, readonly) TOPasscodeType passcodeType;
+
 /* The text in the title view (Default is 'Enter Passcode') */
 @property (nonatomic, copy) NSString *titleText;
 
@@ -64,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy, nullable) void (^passcodeCompletedHandler)(NSString *passcode);
 
 /* Create a new instance with one of the style types */
-- (instancetype)initWithStyle:(TOPasscodeViewStyle)style;
+- (instancetype)initWithStyle:(TOPasscodeViewStyle)style passcodeType:(TOPasscodeType)type;
 
 /* Resize the view and all subviews for the optimum size to fit a super view of the suplied width. */
 - (void)sizeToFitWidth:(CGFloat)width;