Fixed animation bug and added more input control

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -167,6 +167,9 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     // Update the visibility of the options button
     self.optionsButton.hidden = !(state == TOPasscodeSettingsViewStateEnterNewPassword);
 
+    // Clear the input view
+    self.numberInputView.passcode = nil;
+
     // Update the warning label
     self.warningLabel.hidden = !(confirmingPasscode && self.failedPasscodeAttemptCount > 0);
     self.warningLabel.numberOfWarnings = self.failedPasscodeAttemptCount;
@@ -175,9 +178,6 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     frame.origin.x = (CGRectGetWidth(self.view.frame) - frame.size.width) * 0.5f;
     self.warningLabel.frame = frame;
 
-    // Reset the passcode view
-    [self.numberInputView resetPasscodeAnimated:NO playImpact:NO];
-
     // Change the input view if needed
     if (self.passcodeType < TOPasscodeTypeCustomNumeric) {
         self.numberInputView.requiredLength = (self.passcodeType == TOPasscodeTypeSixDigits) ? 6 : 4;
@@ -371,8 +371,6 @@ - (void)numberViewDidEnterPasscode:(NSString *)passcode
             [self confirmNewPasscode:passcode];
             break;
     }
-
-    [self updateContentForState:self.state type:self.passcodeType];
 }
 
 - (void)validateCurrentPasscodeAttemptWithPasscode:(NSString *)passcode
@@ -471,4 +469,11 @@ - (void)setState:(TOPasscodeSettingsViewState)state
     [self updateContentForState:_state type:self.passcodeType];
 }
 
+- (void)setFailedPasscodeAttemptCount:(NSInteger)failedPasscodeAttemptCount
+{
+    if (_failedPasscodeAttemptCount == failedPasscodeAttemptCount) { return; }
+    _failedPasscodeAttemptCount = failedPasscodeAttemptCount;
+    [self updateContentForState:self.state type:self.passcodeType];
+}
+
 @end

TOPasscodeViewController/TOPasscodeViewController.h

@@ -52,6 +52,9 @@ NS_ASSUME_NONNULL_BEGIN
 /** The base style of the PIN view controller. Can be configured further. */
 @property (nonatomic, assign) TOPasscodeViewStyle style;
 
+/** The type of passcode that is expected to be entered. */
+@property (nonatomic, assign) 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;
 

TOPasscodeViewController/TOPasscodeViewController.m

@@ -366,6 +366,14 @@ - (TOPasscodeView *)passcodeView
     return _passcodeView;
 }
 
+- (void)setPasscodeType:(TOPasscodeType)passcodeType
+{
+    if (_passcodeType == passcodeType) { return; }
+    _passcodeType = passcodeType;
+    self.passcodeView.numberInputView.requiredLength = _passcodeType == TOPasscodeTypeSixDigits ? 6 : 4;
+    [self.passcodeView setNeedsLayout];
+}
+
 - (void)setStyle:(TOPasscodeViewStyle)style
 {
     if (style == _style) { return; }

TOPasscodeViewController/Views/TOPasscodeNumberInputView.m

@@ -50,6 +50,11 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 #pragma mark - View Layout -
 
+- (void)setFrame:(CGRect)frame
+{
+    [super setFrame:frame];
+}
+
 - (void)sizeToFit
 {
     // Resize the view to encompass the circles

TOPasscodeViewControllerExample/ViewController.m

@@ -44,6 +44,7 @@ - (IBAction)showButtonTapped:(id)sender
     TOPasscodeViewController *passcodeViewController = [[TOPasscodeViewController alloc] initWithStyle:self.style];
     passcodeViewController.delegate = self;
     passcodeViewController.allowBiometricValidation = self.biometricsAvailable;
+    passcodeViewController.passcodeType = (self.passcode.length == 6) ? TOPasscodeTypeSixDigits : TOPasscodeTypeFourDigits;
     [self presentViewController:passcodeViewController animated:YES completion:nil];
 }