Added more logic to settings

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.h

@@ -12,9 +12,9 @@
 @class TOPasscodeSettingsViewController;
 
 typedef NS_ENUM(NSInteger, TOPasscodeSettingsViewState) {
+    TOPasscodeSettingsViewStateEnterCurrentPassword,
     TOPasscodeSettingsViewStateEnterNewPassword,
-    TOPasscodeSettingsViewStateConfirmNewPassword,
-    TOPasscodeSettingsViewStateEnterCurrentPassword
+    TOPasscodeSettingsViewStateConfirmNewPassword
 };
 
 NS_ASSUME_NONNULL_BEGIN
@@ -51,6 +51,9 @@ NS_ASSUME_NONNULL_BEGIN
 /** Set the visual style of the view controller (light or dark) */
 @property (nonatomic, assign) TOPasscodeSettingsViewStyle style;
 
+/** The input type of the passcode */
+@property (nonatomic, assign) TOPasscodeType passcodeType;
+
 /** The number of incorrect passcode attempts the user has made. Use this property to decide when to disable input. */
 @property (nonatomic, assign) NSInteger failedPasscodeAttemptCount;
 

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -11,16 +11,24 @@
 #import "TOPasscodeSettingsKeypadView.h"
 #import "TOPasscodeSettingsWarningLabel.h"
 
-const CGFloat kTOPasscodeSettingsLabelInputSpacing = 18.0f;
+const CGFloat kTOPasscodeSettingsLabelInputSpacing = 15.0f;
+const CGFloat kTOPasscodeSettingsOptionsButtonOffset = 15.0f;
 const CGFloat kTOPasscodeKeypadMaxSizeRatio = 0.40f;
-const CGFloat kTOPasscodeKeypadMinHeight = 200.0f;
+const CGFloat kTOPasscodeKeypadMinHeight = 165.0f;
 const CGFloat kTOPasscodeKeypadMaxHeight = 330.0f;
 
 @interface TOPasscodeSettingsViewController ()
 
-// Views
+@property (nonatomic, copy) NSString *potentialPasscode;
+
+/* Layout Calculations */
+@property (nonatomic, assign) CGFloat verticalMidPoint;
+
+/* Views */
 @property (nonatomic, strong) UIView *containerView;
 @property (nonatomic, strong) UILabel *titleLabel;
+@property (nonatomic, strong) UILabel *errorLabel;
+@property (nonatomic, strong) UIButton *optionsButton;
 @property (nonatomic, strong) TOPasscodeNumberInputView *numberInputView;
 @property (nonatomic, strong) TOPasscodeSettingsKeypadView *keypadView;
 @property (nonatomic, strong) TOPasscodeSettingsWarningLabel *warningLabel;
@@ -29,6 +37,8 @@ @interface TOPasscodeSettingsViewController ()
 
 @implementation TOPasscodeSettingsViewController
 
