Added proper thread confinement

Author: TimOliver

TOPasscodeViewController/Models/TOPasscodeViewControllerAnimatedTransitioning.h

@@ -17,8 +17,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak, readonly) TOPasscodeViewController *passcodeViewController;
 @property (nonatomic, assign) BOOL dismissing;
+@property (nonatomic, assign) BOOL passcodeSuccess; //Play a different animation if the password succeeeded
 
-- (instancetype)initWithPasscodeViewController:(TOPasscodeViewController *)passcodeViewController dismissing:(BOOL)dismissing;
+- (instancetype)initWithPasscodeViewController:(TOPasscodeViewController *)passcodeViewController dismissing:(BOOL)dismissing success:(BOOL)success;
 
 @end
 

TOPasscodeViewController/Models/TOPasscodeViewControllerAnimatedTransitioning.m

@@ -16,19 +16,20 @@ @interface TOPasscodeViewControllerAnimatedTransitioning ()
 
 @implementation TOPasscodeViewControllerAnimatedTransitioning
 
-- (instancetype)initWithPasscodeViewController:(TOPasscodeViewController *)passcodeViewController dismissing:(BOOL)dismissing
+- (instancetype)initWithPasscodeViewController:(TOPasscodeViewController *)passcodeViewController dismissing:(BOOL)dismissing success:(BOOL)success
 {
     if (self = [super init]) {
         _passcodeViewController = passcodeViewController;
         _dismissing = dismissing;
+        _passcodeSuccess = success;
     }
 
     return self;
 }
 
 - (NSTimeInterval)transitionDuration:(nullable id <UIViewControllerContextTransitioning>)transitionContext
 {
-    return 0.5f;
+    return 0.35f;
 }
 
 - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionContext
@@ -85,6 +86,13 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
         [transitionContext completeTransition:completed];
     };
 
