Removed incorrect references to ‘password’

Author: TimOliver

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.h

@@ -70,7 +70,7 @@
 /* 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 textFieldCircleDiameter;  // The size of the circles in the passcode 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

TOPasscodeViewController/Models/TOPasscodeViewControllerAnimatedTransitioning.m

@@ -86,9 +86,9 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
         [transitionContext completeTransition:completed];
     };
 
-    // If we're animating out from a successful password, play a zooming out animation
+    // If we're animating out from a successful passcode, play a zooming out animation
     // to give some more context
-    if (self.passcodeSuccess && self.dismissing) {
+    if (self.success && self.dismissing) {
         CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform"];
         animation.duration = [self transitionDuration:transitionContext];
         animation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.75f, 0.75f, 1)];

TOPasscodeViewController/TOPasscodeSettingsViewController.h

@@ -26,9 +26,9 @@
 @class TOPasscodeSettingsViewController;
 
 typedef NS_ENUM(NSInteger, TOPasscodeSettingsViewState) {
-    TOPasscodeSettingsViewStateEnterCurrentPassword,
-    TOPasscodeSettingsViewStateEnterNewPassword,
-    TOPasscodeSettingsViewStateConfirmNewPassword
+    TOPasscodeSettingsViewStateEnterCurrentPasscode,
+    TOPasscodeSettingsViewStateEnterNewPasscode,
+    TOPasscodeSettingsViewStateConfirmNewPasscode
 };
 
 NS_ASSUME_NONNULL_BEGIN
@@ -82,7 +82,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** The number of incorrect passcode attempts the user has made. Use this property to decide when to disable input. */
 @property (nonatomic, assign) NSInteger failedPasscodeAttemptCount;
 
-/** Before setting a new passcode, show a UI to validate the existing password. (Default is NO) */
+/** Before setting a new passcode, show a UI to validate the existing passcode. (Default is NO) */
 @property (nonatomic, assign) BOOL requireCurrentPasscode;
 
 /** If set, the view controller will disable input until this date time has been reached */

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -184,7 +184,7 @@ - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
 
-    self.state = self.requireCurrentPasscode ? TOPasscodeSettingsViewStateEnterCurrentPassword : TOPasscodeSettingsViewStateEnterNewPassword;
+    self.state = self.requireCurrentPasscode ? TOPasscodeSettingsViewStateEnterCurrentPasscode : TOPasscodeSettingsViewStateEnterNewPasscode;
     [self updateContentForState:self.state type:self.passcodeType animated:NO];
 }
 
@@ -195,7 +195,7 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     BOOL variableSizePasscode = (type >= TOPasscodeTypeCustomNumeric);
 
     // Update the visibility of the options button
-    self.optionsButton.hidden = !(state == TOPasscodeSettingsViewStateEnterNewPassword);
+    self.optionsButton.hidden = !(state == TOPasscodeSettingsViewStateEnterNewPasscode);
 
     // Clear the input view
     self.inputField.passcode = nil;
