Added arbitrary input to settings

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -29,7 +29,7 @@ @interface TOPasscodeSettingsViewController ()
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UILabel *errorLabel;
 @property (nonatomic, strong) UIButton *optionsButton;
-@property (nonatomic, strong) TOPasscodeInputField *numberInputView;
+@property (nonatomic, strong) TOPasscodeInputField *inputField;
 @property (nonatomic, strong) TOPasscodeSettingsKeypadView *keypadView;
 @property (nonatomic, strong) TOPasscodeSettingsWarningLabel *warningLabel;
 
@@ -89,12 +89,12 @@ - (void)viewDidLoad {
     [self.containerView addSubview:self.titleLabel];
 
     // Create number view
-    self.numberInputView = [[TOPasscodeInputField alloc] init];
-    self.numberInputView.tintColor = [UIColor blackColor];
-    self.numberInputView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
-    self.numberInputView.passcodeCompletedHandler = ^(NSString *passcode) { [weakSelf numberViewDidEnterPasscode:passcode]; };
-    [self.numberInputView sizeToFit];
-    [self.containerView addSubview:self.numberInputView];
+    self.inputField = [[TOPasscodeInputField alloc] init];
+    self.inputField.tintColor = [UIColor blackColor];
+    self.inputField.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+    self.inputField.passcodeCompletedHandler = ^(NSString *passcode) { [weakSelf numberViewDidEnterPasscode:passcode]; };
+    [self.inputField sizeToFit];
+    [self.containerView addSubview:self.inputField];
 
     // Create keypad view
     self.keypadView = [[TOPasscodeSettingsKeypadView alloc] initWithFrame:CGRectZero];
@@ -129,20 +129,20 @@ - (void)viewDidLoad {
     // Add callbacks for the keypad view
     self.keypadView.numberButtonTappedHandler = ^(NSInteger number) {
         NSString *numberString = [NSString stringWithFormat:@"%ld", number];
-        [weakSelf.numberInputView appendPasscodeCharacters:numberString animated:NO];
+        [weakSelf.inputField appendPasscodeCharacters:numberString animated:NO];
     };
 
-    self.keypadView.deleteButtonTappedHandler = ^{ [weakSelf.numberInputView deletePasscodeCharactersOfCount:1 animated:NO]; };
+    self.keypadView.deleteButtonTappedHandler = ^{ [weakSelf.inputField deletePasscodeCharactersOfCount:1 animated:NO]; };
 
     // Set height of the container view (This will never change)
     CGRect frame = self.containerView.frame;
     frame.size.width = self.view.bounds.size.width;
-    frame.size.height = CGRectGetHeight(self.titleLabel.frame) + CGRectGetHeight(self.numberInputView.frame)
+    frame.size.height = CGRectGetHeight(self.titleLabel.frame) + CGRectGetHeight(self.inputField.frame)
                             + CGRectGetHeight(self.warningLabel.frame) + (kTOPasscodeSettingsLabelInputSpacing * 2.0f);
     self.containerView.frame = CGRectIntegral(frame);
 
     //Work out the vertical offset of the container view assuming the warning label doesn't count
-    self.verticalMidPoint = CGRectGetHeight(self.titleLabel.frame) + CGRectGetHeight(self.numberInputView.frame)
+    self.verticalMidPoint = CGRectGetHeight(self.titleLabel.frame) + CGRectGetHeight(self.inputField.frame)
                             + kTOPasscodeSettingsLabelInputSpacing;
     self.verticalMidPoint *= 0.5f;
 
@@ -168,7 +168,7 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     self.optionsButton.hidden = !(state == TOPasscodeSettingsViewStateEnterNewPassword);
 
     // Clear the input view
-    self.numberInputView.passcode = nil;
+    self.inputField.passcode = nil;
 
     // Update the warning label
     self.warningLabel.hidden = !(confirmingPasscode && self.failedPasscodeAttemptCount > 0);
@@ -179,8 +179,12 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     self.warningLabel.frame = frame;
 
     // Change the input view if needed
-    if (self.passcodeType < TOPasscodeTypeCustomNumeric) {
-        self.numberInputView.fixedLength = (self.passcodeType == TOPasscodeTypeSixDigits) ? 6 : 4;
+    if (type < TOPasscodeTypeCustomNumeric) {
+        self.inputField.style = TOPasscodeInputFieldStyleFixed;
+        self.inputField.fixedInputView.length = (self.passcodeType == TOPasscodeTypeSixDigits) ? 6 : 4;
+    }
+    else {
+        self.inputField.style = TOPasscodeInputFieldStyleVariable;
     }
 
     // Update text depending on state
@@ -200,13 +204,13 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     [self.titleLabel sizeToFit];
     frame = self.titleLabel.frame;
     frame.origin.x = (CGRectGetWidth(self.containerView.frame) - CGRectGetWidth(frame)) * 0.5f;
-    self.titleLabel.frame = frame;
+    self.titleLabel.frame = CGRectIntegral(frame);
 
     // Resize passcode view
-    [self.numberInputView sizeToFit];
-    frame = self.numberInputView.frame;
+    [self.inputField sizeToFit];
+    frame = self.inputField.frame;
     frame.origin.x = (CGRectGetWidth(self.containerView.frame) - CGRectGetWidth(frame)) * 0.5f;
-    self.numberInputView.frame = frame;
+    self.inputField.frame = CGRectIntegral(frame);
 }
 
 - (void)transitionToState:(TOPasscodeSettingsViewState)state animated:(BOOL)animated
@@ -302,21 +306,21 @@ - (void)viewDidLayoutSubviews
     self.titleLabel.frame = CGRectIntegral(frame);
 
     // Set frame of number pad
-    frame = self.numberInputView.frame;
+    frame = self.inputField.frame;
     frame.origin.x = (CGRectGetWidth(self.view.frame) - CGRectGetWidth(frame)) * 0.5f;
     frame.origin.y = (CGRectGetHeight(self.titleLabel.frame) + kTOPasscodeSettingsLabelInputSpacing);
-    self.numberInputView.frame = CGRectIntegral(frame);
+    self.inputField.frame = CGRectIntegral(frame);
 
     // Set the frame for the warning view
     frame = self.warningLabel.frame;
     frame.origin.x = (CGRectGetWidth(self.view.frame) - CGRectGetWidth(frame)) * 0.5f;
-    frame.origin.y = CGRectGetMaxY(self.numberInputView.frame) + kTOPasscodeSettingsLabelInputSpacing;
+    frame.origin.y = CGRectGetMaxY(self.inputField.frame) + kTOPasscodeSettingsLabelInputSpacing;
     self.warningLabel.frame = CGRectIntegral(frame);
 
     // Set the frame of the error view
     frame = self.errorLabel.frame;
     frame.size = [self.errorLabel sizeThatFits:CGSizeMake(300.0f, CGFLOAT_MAX)];
-    frame.origin.y = CGRectGetMaxY(self.numberInputView.frame) + kTOPasscodeSettingsLabelInputSpacing;
+    frame.origin.y = CGRectGetMaxY(self.inputField.frame) + kTOPasscodeSettingsLabelInputSpacing;
     frame.origin.x = (CGRectGetWidth(self.containerView.frame) - CGRectGetWidth(frame)) * 0.5f;
     self.errorLabel.frame = CGRectIntegral(frame);
 }
@@ -345,7 +349,7 @@ - (void)applyThemeForStyle:(TOPasscodeSettingsViewStyle)style
     self.titleLabel.textColor = inputColor;
 
     // Set the number input tint
-    self.numberInputView.tintColor = inputColor;
+    self.inputField.tintColor = inputColor;
 
     // Set the tint color of the incorrect warning label
     UIColor *warningColor = nil;
@@ -382,7 +386,7 @@ - (void)validateCurrentPasscodeAttemptWithPasscode:(NSString *)passcode
     BOOL correct = [self.delegate passcodeSettingsViewController:self didAttemptCurrentPasscode:passcode];
     if (!correct) {
         self.failedPasscodeAttemptCount++;
-        [self.numberInputView resetPasscodeAnimated:YES playImpact:YES];
+        [self.inputField resetPasscodeAnimated:YES playImpact:YES];
     }
     else {
         [self transitionToState:TOPasscodeSettingsViewStateEnterNewPassword animated:YES];

TOPasscodeViewController/TOPasscodeViewController.h

@@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** 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;
 
-/** If Touch ID is available, automatically ask for it upon presentation (Default is YES) */
+/** If Touch ID is available, automatically ask for it upon presentation (Default is NO) */
 @property (nonatomic, assign) BOOL automaticallyPromptForBiometricValidation;
 
 /** Optionally change the color of the title text label. */

TOPasscodeViewController/TOPasscodeViewController.m

@@ -51,7 +51,7 @@ - (void)setUp
 {
     self.transitioningDelegate = self;
     self.view.backgroundColor = [UIColor clearColor];
-    self.automaticallyPromptForBiometricValidation = YES;
+    self.automaticallyPromptForBiometricValidation = NO;
 
     if (TOPasscodeViewStyleIsTranslucent(self.style)) {
         self.modalPresentationStyle = UIModalPresentationOverFullScreen;
@@ -178,7 +178,7 @@ - (void)viewDidAppear:(BOOL)animated
     [super viewDidAppear:animated];
 
     // Automatically trigger biometric validation if available
-    if (self.allowBiometricValidation) {
+    if (self.allowBiometricValidation && self.automaticallyPromptForBiometricValidation) {
         [self accessoryButtonTapped:self.biometricButton];
     }
 }
@@ -370,7 +370,15 @@ - (void)setPasscodeType:(TOPasscodeType)passcodeType
 {
     if (_passcodeType == passcodeType) { return; }
     _passcodeType = passcodeType;
-    self.passcodeView.numberInputView.fixedLength = _passcodeType == TOPasscodeTypeSixDigits ? 6 : 4;
+
+    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];
 }
 

TOPasscodeViewController/Views/Main/TOPasscodeView.h

@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /* The default views always shown in this view */
 @property (nonatomic, readonly) UILabel *titleLabel;
-@property (nonatomic, readonly) TOPasscodeInputField *numberInputView;
+@property (nonatomic, readonly) TOPasscodeInputField *inputField;
 @property (nonatomic, readonly) TOPasscodeKeypadView *keypadView;
 
 /* Overrides for theming the various elements. */

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -19,7 +19,7 @@ @interface TOPasscodeView ()
 
 @property (nonatomic, strong, readwrite) UILabel *titleLabel;
 @property (nonatomic, strong, readwrite) TOPasscodeKeypadView *keypadView;
-@property (nonatomic, strong, readwrite) TOPasscodeInputField *numberInputView;
+@property (nonatomic, strong, readwrite) TOPasscodeInputField *inputField;
 
 @end
 
@@ -100,10 +100,10 @@ - (void)layoutSubviews
     y = CGRectGetMaxY(frame) + self.currentLayout.titleLabelBottomSpacing;
 
     // Circle Row View
-    frame = self.numberInputView.frame;
+    frame = self.inputField.frame;
     frame.origin.y = y;
     frame.origin.x = midViewSize.width - (CGRectGetWidth(frame) * 0.5f);
-    self.numberInputView.frame = frame;
+    self.inputField.frame = frame;
 
     y = CGRectGetMaxY(frame) + self.currentLayout.circleRowBottomSpacing;
 
@@ -139,7 +139,7 @@ - (void)sizeToFitWidth:(CGFloat)width
 - (void)sizeToFit
 {
     [self.titleLabel sizeToFit];
-    [self.numberInputView sizeToFit];
+    [self.inputField sizeToFit];
     [self.keypadView sizeToFit];
 
     CGRect frame = self.frame;
@@ -157,7 +157,7 @@ - (void)sizeToFit
     frame.size.height += self.currentLayout.titleLabelBottomSpacing;
 
     // Add height for the circle rows
-    frame.size.height += self.numberInputView.frame.size.height;
+    frame.size.height += self.inputField.frame.size.height;
     frame.size.height += self.currentLayout.circleRowBottomSpacing;
 
     // Add height for the keypad
@@ -182,19 +182,19 @@ - (void)setUpView
     [self addSubview:self.titleLabel];
 
     // Set up circle rows
-    self.numberInputView = [[TOPasscodeInputField alloc] init];
-    self.numberInputView.passcodeCompletedHandler = ^(NSString *passcode) {
+    self.inputField = [[TOPasscodeInputField alloc] init];
+    self.inputField.passcodeCompletedHandler = ^(NSString *passcode) {
         if (weakSelf.passcodeCompletedHandler) {
             weakSelf.passcodeCompletedHandler(passcode);
         }
     };
-    [self addSubview:self.numberInputView];
+    [self addSubview:self.inputField];
 
     // Set up pad row
     self.keypadView = [[TOPasscodeKeypadView alloc] init];
     self.keypadView.buttonTappedHandler = ^(NSInteger button) {
         NSString *numberString = [NSString stringWithFormat:@"%ld", button];
-        [weakSelf.numberInputView appendPasscodeCharacters:numberString animated:NO];
+        [weakSelf.inputField appendPasscodeCharacters:numberString animated:NO];
 
         if (weakSelf.passcodeDigitEnteredHandler) {
             weakSelf.passcodeDigitEnteredHandler();
@@ -209,8 +209,8 @@ - (void)updateSubviewsForContentLayout:(TOPasscodeViewContentLayout *)contentLay
     self.titleLabel.font = contentLayout.titleLabelFont;
 
     // Circle Row View
-    self.numberInputView.fixedCircleDiameter = contentLayout.circleRowDiameter;
-    self.numberInputView.fixedCircleSpacing = contentLayout.circleRowSpacing;
+    self.inputField.fixedInputView.circleDiameter = contentLayout.circleRowDiameter;
+    self.inputField.fixedInputView.circleSpacing = contentLayout.circleRowSpacing;
 
     // Keypad
     self.keypadView.buttonNumberFont = contentLayout.circleButtonTitleLabelFont;
@@ -237,11 +237,11 @@ - (void)applyThemeForStyle:(TOPasscodeViewStyle)style
     if (isTranslucent) {
         UIBlurEffect *blurEffect = [self blurEffectForStyle:style];
         UIVibrancyEffect *vibrancyEffect = [UIVibrancyEffect effectForBlurEffect:blurEffect];
-        self.numberInputView.effect = vibrancyEffect;
+        self.inputField.effect = vibrancyEffect;
         self.keypadView.vibrancyEffect = vibrancyEffect;
     }
     else {
-        self.numberInputView.effect = nil;
+        self.inputField.effect = nil;
         self.keypadView.vibrancyEffect = nil;
     }
 
@@ -252,7 +252,7 @@ - (void)applyThemeForStyle:(TOPasscodeViewStyle)style
     if (circleRowColor == nil) {
         circleRowColor = defaultTintColor;
     }
-    self.numberInputView.tintColor = defaultTintColor;
+    self.inputField.tintColor = defaultTintColor;
 
     // Set the tint color of the keypad buttons
     UIColor *keypadButtonBackgroundColor = self.keypadButtonBackgroundColor;
@@ -284,12 +284,12 @@ - (void)applyThemeForStyle:(TOPasscodeViewStyle)style
 #pragma mark - Passcode Management -
 - (void)resetPasscodeAnimated:(BOOL)animated playImpact:(BOOL)impact
 {
-    [self.numberInputView resetPasscodeAnimated:animated playImpact:impact];
+    [self.inputField resetPasscodeAnimated:animated playImpact:impact];
 }
 
 - (void)deleteLastPasscodeCharacterAnimated:(BOOL)animated
 {
-    [self.numberInputView deletePasscodeCharactersOfCount:1 animated:animated];
+    [self.inputField deletePasscodeCharactersOfCount:1 animated:animated];
 }
 
 #pragma mark - Internal Style Management -
@@ -359,20 +359,20 @@ - (void)setContentAlpha:(CGFloat)contentAlpha
 
     self.titleView.alpha = contentAlpha;
     self.titleLabel.alpha = contentAlpha;
-    self.numberInputView.contentAlpha = contentAlpha;
+    self.inputField.contentAlpha = contentAlpha;
     self.keypadView.contentAlpha = contentAlpha;
     self.leftButton.alpha = contentAlpha;
     self.rightButton.alpha = contentAlpha;
 }
 
 - (void)setPasscode:(NSString *)passcode
 {
-    [self.numberInputView setPasscode:passcode];
+    [self.inputField setPasscode:passcode];
 }
 
 - (NSString *)passcode
 {
-    return self.numberInputView.passcode;
+    return self.inputField.passcode;
 }
 
 @end

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.h

@@ -8,29 +8,27 @@
 
 #import <UIKit/UIKit.h>
 
+#import "TOPasscodeFixedInputView.h"
+#import "TOPasscodeVariableInputView.h"
+
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
     TOPasscodeInputFieldStyleFixed,    // The passcode explicitly requires a specific number of characters (Shows hollow circles)
     TOPasscodeInputFieldStyleVariable  // The passcode can be any arbitrary number of characters (Shows an empty rectangle)
 };
 
-@class TOPasscodeFixedInputView;
-@class TOPasscodeVariableInputView;
-
 @interface TOPasscodeInputField : UIVisualEffectView <UIKeyInput>
 
 /* The input style of this control */
 @property (nonatomic, assign) TOPasscodeInputFieldStyle style;
 
-/* The size of each circle in this view (Default is 16) */
-@property (nonatomic, assign) CGFloat fixedCircleDiameter;
-
-/* The spacing between each circle (Default is 25.0f) */
-@property (nonatomic, assign) CGFloat fixedCircleSpacing;
+/* A row of hollow circles at a preset length. Valid only when `style` is set to `fixed` */
+@property (nonatomic, readonly, nullable) TOPasscodeFixedInputView *fixedInputView;
 
-/* The number of circles in this view (Default is 4) */
-@property (nonatomic, assign) NSInteger fixedLength;
+/* A rounded rectangle representing a password of arbitrary length. Valid only when `style` is set to `variable`. */
+@property (nonatomic, readonly, nullable) TOPasscodeVariableInputView *variableInputView;
 
 /* The current passcode entered into this view */
 @property (nonatomic, copy, nullable) NSString *passcode;
@@ -41,7 +39,7 @@ typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
 /* The alpha value of the views in this view (For tranclucent styling) */
 @property (nonatomic, assign) CGFloat contentAlpha;
 
-/** Called when the number of digits has been entered */
+/** Called when the number of digits has been entered, or the user tapped 'Done' on the keyboard */
 @property (nonatomic, copy) void (^passcodeCompletedHandler)(NSString *code);
 
 /* Init with the target length needed for this passcode */