Integrated alphanumeric logic

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.h

@@ -66,6 +66,9 @@ NS_ASSUME_NONNULL_BEGIN
 /* Create a new instance with the desird light or dark style */
 - (instancetype)initWithStyle:(TOPasscodeSettingsViewStyle)style;
 
+/* Changes the passcode type and animates if required */
+- (void)setPasscodeType:(TOPasscodeType)passcodeType animated:(BOOL)animated;
+
 @end
 
 NS_ASSUME_NONNULL_END

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -23,6 +23,8 @@ @interface TOPasscodeSettingsViewController ()
 
 /* Layout Calculations */
 @property (nonatomic, assign) CGFloat verticalMidPoint;
+@property (nonatomic, assign) CGRect keyboardFrame;
+@property (nonatomic, readonly) CGRect contentOverlapFrame; // Either the keypad or the system keyboard
 
 /* Views */
 @property (nonatomic, strong) UIView *containerView;
@@ -33,6 +35,10 @@ @interface TOPasscodeSettingsViewController ()
 @property (nonatomic, strong) TOPasscodeSettingsKeypadView *keypadView;
 @property (nonatomic, strong) TOPasscodeSettingsWarningLabel *warningLabel;
 
+/* Bar Items */
+@property (nonatomic, strong) UIBarButtonItem *nextBarButtonItem;
+@property (nonatomic, strong) UIBarButtonItem *doneBarButtonItem;
+
 @end
 
 @implementation TOPasscodeSettingsViewController
@@ -61,6 +67,12 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibB
 - (void)setUp
 {
     _failedPasscodeAttemptCount = 0;
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillChangeFrame:) name:UIKeyboardWillChangeFrameNotification object:nil];
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillChangeFrameNotification object:nil];
 }
 
 #pragma mark - View Set-up -
@@ -92,7 +104,7 @@ - (void)viewDidLoad {
     self.inputField = [[TOPasscodeInputField alloc] init];
     self.inputField.tintColor = [UIColor blackColor];
     self.inputField.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
-    self.inputField.passcodeCompletedHandler = ^(NSString *passcode) { [weakSelf numberViewDidEnterPasscode:passcode]; };
+    self.inputField.passcodeCompletedHandler = ^(NSString *passcode) { [weakSelf inputViewDidCompletePasscode:passcode]; };
     [self.inputField sizeToFit];
     [self.containerView addSubview:self.inputField];
 
@@ -146,6 +158,10 @@ - (void)viewDidLoad {
                             + kTOPasscodeSettingsLabelInputSpacing;
     self.verticalMidPoint *= 0.5f;
 
+    // Bar button items
+    self.nextBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Next", @"") style:UIBarButtonItemStylePlain target:self action:@selector(nextButtonTapped:)];
+    self.doneBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doneButtonTapped:)];
+
     // Apply light/dark mode
     [self applyThemeForStyle:self.style];
 }
@@ -155,21 +171,25 @@ - (void)viewWillAppear:(BOOL)animated
     [super viewWillAppear:animated];
 
     self.state = self.requireCurrentPasscode ? TOPasscodeSettingsViewStateEnterCurrentPassword : TOPasscodeSettingsViewStateEnterNewPassword;
-    [self updateContentForState:self.state type:self.passcodeType];
+    [self updateContentForState:self.state type:self.passcodeType animated:NO];
 }
 
 #pragma mark - View Update -
 