@@ -217,17 +217,17 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
 
     // Update text depending on state
     switch (state) {
-        case TOPasscodeSettingsViewStateEnterCurrentPassword:
+        case TOPasscodeSettingsViewStateEnterCurrentPasscode:
             self.titleLabel.text = NSLocalizedString(@"Enter your passcode", @"");
             self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.nextBarButtonItem : nil;
             self.inputField.returnKeyType = UIReturnKeyContinue;
             break;
-        case TOPasscodeSettingsViewStateEnterNewPassword:
+        case TOPasscodeSettingsViewStateEnterNewPasscode:
             self.titleLabel.text = NSLocalizedString(@"Enter a new passcode", @"");
             self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.nextBarButtonItem : nil;
             self.inputField.returnKeyType = UIReturnKeyContinue;
             break;
-        case TOPasscodeSettingsViewStateConfirmNewPassword:
+        case TOPasscodeSettingsViewStateConfirmNewPasscode:
             self.titleLabel.text = NSLocalizedString(@"Confirm new passcode", @"");
             self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.doneBarButtonItem : nil;
             self.inputField.returnKeyType = UIReturnKeyDone;
@@ -276,7 +276,7 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
 
 - (void)updateWarningLabelForState:(TOPasscodeSettingsViewState)state
 {
-    BOOL confirmingPasscode = state == TOPasscodeSettingsViewStateEnterCurrentPassword;
+    BOOL confirmingPasscode = state == TOPasscodeSettingsViewStateEnterCurrentPasscode;
 
     // Update the warning label
     self.warningLabel.hidden = !(confirmingPasscode && self.failedPasscodeAttemptCount > 0);
@@ -317,13 +317,13 @@ - (void)transitionToState:(TOPasscodeSettingsViewState)state animated:(BOOL)anim
 
     // Update the options button alpha depending on transition state
     self.optionsButton.hidden = NO;
-    self.optionsButton.alpha = (state == TOPasscodeSettingsViewStateEnterNewPassword) ? 0.0f : 1.0f;
+    self.optionsButton.alpha = (state == TOPasscodeSettingsViewStateEnterNewPasscode) ? 0.0f : 1.0f;
 
     // Perform an animation where the snapshot slides off, and the new container slides in
     id animationBlock = ^{
         snapshot.frame = CGRectOffset(snapshot.frame, -self.view.frame.size.width * multiplier, 0.0f);
         self.containerView.frame = CGRectOffset(self.containerView.frame, -self.view.frame.size.width * multiplier, 0.0f);
-        self.optionsButton.alpha = (state == TOPasscodeSettingsViewStateEnterNewPassword) ? 1.0f : 0.0f;
+        self.optionsButton.alpha = (state == TOPasscodeSettingsViewStateEnterNewPasscode) ? 1.0f : 0.0f;
     };
 
     // Clean up by removing the snapshot view
@@ -443,13 +443,13 @@ - (void)applyThemeForStyle:(TOPasscodeSettingsViewStyle)style
 - (void)inputViewDidCompletePasscode:(NSString *)passcode
 {
     switch (self.state) {
-        case TOPasscodeSettingsViewStateEnterCurrentPassword:
+        case TOPasscodeSettingsViewStateEnterCurrentPasscode:
             [self validateCurrentPasscodeAttemptWithPasscode:passcode];
             break;
-        case TOPasscodeSettingsViewStateEnterNewPassword:
+        case TOPasscodeSettingsViewStateEnterNewPasscode:
             [self didReceiveNewPasscode:passcode];
             break;
-        case TOPasscodeSettingsViewStateConfirmNewPassword:
+        case TOPasscodeSettingsViewStateConfirmNewPasscode:
             [self confirmNewPasscode:passcode];
             break;
     }
@@ -467,20 +467,20 @@ - (void)validateCurrentPasscodeAttemptWithPasscode:(NSString *)passcode
         self.failedPasscodeAttemptCount++;
     }
     else {
-        [self transitionToState:TOPasscodeSettingsViewStateEnterNewPassword animated:YES];
+        [self transitionToState:TOPasscodeSettingsViewStateEnterNewPasscode animated:YES];
     }
 }
 
 - (void)didReceiveNewPasscode:(NSString *)passcode
 {
     self.potentialPasscode = passcode;
-    [self transitionToState:TOPasscodeSettingsViewStateConfirmNewPassword animated:YES];
+    [self transitionToState:TOPasscodeSettingsViewStateConfirmNewPasscode animated:YES];
 }
 
 - (void)confirmNewPasscode:(NSString *)passcode
 {
     if (![passcode isEqualToString:self.potentialPasscode]) {
-        [self transitionToState:TOPasscodeSettingsViewStateEnterNewPassword animated:YES];
+        [self transitionToState:TOPasscodeSettingsViewStateEnterNewPasscode animated:YES];
         self.errorLabel.hidden = NO;
         return;
     }

TOPasscodeViewController/Views/Settings/TOPasscodeSettingsWarningLabel.h

@@ -10,7 +10,7 @@
 
 @interface TOPasscodeSettingsWarningLabel : UIImageView
 
-/** The number of incorrect password attempts to display */
+/** The number of incorrect passcode attempts to display */
 @property (nonatomic, assign) NSInteger numberOfWarnings;
 
 /** The font of the text */

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.h

@@ -30,7 +30,7 @@ typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
 /* A row of hollow circles at a preset length. Valid only when `style` is set to `fixed` */
 @property (nonatomic, readonly, nullable) TOPasscodeFixedInputView *fixedInputView;
 
-/* A rounded rectangle representing a password of arbitrary length. Valid only when `style` is set to `variable`. */
+/* A rounded rectangle representing a passcode of arbitrary length. Valid only when `style` is set to `variable`. */
 @property (nonatomic, readonly, nullable) TOPasscodeVariableInputView *variableInputView;
 
 /* The 'submit' button shown when `showSubmitButton` is true. */