Added horizontal layout to keypad view

Author: TimOliver

TOPasscodeViewController/Models/TOPasscodeViewContentLayout.m

@@ -47,7 +47,7 @@ + (TOPasscodeViewContentLayout *)defaultScreenContentLayout
 
     /* Circle Button Label */
     contentLayout.circleButtonTitleLabelFont = [UIFont systemFontOfSize:37.5f weight:UIFontWeightThin];
-    contentLayout.circleButtonLetteringLabelFont = [UIFont monospacedDigitSystemFontOfSize:9.0f weight:UIFontWeightThin];
+    contentLayout.circleButtonLetteringLabelFont = [UIFont systemFontOfSize:9.0f weight:UIFontWeightThin];
     contentLayout.circleButtonLabelSpacing = 6.0f;
     contentLayout.circleButtonLetteringSpacing = 3.0f;
 
@@ -89,7 +89,7 @@ + (TOPasscodeViewContentLayout *)mediumScreenContentLayout
 
     /* Circle Button Label */
     contentLayout.circleButtonTitleLabelFont = [UIFont systemFontOfSize:36.5f weight:UIFontWeightThin];
-    contentLayout.circleButtonLetteringLabelFont = [UIFont monospacedDigitSystemFontOfSize:8.5f weight:UIFontWeightThin];
+    contentLayout.circleButtonLetteringLabelFont = [UIFont systemFontOfSize:8.5f weight:UIFontWeightThin];
     contentLayout.circleButtonLabelSpacing = 5.0f;
     contentLayout.circleButtonLetteringSpacing = 2.5f;
 
@@ -135,7 +135,7 @@ + (TOPasscodeViewContentLayout *)smallScreenContentLayout
 
     /* Circle Button Label */
     contentLayout.circleButtonTitleLabelFont = [UIFont systemFontOfSize:32.0f weight:UIFontWeightThin];
-    contentLayout.circleButtonLetteringLabelFont = [UIFont monospacedDigitSystemFontOfSize:7.0f weight:UIFontWeightThin];
+    contentLayout.circleButtonLetteringLabelFont = [UIFont systemFontOfSize:7.0f weight:UIFontWeightThin];
     contentLayout.circleButtonLabelSpacing = 4.5f;
     contentLayout.circleButtonLetteringSpacing = 2.0f;
 

TOPasscodeViewController/TOPasscodeSettingsViewController.m

@@ -140,7 +140,7 @@ - (void)viewDidLoad {
 
     // Add callbacks for the keypad view
     self.keypadView.numberButtonTappedHandler = ^(NSInteger number) {
-        NSString *numberString = [NSString stringWithFormat:@"%ld", number];
+        NSString *numberString = [NSString stringWithFormat:@"%ld", (long)number];
         [weakSelf.inputField appendPasscodeCharacters:numberString animated:NO];
     };
 

TOPasscodeViewController/Views/Main/TOPasscodeCircleButton.h

@@ -15,6 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface TOPasscodeCircleButton : UIControl
 
+// Alpha value that properly controls the necessary subviews
+@property (nonatomic, assign) CGFloat contentAlpha;
+
 // Required to be set before this view can be properly rendered
 @property (nonatomic, strong) UIImage *backgroundImage;
 @property (nonatomic, strong) UIImage *hightlightedBackgroundImage;

TOPasscodeViewController/Views/Main/TOPasscodeCircleButton.m

@@ -28,6 +28,7 @@ - (instancetype)initWithNumberString:(NSString *)numberString letteringString:(N
     if (self = [super init]) {
         _numberString = numberString;
         _letteringString = letteringString;
+        _contentAlpha = 1.0f;
         [self setUp];
     }
 
@@ -159,21 +160,21 @@ - (UIImage *)hightlightedBackgroundImage { return self.circleView.highlightedCir
 
 - (void)setNumberFont:(UIFont *)numberFont
 {
-    self.buttonLabel.numberLabel.font = numberFont;
+    self.buttonLabel.numberLabelFont = numberFont;
     [self setNeedsLayout];
 }
 
-- (UIFont *)numberFont { return self.buttonLabel.numberLabel.font; }
+- (UIFont *)numberFont { return self.buttonLabel.numberLabelFont; }
 
 /***********************************************************/
 
 - (void)setLetteringFont:(UIFont *)letteringFont
 {
-    self.buttonLabel.letteringLabel.font = letteringFont;
+    self.buttonLabel.letteringLabelFont = letteringFont;
     [self setNeedsLayout];
 }
 
-- (UIFont *)letteringFont { return self.buttonLabel.letteringLabel.font; }
+- (UIFont *)letteringFont { return self.buttonLabel.letteringLabelFont; }
 
 /***********************************************************/
 
@@ -204,4 +205,18 @@ - (void)setTextColor:(UIColor *)textColor
     self.buttonLabel.textColor = _textColor;
 }
 
+/***********************************************************/
+
+- (void)setContentAlpha:(CGFloat)contentAlpha
+{
+    if (_contentAlpha == contentAlpha) {
+        return;
+    }
+
+    _contentAlpha = contentAlpha;
+
+    self.buttonLabel.alpha = contentAlpha;
+    self.circleView.alpha = contentAlpha;
+}
+
 @end

TOPasscodeViewController/Views/Main/TOPasscodeKeypadView.h

@@ -12,8 +12,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class TOPasscodeCircleButton;
 
+/* The direction this keypad is laid out.
+   When horizontal, the '0' button is on the right side */
+typedef NS_ENUM(NSInteger, TOPasscodeKeypadLayout) {
+    TOPasscodeKeypadLayoutVertical,
+    TOPasscodeKeypadLayoutHorizontal
+};
+
 @interface TOPasscodeKeypadView : UIView
 
+/** The type of layout for the buttons (Default is vertical) */
+@property (nonatomic, assign) TOPasscodeKeypadLayout layout;
+
 /** The vibrancy effect to be applied to each button background */
 @property (nonatomic, strong, nullable) UIVibrancyEffect *vibrancyEffect;
 
@@ -61,11 +71,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) UIView *rightAccessoryView;
 
 /** The controls making up each of the button views */
-@property (nonatomic, readonly) NSArray<TOPasscodeCircleButton *> *pinButtons;
+@property (nonatomic, readonly) NSArray<TOPasscodeCircleButton *> *keypadButtons;
 
 /** The block that is triggered whenever a user taps one of the buttons */
 @property (nonatomic, copy) void (^buttonTappedHandler)(NSInteger buttonNumber);
 
+/* Perform an animation of a set duration to the new layout */
+- (void)setLayout:(TOPasscodeKeypadLayout)layout animated:(BOOL)animated duration:(CGFloat)duration;
+
 @end
 
 NS_ASSUME_NONNULL_END