Streamlined alphanumeric input further

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -211,7 +211,7 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
     switch (state) {
         case TOPasscodeSettingsViewStateEnterCurrentPassword:
             self.titleLabel.text = NSLocalizedString(@"Enter your passcode", @"");
-            self.navigationItem.rightBarButtonItem = nil;
+            self.navigationItem.rightBarButtonItem = variableSizePasscode ? self.nextBarButtonItem : nil;
             break;
         case TOPasscodeSettingsViewStateEnterNewPassword:
             self.titleLabel.text = NSLocalizedString(@"Enter a new passcode", @"");
@@ -532,12 +532,12 @@ - (void)optionsCodeButtonTapped:(id)sender
 
 - (void)nextButtonTapped:(id)sender
 {
-    [self transitionToState:TOPasscodeSettingsViewStateConfirmNewPassword animated:YES];
+    [self inputViewDidCompletePasscode:self.inputField.passcode];
 }
 
 - (void)doneButtonTapped:(id)sender
 {
-    [self confirmNewPasscode:self.inputField.passcode];
+    [self inputViewDidCompletePasscode:self.inputField.passcode];
 }
 
 #pragma mark - Accessors -

TOPasscodeViewControllerExample/SettingsViewController.h

@@ -12,6 +12,7 @@
 @interface SettingsViewController : UITableViewController
 
 @property (nonatomic, copy) NSString *passcode;
+@property (nonatomic, assign) TOPasscodeType passcodeType;
 @property (nonatomic, assign) TOPasscodeViewStyle style;
 @property (nonatomic, strong) UIImage *wallpaperImage;
 

TOPasscodeViewControllerExample/SettingsViewController.m

@@ -61,6 +61,7 @@ - (BOOL)passcodeSettingsViewController:(TOPasscodeSettingsViewController *)passc
 - (void)passcodeSettingsViewController:(TOPasscodeSettingsViewController *)passcodeSettingsViewController didChangeToNewPasscode:(NSString *)passcode ofType:(TOPasscodeType)type
 {
     self.passcode = passcode;
+    self.passcodeType = type;
     [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone];
     [self.navigationController popViewControllerAnimated:YES];
 }
@@ -148,6 +149,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     }
     else if (indexPath.section == 0) {
         TOPasscodeSettingsViewController *settingsController = [[TOPasscodeSettingsViewController alloc] init];
+        settingsController.passcodeType = self.passcodeType;
         settingsController.delegate = self;
         settingsController.requireCurrentPasscode = YES;
         [self.navigationController pushViewController:settingsController animated:YES];