Fixed layering issue with OK button

Author: TimOliver

TOPasscodeViewController/TOPasscodeViewController.m

@@ -260,8 +260,8 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVi
 {
     [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 
-    // We don't need to do anything special on iPad
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { return; }
+    // We don't need to do anything special on iPad or if we're using character input
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad || self.passcodeType == TOPasscodeTypeCustomAlphanumeric) { return; }
 
     // Work out if we need to transition to horizontal
     BOOL horizontalLayout = size.height < size.width;
@@ -378,7 +378,7 @@ - (void)layoutAccessoryButtonsForSize:(CGSize)size
     // The buttons are always embedded in the keypad view on iPad
     if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPhone) { return; }
 
-    if (self.passcodeView.horizontalLayout) {
+    if (self.passcodeView.horizontalLayout && self.passcodeType != TOPasscodeTypeCustomAlphanumeric) {
         [self horizontalLayoutAccessoryButtonsForSize:size];
     }
     else {

TOPasscodeViewController/Views/Main/TOPasscodeKeypadView.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class TOPasscodeCircleButton;
 
-@interface TOPasscodeKeypadView : UIView
+@interface TOPasscodeKeypadView : UIView <UIInputViewAudioFeedback>
 
 /** The type of layout for the buttons (Default is vertical) */
 @property (nonatomic, assign) BOOL horizontalLayout;

TOPasscodeViewController/Views/Main/TOPasscodeKeypadView.m

@@ -226,6 +226,12 @@ - (UIImage *)tappedButtonImage
     return _keypadButtons;
 }
 
+#pragma mark - Audio Delegate Protocol -
+- (BOOL)enableInputClicksWhenVisible
+{
+    return YES;
+}
+
 #pragma mark - Public Layout Setters -
 
 - (void)setHorizontalLayout:(BOOL)horizontalLayout

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -295,7 +295,7 @@ - (void)horizontalSizeToFit
 
 - (void)sizeToFit
 {
-    if (self.horizontalLayout) {
+    if (self.horizontalLayout && self.passcodeType != TOPasscodeTypeCustomAlphanumeric) {
         [self horizontalSizeToFit];
     }
     else {

TOPasscodeViewController/Views/Settings/TOPasscodeSettingsKeypadView.m

@@ -10,7 +10,6 @@
 #import "TOPasscodeSettingsKeypadButton.h"
 #import "TOPasscodeButtonLabel.h"
 #import "TOSettingsKeypadImage.h"
-
 const CGFloat kTOPasscodeSettingsKeypadButtonInnerSpacing = 7.0f;
 const CGFloat kTOPasscodeSettingsKeypadButtonOuterSpacing = 7.0f;
 const CGFloat kTOPasscodeSettingsKeypadCornderRadius = 10.0f;
@@ -237,14 +236,15 @@ - (void)buttonTapped:(id)sender
         if (self.deleteButtonTappedHandler) {
             self.deleteButtonTappedHandler();
         }
-
         return;
     }
 
     // Handler for the keypad buttons
     UIButton *button = (UIButton *)sender;
     NSInteger number = button.tag;
 
+    [[UIDevice currentDevice] playInputClick];
+
     if (self.numberButtonTappedHandler) {
         self.numberButtonTappedHandler(number);
     }

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.m

@@ -101,6 +101,8 @@ - (void)layoutSubviews
     if (!self.submitButton) { return; }
 
     [self.submitButton sizeToFit];
+    [self bringSubviewToFront:self.submitButton];
+
     CGRect frame = self.submitButton.frame;
     if (!self.horizontalLayout) {
         frame.origin.x = CGRectGetMaxX(self.bounds) + self.submitButtonSpacing;
@@ -200,6 +202,7 @@ - (void)setPasscode:(NSString *)passcode animated:(BOOL)animated
 
     if (self.submitButton) {
         self.submitButton.hidden = (_passcode.length == 0);
+        [self bringSubviewToFront:self.submitButton];
     }
 
     if (passcodeIsComplete && self.passcodeCompletedHandler) {