-- (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscodeType)type
+- (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
     self.optionsButton.hidden = !(state == TOPasscodeSettingsViewStateEnterNewPassword);
 
     // Clear the input view
     self.inputField.passcode = nil;
 
+    // Disable the input view
+    self.inputField.enabled = NO;
+
     // Update the warning label
     self.warningLabel.hidden = !(confirmingPasscode && self.failedPasscodeAttemptCount > 0);
     self.warningLabel.numberOfWarnings = self.failedPasscodeAttemptCount;
@@ -179,7 +199,7 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     self.warningLabel.frame = frame;
 
     // Change the input view if needed
-    if (type < TOPasscodeTypeCustomNumeric) {
+    if (!variableSizePasscode) {
         self.inputField.style = TOPasscodeInputFieldStyleFixed;
         self.inputField.fixedInputView.length = (self.passcodeType == TOPasscodeTypeSixDigits) ? 6 : 4;
     }
@@ -191,12 +211,15 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     switch (state) {
         case TOPasscodeSettingsViewStateEnterCurrentPassword:
             self.titleLabel.text = NSLocalizedString(@"Enter your passcode", @"");
+            self.navigationItem.rightBarButtonItem = nil;
             break;
         case TOPasscodeSettingsViewStateEnterNewPassword:
             self.titleLabel.text = NSLocalizedString(@"Enter a new passcode", @"");
+            self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.nextBarButtonItem : nil;
             break;
         case TOPasscodeSettingsViewStateConfirmNewPassword:
             self.titleLabel.text = NSLocalizedString(@"Confirm new passcode", @"");
+            self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.doneBarButtonItem : nil;
             break;
     }
 
@@ -211,6 +234,28 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     frame = self.inputField.frame;
     frame.origin.x = (CGRectGetWidth(self.containerView.frame) - CGRectGetWidth(frame)) * 0.5f;
     self.inputField.frame = CGRectIntegral(frame);
+
+    // If we're the alphanumeric type, present the keyboard
+    if (type == TOPasscodeTypeCustomAlphanumeric) {
+        self.inputField.enabled = YES;
+        [self.inputField becomeFirstResponder];
+    }
+    else {
+        if (self.inputField.isFirstResponder) {
+            [self.inputField resignFirstResponder];
+        }
+    }
+
+    // If not animated, force a blanket re-layout
+    if (!animated) {
+        [self viewDidLayoutSubviews];
+        return;
+    }
+
+    // If animated, perform the animation
+    [UIView animateWithDuration:0.3f animations:^{
+        [self viewDidLayoutSubviews];
+    }];
 }
 
 - (void)transitionToState:(TOPasscodeSettingsViewState)state animated:(BOOL)animated
@@ -279,7 +324,11 @@ - (void)viewDidLayoutSubviews
     frame.size.height = MAX(frame.size.height, kTOPasscodeKeypadMinHeight);
     frame.size.height = MIN(frame.size.height, kTOPasscodeKeypadMaxHeight);
     frame.size.width = viewSize.width;
-    frame.origin.y = viewSize.height - frame.size.height;
+    frame.origin.y = viewSize.height;
+    if (self.passcodeType != TOPasscodeTypeCustomAlphanumeric) {
+        frame.origin.y -= frame.size.height;
+    }
+
     self.keypadView.frame = CGRectIntegral(frame);
 
     BOOL horizontalLayout = frame.size.height < kTOPasscodeKeypadMinHeight + FLT_EPSILON;
@@ -290,13 +339,13 @@ - (void)viewDidLayoutSubviews
 
     // Layout the container view
     frame = self.containerView.frame;
-    frame.origin.y = (((viewSize.height - (topContentHeight + self.keypadView.frame.size.height))) * 0.5f) - self.verticalMidPoint;
+    frame.origin.y = (((viewSize.height - (topContentHeight + self.contentOverlapFrame.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.y = CGRectGetMinY(self.contentOverlapFrame) - kTOPasscodeSettingsOptionsButtonOffset - CGRectGetHeight(frame);
     frame.origin.x = (CGRectGetWidth(self.view.frame) - CGRectGetWidth(frame)) * 0.5f;
     self.optionsButton.frame = frame;
 
@@ -362,7 +411,7 @@ - (void)applyThemeForStyle:(TOPasscodeSettingsViewStyle)style
 }
 
 #pragma mark - Data Management -
-- (void)numberViewDidEnterPasscode:(NSString *)passcode
+- (void)inputViewDidCompletePasscode:(NSString *)passcode
 {
     switch (self.state) {
         case TOPasscodeSettingsViewStateEnterCurrentPassword:
@@ -414,6 +463,31 @@ - (void)confirmNewPasscode:(NSString *)passcode
     [self.delegate passcodeSettingsViewController:self didChangeToNewPasscode:self.potentialPasscode ofType:self.passcodeType];
 }
 
+#pragma mark - System Keyboard Handling -
+- (void)keyboardWillChangeFrame:(NSNotification *)notification
+{
+    self.keyboardFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    [self viewDidLayoutSubviews];
+}
+
+- (CGRect)contentOverlapFrame
+{
+    if (self.passcodeType < TOPasscodeTypeCustomAlphanumeric) {
+        return self.keypadView.frame;
+    }
+
+    // Work out where our view is in relation to the screen
+    UIWindow *window = [UIApplication sharedApplication].keyWindow;
+    CGRect viewFrame = [self.view.superview convertRect:self.view.frame toView:window];
+
+    CGFloat overlap = CGRectGetMaxY(viewFrame) - CGRectGetMinY(self.keyboardFrame);
+
+    CGRect overlapFrame = self.keyboardFrame;
+    overlapFrame.origin.y = MIN(viewFrame.size.height - overlap, viewFrame.size.height);
+    overlapFrame.size.height = MAX(overlap, 0.0f);
+    return overlapFrame;
+}
+
 #pragma mark - Button Callbacks -
 
 - (void)optionsCodeButtonTapped:(id)sender
@@ -456,28 +530,43 @@ - (void)optionsCodeButtonTapped:(id)sender
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
+- (void)nextButtonTapped:(id)sender
+{
+    [self transitionToState:TOPasscodeSettingsViewStateConfirmNewPassword animated:YES];
+}
+
+- (void)doneButtonTapped:(id)sender
+{
+    [self confirmNewPasscode:self.inputField.passcode];
+}
+
 #pragma mark - Accessors -
 - (void)setPasscodeType:(TOPasscodeType)passcodeType
+{
+    [self setPasscodeType:passcodeType animated:NO];
+}
+
+- (void)setPasscodeType:(TOPasscodeType)passcodeType animated:(BOOL)animated
 {
     if (_passcodeType == passcodeType) { return; }
     _passcodeType = passcodeType;
 
-    [self updateContentForState:self.state type:_passcodeType];
+    [self updateContentForState:self.state type:_passcodeType animated:animated];
 }
 
 - (void)setState:(TOPasscodeSettingsViewState)state
 {
     if (_state == state) { return; }
     _state = state;
 
-    [self updateContentForState:_state type:self.passcodeType];
+    [self updateContentForState:_state type:self.passcodeType animated:NO];
 }
 
 - (void)setFailedPasscodeAttemptCount:(NSInteger)failedPasscodeAttemptCount
 {
     if (_failedPasscodeAttemptCount == failedPasscodeAttemptCount) { return; }
     _failedPasscodeAttemptCount = failedPasscodeAttemptCount;
-    [self updateContentForState:self.state type:self.passcodeType];
+    [self updateContentForState:self.state type:self.passcodeType animated:NO];
 }
 
 @end

TOPasscodeViewController/Views/Shared/TOPasscodeFixedInputView.m

@@ -84,23 +84,27 @@ - (void)setCircleViewsForLength:(NSInteger)length
         [circleViews addObjectsFromArray:self.circleViews];
     }
 
-    while (circleViews.count != length) {
-        // Remove any extra circle views
-        if (circleViews.count > length) {
-            TOPasscodeCircleView *lastCircle = circleViews.lastObject;
-            [lastCircle removeFromSuperview];
-            [circleViews removeLastObject];
-            continue;
+    [UIView performWithoutAnimation:^{
+        while (circleViews.count != length) {
+            // Remove any extra circle views
+            if (circleViews.count > length) {
+                TOPasscodeCircleView *lastCircle = circleViews.lastObject;
+                [lastCircle removeFromSuperview];
+                [circleViews removeLastObject];
+                continue;
+            }
+
+            // Add any new circle views
+            TOPasscodeCircleView *newCircleView = [[TOPasscodeCircleView alloc] init];
+            [self setImagesOfCircleView:newCircleView];
+            [self addSubview:newCircleView];
+            [circleViews addObject:newCircleView];
         }
 
-        // Add any new circle views
-        TOPasscodeCircleView *newCircleView = [[TOPasscodeCircleView alloc] init];
-        [self setImagesOfCircleView:newCircleView];
-        [self addSubview:newCircleView];
-        [circleViews addObject:newCircleView];
-    }
-
-    self.circleViews = [NSArray arrayWithArray:circleViews];
+        self.circleViews = [NSArray arrayWithArray:circleViews];
+        [self setNeedsLayout];
+        [self layoutIfNeeded];
+    }];
 }
 
 - (void)setCircleImagesForDiameter:(CGFloat)diameter
@@ -138,6 +142,13 @@ - (void)setCircleDiameter:(CGFloat)circleDiameter
     [self sizeToFit];
 }
 
+- (void)setLength:(NSInteger)length
+{
+    if (_length == length) { return; }
+    _length = length;
+    [self setCircleViewsForLength:length];
+}
+
 - (void)setHighlightedLength:(NSInteger)highlightedLength
 {
     [self setHighlightedLength:highlightedLength animated:NO];

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.h

@@ -39,6 +39,9 @@ typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
 /* The alpha value of the views in this view (For tranclucent styling) */
 @property (nonatomic, assign) CGFloat contentAlpha;
 
+/* Whether the view may be tapped to enable character input (Default is NO) */
+@property (nonatomic, assign) BOOL enabled;
+
 /** Called when the number of digits has been entered, or the user tapped 'Done' on the keyboard */
 @property (nonatomic, copy) void (^passcodeCompletedHandler)(NSString *code);