Fixed animation glitch in settings

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -178,7 +178,6 @@ - (void)viewWillAppear:(BOOL)animated
 
 - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscodeType)type animated:(BOOL)animated
 {
-    BOOL confirmingPasscode = state == TOPasscodeSettingsViewStateEnterCurrentPassword;
     BOOL variableSizePasscode = (type >= TOPasscodeTypeCustomNumeric);
 
     // Update the visibility of the options button
@@ -190,13 +189,8 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     // Disable the input view
     self.inputField.enabled = NO;
 
-    // Update the warning label
-    self.warningLabel.hidden = !(confirmingPasscode && self.failedPasscodeAttemptCount > 0);
-    self.warningLabel.numberOfWarnings = self.failedPasscodeAttemptCount;
-
-    CGRect frame = self.warningLabel.frame;
-    frame.origin.x = (CGRectGetWidth(self.view.frame) - frame.size.width) * 0.5f;
-    self.warningLabel.frame = frame;
+    //Update the warning label
+    [self updateWarningLabelForState:state];
 
     // Change the input view if needed
     if (!variableSizePasscode) {
@@ -226,6 +220,8 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
             break;
     }
 
+    CGRect frame = CGRectZero;
+
     // Reload the 'Done' button
     [self.inputField reloadInputViews];
 
@@ -264,6 +260,19 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     }];
 }
 
+- (void)updateWarningLabelForState:(TOPasscodeSettingsViewState)state
+{
+    BOOL confirmingPasscode = state == TOPasscodeSettingsViewStateEnterCurrentPassword;
+
+    // Update the warning label
+    self.warningLabel.hidden = !(confirmingPasscode && self.failedPasscodeAttemptCount > 0);
+    self.warningLabel.numberOfWarnings = self.failedPasscodeAttemptCount;
+
+    CGRect frame = self.warningLabel.frame;
+    frame.origin.x = (CGRectGetWidth(self.view.frame) - frame.size.width) * 0.5f;
+    self.warningLabel.frame = frame;
+}
+
 - (void)transitionToState:(TOPasscodeSettingsViewState)state animated:(BOOL)animated
 {
     // Preserve the current view state
@@ -440,8 +449,8 @@ - (void)validateCurrentPasscodeAttemptWithPasscode:(NSString *)passcode
 
     BOOL correct = [self.delegate passcodeSettingsViewController:self didAttemptCurrentPasscode:passcode];
     if (!correct) {
-        self.failedPasscodeAttemptCount++;
         [self.inputField resetPasscodeAnimated:YES playImpact:YES];
+        self.failedPasscodeAttemptCount++;
     }
     else {
         [self transitionToState:TOPasscodeSettingsViewStateEnterNewPassword animated:YES];
@@ -572,7 +581,7 @@ - (void)setFailedPasscodeAttemptCount:(NSInteger)failedPasscodeAttemptCount
 {
     if (_failedPasscodeAttemptCount == failedPasscodeAttemptCount) { return; }
     _failedPasscodeAttemptCount = failedPasscodeAttemptCount;
-    [self updateContentForState:self.state type:self.passcodeType animated:NO];
+    [self updateWarningLabelForState:self.state];
 }
 
 @end