Renamed view types

Author: TimOliver

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -7,7 +7,7 @@
 //
 
 #import "TOPasscodeSettingsViewController.h"
-#import "TOPasscodeNumberInputView.h"
+#import "TOPasscodeInputField.h"
 #import "TOPasscodeSettingsKeypadView.h"
 #import "TOPasscodeSettingsWarningLabel.h"
 
@@ -29,7 +29,7 @@ @interface TOPasscodeSettingsViewController ()
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UILabel *errorLabel;
 @property (nonatomic, strong) UIButton *optionsButton;
-@property (nonatomic, strong) TOPasscodeNumberInputView *numberInputView;
+@property (nonatomic, strong) TOPasscodeInputField *numberInputView;
 @property (nonatomic, strong) TOPasscodeSettingsKeypadView *keypadView;
 @property (nonatomic, strong) TOPasscodeSettingsWarningLabel *warningLabel;
 
@@ -89,7 +89,7 @@ - (void)viewDidLoad {
     [self.containerView addSubview:self.titleLabel];
 
     // Create number view
-    self.numberInputView = [[TOPasscodeNumberInputView alloc] initWithRequiredLength:4];
+    self.numberInputView = [[TOPasscodeInputField alloc] init];
     self.numberInputView.tintColor = [UIColor blackColor];
     self.numberInputView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
     self.numberInputView.passcodeCompletedHandler = ^(NSString *passcode) { [weakSelf numberViewDidEnterPasscode:passcode]; };
@@ -180,7 +180,7 @@ - (void)updateContentForState:(TOPasscodeSettingsViewState)state type:(TOPasscod
 
     // Change the input view if needed
     if (self.passcodeType < TOPasscodeTypeCustomNumeric) {
-        self.numberInputView.requiredLength = (self.passcodeType == TOPasscodeTypeSixDigits) ? 6 : 4;
+        self.numberInputView.fixedLength = (self.passcodeType == TOPasscodeTypeSixDigits) ? 6 : 4;
     }
 
     // Update text depending on state
@@ -421,9 +421,9 @@ - (void)optionsCodeButtonTapped:(id)sender
 
     NSArray *types = @[@(TOPasscodeTypeFourDigits),
                        @(TOPasscodeTypeSixDigits),
-//                       @(TOPasscodeTypeCustomNumeric),
-//                       @(TOPasscodeTypeCustomAlphanumeric)
-                       ];
+                       @(TOPasscodeTypeCustomNumeric),
+                       @(TOPasscodeTypeCustomAlphanumeric)
+                      ];
 
 
     NSArray *titles = @[NSLocalizedString(@"4-Digit Numeric Code", @""),

TOPasscodeViewController/TOPasscodeViewController.m

@@ -10,7 +10,7 @@
 #import "TOPasscodeView.h"
 #import "TOPasscodeViewControllerAnimatedTransitioning.h"
 #import "TOPasscodeKeypadView.h"
-#import "TOPasscodeNumberInputView.h"
+#import "TOPasscodeInputField.h"
 
 @interface TOPasscodeViewController () <UIViewControllerTransitioningDelegate>
 
@@ -370,7 +370,7 @@ - (void)setPasscodeType:(TOPasscodeType)passcodeType
 {
     if (_passcodeType == passcodeType) { return; }
     _passcodeType = passcodeType;
-    self.passcodeView.numberInputView.requiredLength = _passcodeType == TOPasscodeTypeSixDigits ? 6 : 4;
+    self.passcodeView.numberInputView.fixedLength = _passcodeType == TOPasscodeTypeSixDigits ? 6 : 4;
     [self.passcodeView setNeedsLayout];
 }