+    if (self.passcodeSuccess && self.dismissing) {
+        CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform"];
+        animation.duration = [self transitionDuration:transitionContext];
+        animation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.75f, 0.75f, 1)];
+        [passcodeView.layer addAnimation:animation forKey:@"transform"];
+    }
+
     [UIView animateWithDuration:[self transitionDuration:transitionContext]
                           delay:0.0f
 //         usingSpringWithDamping:1.0f

TOPasscodeViewController/TOPasscodeViewController.m

@@ -17,6 +17,9 @@ @interface TOPasscodeViewController () <UIViewControllerTransitioningDelegate>
 /* State */
 @property (nonatomic, assign, readwrite) TOPasscodeType passcodeType;
 @property (nonatomic, assign) CGFloat keyboardHeight;
+@property (nonatomic, assign) BOOL passcodeSuccess;
+@property (nonatomic, readonly) UIView *leftButton;
+@property (nonatomic, readonly) UIView *rightButton;
 
 /* Views */
 @property (nonatomic, strong, readwrite) UIVisualEffectView *backgroundEffectView;
@@ -25,6 +28,7 @@ @interface TOPasscodeViewController () <UIViewControllerTransitioningDelegate>
 @property (nonatomic, strong, readwrite) UIButton *biometricButton;
 @property (nonatomic, strong, readwrite) UIButton *cancelButton;
 
+
 @end
 
 @implementation TOPasscodeViewController
@@ -323,18 +327,16 @@ - (void)verticalLayoutAccessoryButtonsForSize:(CGSize)size
     CGFloat inset = self.passcodeView.keypadButtonInset;
     CGPoint point = (CGPoint){0.0f, (self.view.bounds.size.height - self.keyboardHeight) - verticalInset};
 
-    UIButton *leftButton = self.leftAccessoryButton ? self.leftAccessoryButton : self.biometricButton;
-    if (leftButton) {
-        [leftButton sizeToFit];
+    if (self.leftButton) {
+        [self.leftButton sizeToFit];
         point.x = self.passcodeView.frame.origin.x + inset;
-        leftButton.center = point;
+        self.leftButton.center = point;
     }
 
-    UIButton *rightButton = self.rightAccessoryButton ? self.rightAccessoryButton : self.cancelButton;
-    if (rightButton) {
-        [rightButton sizeToFit];
+    if (self.rightButton) {
+        [self.rightButton sizeToFit];
         point.x = CGRectGetMaxX(self.passcodeView.frame) - inset;
-        rightButton.center = point;
+        self.rightButton.center = point;
     }
 }
 
@@ -351,27 +353,24 @@ - (void)horizontalLayoutAccessoryButtonsForSize:(CGSize)size
         verticalInset = 35.0f;
     }
 
-
-    UIButton *leftButton = self.leftAccessoryButton ? self.leftAccessoryButton : self.biometricButton;
-    if (leftButton) {
-        [leftButton sizeToFit];
-        CGRect frame = leftButton.frame;
+    if (self.leftButton) {
+        [self.leftButton sizeToFit];
+        CGRect frame = self.leftButton.frame;
         frame.origin.y = (self.view.bounds.size.height - verticalInset) - (frame.size.height * 0.5f);
         frame.origin.x = (CGRectGetMaxX(passcodeViewFrame) - buttonInset) - (frame.size.width * 0.5f);
-        leftButton.frame = CGRectIntegral(frame);
+        self.leftButton.frame = CGRectIntegral(frame);
     }
 
-    UIButton *rightButton = self.rightAccessoryButton ? self.rightAccessoryButton : self.cancelButton;
-    if (rightButton) {
-        [rightButton sizeToFit];
-        CGRect frame = rightButton.frame;
+    if (self.rightButton) {
+        [self.rightButton sizeToFit];
+        CGRect frame = self.rightButton.frame;
         frame.origin.y = verticalInset - (frame.size.height * 0.5f);
         frame.origin.x = (CGRectGetMaxX(passcodeViewFrame) - buttonInset) - (frame.size.width * 0.5f);
-        rightButton.frame = CGRectIntegral(frame);
+        self.rightButton.frame = CGRectIntegral(frame);
     }
 
-    [self.view bringSubviewToFront:rightButton];
-    [self.view bringSubviewToFront:leftButton];
+    [self.view bringSubviewToFront:self.rightButton];
+    [self.view bringSubviewToFront:self.leftButton];
 }
 
 - (void)layoutAccessoryButtonsForSize:(CGSize)size
@@ -430,6 +429,9 @@ - (void)didCompleteEnteringPasscode:(NSString *)passcode
         return;
     }
 
+    // Hang onto the fact the passcode was successful to play a nicer dismissal animation
+    self.passcodeSuccess = YES;
+
     // Perform handler if correctly entered
     if ([self.delegate respondsToSelector:@selector(didInputCorrectPasscodeInPasscodeViewController:)]) {
         [self.delegate didInputCorrectPasscodeInPasscodeViewController:self];
@@ -471,12 +473,23 @@ - (void)keyboardWillChangeFrame:(NSNotification *)notification
                                                                             presentingController:(UIViewController *)presenting
                                                                                 sourceController:(UIViewController *)source
 {
-    return [[TOPasscodeViewControllerAnimatedTransitioning alloc] initWithPasscodeViewController:self dismissing:NO];
+    return [[TOPasscodeViewControllerAnimatedTransitioning alloc] initWithPasscodeViewController:self dismissing:NO success:NO];
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed
 {
-    return [[TOPasscodeViewControllerAnimatedTransitioning alloc] initWithPasscodeViewController:self dismissing:YES];
+    return [[TOPasscodeViewControllerAnimatedTransitioning alloc] initWithPasscodeViewController:self dismissing:YES success:self.passcodeSuccess];
+}
+
+#pragma mark - Convenience Accessors -
+- (UIView *)leftButton
+{
+    return self.leftAccessoryButton ? self.leftAccessoryButton : self.biometricButton;
+}
+
+- (UIView *)rightButton
+{
+    return self.rightAccessoryButton ? self.rightAccessoryButton : self.cancelButton;
 }
 
 #pragma mark - Public Accessors -
@@ -571,4 +584,43 @@ - (void)setAccessoryButtonTintColor:(UIColor *)accessoryButtonTintColor
     [self applyThemeForStyle:self.style];
 }
 
+- (void)setContentHidden:(BOOL)contentHidden
+{
+    [self setContentHidden:contentHidden animated:NO];
+}
+
+- (void)setContentHidden:(BOOL)hidden animated:(BOOL)animated
+{
+    if (hidden == _contentHidden) { return; }
+    _contentHidden = hidden;
+
+    void (^setViewsHiddenBlock)(BOOL) = ^(BOOL hidden) {
+        self.passcodeView.hidden = hidden;
+        self.leftButton.hidden = hidden;
+        self.rightButton.hidden = hidden;
+    };
+
+    void (^completionBlock)(BOOL) = ^(BOOL complete) {
+        setViewsHiddenBlock(hidden);
+    };
+
+    if (!animated) {
+        completionBlock(YES);
+        return;
+    }
+
+    // Make sure the views are visible before the animation
+    setViewsHiddenBlock(NO);
+
+    void (^animationBlock)() = ^{
+        CGFloat alpha = hidden ? 0.0f : 1.0f;
+        self.passcodeView.contentAlpha = alpha;
+        self.leftButton.alpha = alpha;
+        self.rightButton.alpha = alpha;
+    };
+
+    // Animate
+    [UIView animateWithDuration:0.4f animations:animationBlock completion:completionBlock];
+}
+
 @end

TOPasscodeViewControllerExample/ViewController.m

@@ -94,15 +94,22 @@ - (void)didPerformBiometricValidationRequestInPasscodeViewController:(TOPasscode
         // Touch ID validation was successful
         // (Use this to dismiss the passcode controller and display the protected content)
         if (success) {
-            // Create a new Touch ID context for next time
-            [weakSelf.authContext invalidate];
-            weakSelf.authContext = [[LAContext alloc] init];
-
-            // Dismiss the passcode controller
-            [weakSelf dismissViewControllerAnimated:YES completion:nil];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                // Create a new Touch ID context for next time
+                [weakSelf.authContext invalidate];
+                weakSelf.authContext = [[LAContext alloc] init];
+
+                // Dismiss the passcode controller
+                [weakSelf dismissViewControllerAnimated:YES completion:nil];
+            });
             return;
         }
 
+        // Actual UI changes need to be made on the main queue
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [passcodeViewController setContentHidden:NO animated:YES];
+        });
+
         // The user hit 'Enter Password'. This should probably do nothing
         // but make sure the passcode controller is visible.
         if (error.code == kLAErrorUserFallback) {
@@ -122,6 +129,8 @@ - (void)didPerformBiometricValidationRequestInPasscodeViewController:(TOPasscode
         NSLog(@"%@", error.localizedDescription);
     };
 
+    [passcodeViewController setContentHidden:YES animated:YES];
+
     [self.authContext evaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics localizedReason:reason reply:reply];
 }