+#pragma mark - Object Creation -
+
 - (instancetype)initWithStyle:(TOPasscodeSettingsViewStyle)style
 {
     if (self = [self initWithNibName:nil bundle:nil]) {
@@ -53,6 +63,8 @@ - (void)setUp
     _failedPasscodeAttemptCount = 0;
 }
 
+#pragma mark - View Set-up -
+
 - (void)viewDidLoad {
     [super viewDidLoad];
 
@@ -89,13 +101,31 @@ - (void)viewDidLoad {
     self.keypadView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
     [self.view addSubview:self.keypadView];
 
-    // Create label view
+    // Create warning label view
     self.warningLabel = [[TOPasscodeSettingsWarningLabel alloc] initWithFrame:CGRectZero];
     self.warningLabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
     self.warningLabel.hidden = YES;
     [self.warningLabel sizeToFit];
     [self.containerView addSubview:self.warningLabel];
 
+    // Create error label view
+    self.errorLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+    self.errorLabel.text = NSLocalizedString(@"Passcodes didn't match. Try again.", @"");
+    self.errorLabel.textAlignment = NSTextAlignmentCenter;
+    self.errorLabel.font = [UIFont systemFontOfSize:15.0f];
+    self.errorLabel.numberOfLines = 0;
+    self.errorLabel.hidden = YES;
+    [self.errorLabel sizeToFit];
+    [self.containerView addSubview:self.errorLabel];
+
+    // Create Options button
+    self.optionsButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    [self.optionsButton setTitle:NSLocalizedString(@"Passcode Options", @"") forState:UIControlStateNormal];
+    self.optionsButton.titleLabel.font = [UIFont systemFontOfSize:15.0f];
+    [self.optionsButton sizeToFit];
+    [self.optionsButton addTarget:self action:@selector(optionsCodeButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:self.optionsButton];
+
     // Add callbacks for the keypad view
     self.keypadView.numberButtonTappedHandler = ^(NSInteger number) {
         NSString *numberString = [NSString stringWithFormat:@"%ld", number];
@@ -108,25 +138,13 @@ - (void)viewDidLoad {
     CGRect frame = self.containerView.frame;
     frame.size.width = self.view.bounds.size.width;
     frame.size.height = CGRectGetHeight(self.titleLabel.frame) + CGRectGetHeight(self.numberInputView.frame)
-                                                         + (kTOPasscodeSettingsLabelInputSpacing * 2.0f);
+                            + CGRectGetHeight(self.warningLabel.frame) + (kTOPasscodeSettingsLabelInputSpacing * 2.0f);
     self.containerView.frame = CGRectIntegral(frame);
 
-    // Set frame of title label
-    frame = self.titleLabel.frame;
-    frame.origin.x = (CGRectGetWidth(self.view.frame) - CGRectGetWidth(frame)) * 0.5f;
-    self.titleLabel.frame = CGRectIntegral(frame);
-
-    // Set frame of number pad
-    frame = self.numberInputView.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);
-
-    // 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;
-    self.warningLabel.frame = 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)
+                            + kTOPasscodeSettingsLabelInputSpacing;
+    self.verticalMidPoint *= 0.5f;
 
     // Apply light/dark mode
     [self applyThemeForStyle:self.style];
@@ -137,20 +155,35 @@ - (void)viewWillAppear:(BOOL)animated
     [super viewWillAppear:animated];
 
     self.state = self.requireCurrentPasscode ? TOPasscodeSettingsViewStateEnterCurrentPassword : TOPasscodeSettingsViewStateEnterNewPassword;
-    [self updateViewsForState:self.state];
+    [self updateContentForState:self.state type:self.passcodeType];
 }
 
-- (void)updateViewsForState:(TOPasscodeSettingsViewState)state
+#pragma mark - View Update -
+
+- (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscodeType)type
 {
     BOOL confirmingPasscode = state == TOPasscodeSettingsViewStateEnterCurrentPassword;
 
-    self.warningLabel.hidden = (confirmingPasscode && self.failedPasscodeAttemptCount == 0);
+    // Update the visibility of the options button
+    self.optionsButton.hidden = !(state == TOPasscodeSettingsViewStateEnterNewPassword);
+
+    // 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;
 
+    // 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;
+    }
+
+    // Update text depending on state
     switch (state) {
         case TOPasscodeSettingsViewStateEnterCurrentPassword:
             self.titleLabel.text = NSLocalizedString(@"Enter your passcode", @"");
@@ -162,6 +195,72 @@ - (void)updateViewsForState:(TOPasscodeSettingsViewState)state
             self.titleLabel.text = NSLocalizedString(@"Confirm new passcode", @"");
             break;
     }
+
+    // Resize text label to fit new text
+    [self.titleLabel sizeToFit];
+    frame = self.titleLabel.frame;
+    frame.origin.x = (CGRectGetWidth(self.containerView.frame) - CGRectGetWidth(frame)) * 0.5f;
+    self.titleLabel.frame = frame;
+
+    // Resize passcode view
+    [self.numberInputView sizeToFit];
+    frame = self.numberInputView.frame;
+    frame.origin.x = (CGRectGetWidth(self.containerView.frame) - CGRectGetWidth(frame)) * 0.5f;
+    self.numberInputView.frame = frame;
+}
+
+- (void)transitionToState:(TOPasscodeSettingsViewState)state animated:(BOOL)animated
+{
+    // Preserve the current view state
+    UIView *snapshot = nil;
+
+    BOOL reverseDirection = state < self.state;
+
+    // If animated, take a snapshot of the current container view
+    if (animated) {
+        snapshot = [self.containerView snapshotViewAfterScreenUpdates:NO];
+        snapshot.frame = self.containerView.frame;
+        [self.view addSubview:snapshot];
+    }
+
+    self.errorLabel.hidden = YES;
+
+    // Update the layout for the new state
+    self.state = state;
+
+    // Cancel out now if we're not animating
+    if (!animated) {
+        return;
+    }
+
+    // Place the live container off screen to the right
+    CGFloat multiplier = reverseDirection ? -1.0f : 1.0f;
+    self.containerView.frame = CGRectOffset(self.containerView.frame, self.view.frame.size.width * multiplier, 0.0f);
+
+    // Update the options button alpha depending on transition state
+    self.optionsButton.hidden = NO;
+    self.optionsButton.alpha = (state == TOPasscodeSettingsViewStateEnterNewPassword) ? 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;
+    };
+
+    // Clean up by removing the snapshot view
+    id completionBlock = ^(BOOL complete) {
+        [snapshot removeFromSuperview];
+    };
+
+    // Perform the animation
+    [UIView animateWithDuration:0.4f
+                          delay:0.0f
+         usingSpringWithDamping:1.0f
+          initialSpringVelocity:0.7f
+                        options:0
+                     animations:animationBlock
+                     completion:completionBlock];
 }
 
 - (void)viewDidLayoutSubviews
@@ -187,9 +286,39 @@ - (void)viewDidLayoutSubviews
 
     // Layout the container view
     frame = self.containerView.frame;
-    frame.origin.y = ((viewSize.height - (topContentHeight + self.keypadView.frame.size.height)) - frame.size.height) * 0.5f;
+    frame.origin.y = (((viewSize.height - (topContentHeight + self.keypadView.frame.size.height))) * 0.5f) - self.verticalMidPoint;
     frame.origin.y += topContentHeight;
     self.containerView.frame = CGRectIntegral(frame);
+
+    // Layout the passcode options button
+    frame = self.optionsButton.frame;
+    frame.origin.y = CGRectGetMinY(self.keypadView.frame) - kTOPasscodeSettingsOptionsButtonOffset - CGRectGetHeight(frame);
+    frame.origin.x = (CGRectGetWidth(self.view.frame) - CGRectGetWidth(frame)) * 0.5f;
+    self.optionsButton.frame = frame;
+
+    // Set frame of title label
+    frame = self.titleLabel.frame;
+    frame.origin.x = (CGRectGetWidth(self.view.frame) - CGRectGetWidth(frame)) * 0.5f;
+    self.titleLabel.frame = CGRectIntegral(frame);
+
+    // Set frame of number pad
+    frame = self.numberInputView.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);
+
+    // 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;
+    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.x = (CGRectGetWidth(self.containerView.frame) - CGRectGetWidth(frame)) * 0.5f;
+    self.errorLabel.frame = CGRectIntegral(frame);
 }
 
 - (void)applyThemeForStyle:(TOPasscodeSettingsViewStyle)style
