Added incorrect password logic to settings

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.h

@@ -21,16 +21,20 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol TOPasscodeSettingsViewControllerDelegate <NSObject>
 
+@optional
+
 /** Called when the user was prompted to input their current passcode.
  Return YES if passcode was right and NO otherwise.
 
  Returning NO will cause a warning label to appear
  */
-- (BOOL)passcodeSettingsViewControllerDidAttemptCurrentPasscode:(NSString *)passcode;
+- (BOOL)passcodeSettingsViewController:(TOPasscodeSettingsViewController *)passcodeSettingsViewController
+             didAttemptCurrentPasscode:(NSString *)passcode;
 
 /** Called when the user has successfully set a new passcode. At this point, you should save over
     the old passcode with the new one. */
-- (void)passcodeSettingsViewControllerDidChangeToNewPasscode:(NSString *)passcode ofType:(TOPasscodeType)type;
+- (void)passcodeSettingsViewController:(TOPasscodeSettingsViewController *)passcodeSettingsViewController
+                didChangeToNewPasscode:(NSString *)passcode ofType:(TOPasscodeType)type;
 
 @end
 
@@ -41,10 +45,16 @@ NS_ASSUME_NONNULL_BEGIN
 /** Delegate event for controlling and responding to the behavior of this controller */
 @property (nonatomic, weak, nullable) id<TOPasscodeSettingsViewControllerDelegate> delegate;
 
+/** The current state of the controller (confirming old passcode or creating a new one) */
+@property (nonatomic, assign) TOPasscodeSettingsViewState state;
+
 /** Set the visual style of the view controller (light or dark) */
 @property (nonatomic, assign) TOPasscodeSettingsViewStyle style;
 
-/** Before setting a new passcode, show a UI to validate the existing password. (Default is YES) */
+/** 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) */
 @property (nonatomic, assign) BOOL requireCurrentPasscode;
 
 /** If set, the view controller will disable input until this date time has been reached */

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -18,6 +18,7 @@
 
 @interface TOPasscodeSettingsViewController ()
 
+// Views
 @property (nonatomic, strong) UIView *containerView;
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) TOPasscodeNumberInputView *numberInputView;
@@ -32,11 +33,26 @@ - (instancetype)initWithStyle:(TOPasscodeSettingsViewStyle)style
 {
     if (self = [self initWithNibName:nil bundle:nil]) {
         _style = style;
+        [self setUp];
     }
 
     return self;
 }
 
+- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
+        [self setUp];
+    }
+
+    return self;
+}
+
+- (void)setUp
+{
+    _failedPasscodeAttemptCount = 0;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
 
@@ -64,6 +80,7 @@ - (void)viewDidLoad {
     self.numberInputView = [[TOPasscodeNumberInputView alloc] initWithRequiredLength:4];
     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];
 
@@ -76,10 +93,11 @@ - (void)viewDidLoad {
     self.warningLabel = [[TOPasscodeSettingsWarningLabel alloc] initWithFrame:CGRectZero];
     self.warningLabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
     self.warningLabel.hidden = YES;
+    [self.warningLabel sizeToFit];
     [self.containerView addSubview:self.warningLabel];
 
     // Add callbacks for the keypad view
-    self.keypadView.numberButtonTappedHandler= ^(NSInteger number) {
+    self.keypadView.numberButtonTappedHandler = ^(NSInteger number) {
         NSString *numberString = [NSString stringWithFormat:@"%ld", number];
         [weakSelf.numberInputView appendPasscodeCharacters:numberString animated:NO];
     };
@@ -114,6 +132,38 @@ - (void)viewDidLoad {
     [self applyThemeForStyle:self.style];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+
+    self.state = self.requireCurrentPasscode ? TOPasscodeSettingsViewStateEnterCurrentPassword : TOPasscodeSettingsViewStateEnterNewPassword;
+    [self updateViewsForState:self.state];
+}
+
+- (void)updateViewsForState:(TOPasscodeSettingsViewState)state
+{
+    BOOL confirmingPasscode = state == TOPasscodeSettingsViewStateEnterCurrentPassword;
+
+    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;
+
+    switch (state) {
+        case TOPasscodeSettingsViewStateEnterCurrentPassword:
+            self.titleLabel.text = NSLocalizedString(@"Enter your passcode", @"");
+            break;
+        case TOPasscodeSettingsViewStateEnterNewPassword:
+            self.titleLabel.text = NSLocalizedString(@"Enter a new passcode", @"");
+            break;
+        case TOPasscodeSettingsViewStateConfirmNewPassword:
+            self.titleLabel.text = NSLocalizedString(@"Confirm new passcode", @"");
+            break;
+    }
+}
+
 - (void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
@@ -178,4 +228,20 @@ - (void)applyThemeForStyle:(TOPasscodeSettingsViewStyle)style
     }
 }
 
+#pragma mark - Data Management -
+- (void)numberViewDidEnterPasscode:(NSString *)passcode
+{
+    if (![self.delegate respondsToSelector:@selector(passcodeSettingsViewController:didAttemptCurrentPasscode:)]) {
+        return;
+    }
+
+    BOOL correct = [self.delegate passcodeSettingsViewController:self didAttemptCurrentPasscode:passcode];
+    if (!correct) {
+        self.failedPasscodeAttemptCount++;
+        [self.numberInputView resetPasscodeAnimated:YES playImpact:YES];
+    }
+
+    [self updateViewsForState:self.state];
+}
+
 @end

TOPasscodeViewController/Views/TOPasscodeSettingsWarningLabel.m

@@ -57,13 +57,12 @@ - (void)sizeToFit
     [super sizeToFit];
     [self.label sizeToFit];
 
-    CGRect frame = self.frame;
     CGRect labelFrame = self.label.frame;
+    CGRect frame = self.frame;
 
+    CGPoint midPoint = (CGPoint){CGRectGetMidX(frame), CGRectGetMidY(frame)};
     labelFrame = CGRectInset(labelFrame, -self.textPadding.width, -self.textPadding.height);
     frame.size = labelFrame.size;
-    frame.origin.x = CGRectGetMidX(frame) - (CGRectGetWidth(labelFrame) * 0.5f);
-    frame.origin.y = CGRectGetMidY(frame) - (CGRectGetHeight(labelFrame) * 0.5f);
     self.frame = frame;
 }
 
@@ -131,4 +130,12 @@ + (UIImage *)roundedBackgroundImageWithHeight:(CGFloat)height
     return image;
 }
 
+#pragma mark - Accessors -
+
+- (void)setNumberOfWarnings:(NSInteger)numberOfWarnings
+{
+    _numberOfWarnings = numberOfWarnings;
+    [self setTextForCount:_numberOfWarnings];
+}
+
 @end

TOPasscodeViewControllerExample/SettingsViewController.m

@@ -9,7 +9,9 @@
 #import "SettingsViewController.h"
 #import "TOPasscodeSettingsViewController.h"
 
-@interface SettingsViewController () <UIImagePickerControllerDelegate, UINavigationControllerDelegate>
+@interface SettingsViewController () <UIImagePickerControllerDelegate,
+UINavigationControllerDelegate,
+TOPasscodeSettingsViewControllerDelegate>
 
 @property (nonatomic, strong) UIImageView *imageView;
 
@@ -49,6 +51,18 @@ - (void)doneButtonTapped
     }
 }
 
+#pragma mark - Settings Controller Delegate -
+
+- (BOOL)passcodeSettingsViewController:(TOPasscodeSettingsViewController *)passcodeSettingsViewController didAttemptCurrentPasscode:(NSString *)passcode
+{
+    return [passcode isEqualToString:self.passcode];
+}
+
+- (void)passcodeSettingsViewController:(TOPasscodeSettingsViewController *)passcodeSettingsViewController didChangeToNewPasscode:(NSString *)passcode ofType:(TOPasscodeType)type
+{
+
+}
+
 #pragma mark - Table view data source
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
@@ -132,6 +146,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     }
     else if (indexPath.section == 0) {
         TOPasscodeSettingsViewController *settingsController = [[TOPasscodeSettingsViewController alloc] init];
+        settingsController.delegate = self;
+        settingsController.requireCurrentPasscode = YES;
         [self.navigationController pushViewController:settingsController animated:YES];
     }
     else {