Fixed iOS 11 assertion failure

Author: TimOliver

TOPasscodeViewController/Views/Main/TOPasscodeView.m

@@ -418,11 +418,11 @@ - (void)applyThemeForStyle:(TOPasscodeViewStyle)style
     if (isTranslucent) {
         UIBlurEffect *blurEffect = [self blurEffectForStyle:style];
         UIVibrancyEffect *vibrancyEffect = [UIVibrancyEffect effectForBlurEffect:blurEffect];
-        self.inputField.effect = vibrancyEffect;
+        self.inputField.visualEffectView.effect = vibrancyEffect;
         self.keypadView.vibrancyEffect = vibrancyEffect;
     }
     else {
-        self.inputField.effect = nil;
+        self.inputField.visualEffectView.effect = nil;
         self.keypadView.vibrancyEffect = nil;
     }
 

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.h

@@ -19,7 +19,10 @@ typedef NS_ENUM(NSInteger, TOPasscodeInputFieldStyle) {
     TOPasscodeInputFieldStyleVariable  // The passcode can be any arbitrary number of characters (Shows an empty rectangle)
 };
 
-@interface TOPasscodeInputField : UIVisualEffectView <UIKeyInput>
+@interface TOPasscodeInputField : UIView <UIKeyInput>
+
+/* The visual effects view used to control the vibrancy of the input field */
+@property (nonatomic, strong, readonly) UIVisualEffectView *visualEffectView;
 
 /* The input style of this control */
 @property (nonatomic, assign) TOPasscodeInputFieldStyle style;

TOPasscodeViewController/Views/Shared/TOPasscodeInputField.m

@@ -22,6 +22,7 @@ @interface TOPasscodeInputField ()
 @property (nonatomic, strong, readwrite) TOPasscodeFixedInputView *fixedInputView;
 @property (nonatomic, strong, readwrite) TOPasscodeVariableInputView *variableInputView;
 @property (nonatomic, strong, readwrite) UIButton *submitButton;
+@property (nonatomic, strong, readwrite) UIVisualEffectView *visualEffectView;
 
 @end
 
@@ -55,6 +56,9 @@ - (void)setUp
     self.backgroundColor = [UIColor clearColor];
     _submitButtonSpacing = 4.0f;
     _submitButtonVerticalSpacing = 5.0f;
+
+    _visualEffectView = [[UIVisualEffectView alloc] initWithEffect:nil];
+    [self addSubview:_visualEffectView];
 }
 
 - (void)setUpForStyle:(TOPasscodeInputFieldStyle)style
@@ -67,11 +71,11 @@ - (void)setUpForStyle:(TOPasscodeInputFieldStyle)style
 
     if (style == TOPasscodeInputFieldStyleVariable) {
         self.variableInputView = [[TOPasscodeVariableInputView alloc] init];
-        [self.contentView addSubview:self.variableInputView];
+        [self.visualEffectView.contentView addSubview:self.variableInputView];
     }
     else {
         self.fixedInputView = [[TOPasscodeFixedInputView alloc] init];
-        [self.contentView addSubview:self.fixedInputView];
+        [self.visualEffectView.contentView addSubview:self.fixedInputView];
     }
 
     // Set the frame for the currently visible input view
@@ -98,6 +102,8 @@ - (void)layoutSubviews
 {
     [super layoutSubviews];
 
+    self.visualEffectView.frame = self.inputField.bounds;
+
     if (!self.submitButton) { return; }
 
     [self.submitButton sizeToFit];
@@ -368,15 +374,15 @@ - (void)setHorizontalLayout:(BOOL)horizontalLayout animated:(BOOL)animated durat
 
     UIView *snapshotView = nil;
 
-    if (self.submitButton.hidden == NO && animated) {
+    if (self.submitButton && self.submitButton.hidden == NO && animated) {
         snapshotView = [self.submitButton snapshotViewAfterScreenUpdates:NO];
         snapshotView.frame = self.submitButton.frame;
         [self addSubview:snapshotView];
     }
 
     _horizontalLayout = horizontalLayout;
 
-    if (!animated) {
+    if (!animated || !self.submitButton) {
         [self sizeToFit];
         [self setNeedsLayout];
         return;