@@ -230,6 +359,23 @@ - (void)applyThemeForStyle:(TOPasscodeSettingsViewStyle)style
 
 #pragma mark - Data Management -
 - (void)numberViewDidEnterPasscode:(NSString *)passcode
+{
+    switch (self.state) {
+        case TOPasscodeSettingsViewStateEnterCurrentPassword:
+            [self validateCurrentPasscodeAttemptWithPasscode:passcode];
+            break;
+        case TOPasscodeSettingsViewStateEnterNewPassword:
+            [self didReceiveNewPasscode:passcode];
+            break;
+        case TOPasscodeSettingsViewStateConfirmNewPassword:
+            [self confirmNewPasscode:passcode];
+            break;
+    }
+
+    [self updateContentForState:self.state type:self.passcodeType];
+}
+
+- (void)validateCurrentPasscodeAttemptWithPasscode:(NSString *)passcode
 {
     if (![self.delegate respondsToSelector:@selector(passcodeSettingsViewController:didAttemptCurrentPasscode:)]) {
         return;
@@ -240,8 +386,83 @@ - (void)numberViewDidEnterPasscode:(NSString *)passcode
         self.failedPasscodeAttemptCount++;
         [self.numberInputView resetPasscodeAnimated:YES playImpact:YES];
     }
+    else {
+        [self transitionToState:TOPasscodeSettingsViewStateEnterNewPassword animated:YES];
+    }
+}
+
+- (void)didReceiveNewPasscode:(NSString *)passcode
+{
+    self.potentialPasscode = passcode;
+    [self transitionToState:TOPasscodeSettingsViewStateConfirmNewPassword animated:YES];
+}
+
+- (void)confirmNewPasscode:(NSString *)passcode
+{
+    if (![passcode isEqualToString:self.potentialPasscode]) {
+        [self transitionToState:TOPasscodeSettingsViewStateEnterNewPassword animated:YES];
+        self.errorLabel.hidden = NO;
+        return;
+    }
+}
+
+#pragma mark - Button Callbacks -
+
+- (void)optionsCodeButtonTapped:(id)sender
+{
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+    UIAlertActionStyle style = UIAlertActionStyleDefault;
+
+    __weak typeof(self) weakSelf = self;
+
+    NSArray *types = @[@(TOPasscodeTypeFourDigits),
+                       @(TOPasscodeTypeSixDigits),
+//                       @(TOPasscodeTypeCustomNumeric),
+//                       @(TOPasscodeTypeCustomAlphanumeric)
+                       ];
+
+
+    NSArray *titles = @[NSLocalizedString(@"4-Digit Numeric Code", @""),
+                        NSLocalizedString(@"6-Digit Numeric Code", @""),
+                        NSLocalizedString(@"Custom Numeric Code", @""),
+                        NSLocalizedString(@"Custom Alphanumeric Code", @"")];
+
+    // Add all the buttons
+    for (NSInteger i = 0; i < types.count; i++) {
+        TOPasscodeType type = [types[i] integerValue];
+        if (type == self.passcodeType) { continue; }
+
+        id handler = ^(UIAlertAction *action) {
+            [weakSelf setPasscodeType:type];
+        };
+        [alertController addAction:[UIAlertAction actionWithTitle:titles[i] style:style handler:handler]];
+    }
+
+    // Cancel button 
+    [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", @"") style:UIAlertActionStyleCancel handler:nil]];
+
+    alertController.modalPresentationStyle = UIModalPresentationPopover;
+    alertController.popoverPresentationController.sourceView = self.optionsButton;
+    alertController.popoverPresentationController.sourceRect = self.optionsButton.bounds;
+    alertController.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionDown | UIPopoverArrowDirectionUp;
+    [self presentViewController:alertController animated:YES completion:nil];
+}
+
+#pragma mark - Accessors -
+- (void)setPasscodeType:(TOPasscodeType)passcodeType
+{
+    if (_passcodeType == passcodeType) { return; }
+    _passcodeType = passcodeType;
+
+    [self updateContentForState:self.state type:_passcodeType];
+}
+
+- (void)setState:(TOPasscodeSettingsViewState)state
+{
+    if (_state == state) { return; }
+    _state = state;
 
-    [self updateViewsForState:self.state];
+    [self updateContentForState:_state type:self.passcodeType];
 }
 
 @end