Using transform

leichunfeng · leichunfeng · commit 6e8a8df7d2aa · 2015-12-10T21:28:43.000+08:00
Former-commit-id: 6e0fef5
diff --git a/MVVMReactiveCocoa/View/BaseClass/MRCNavigationControllerStack.m b/MVVMReactiveCocoa/View/BaseClass/MRCNavigationControllerStack.m
@@ -135,19 +135,19 @@ - (void)registerNavigationHooks {
 
 - (id<UIViewControllerInteractiveTransitioning>)navigationController:(UINavigationController *)navigationController
                          interactionControllerForAnimationController:(MRCViewControllerAnimatedTransition *)animationController {
-    if (animationController.operation == UINavigationControllerOperationPop) {
-        return animationController.fromViewController.interactivePopTransition;
-    }
-    return nil;
+    return animationController.fromViewController.interactivePopTransition;
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController
                                   animationControllerForOperation:(UINavigationControllerOperation)operation
                                                fromViewController:(MRCViewController *)fromVC
                                                  toViewController:(MRCViewController *)toVC {
-    return [[MRCViewControllerAnimatedTransition alloc] initWithNavigationControllerOperation:operation
-                                                                           fromViewController:fromVC
-                                                                             toViewController:toVC];
+    if (operation == UINavigationControllerOperationPop) {
+        return [[MRCViewControllerAnimatedTransition alloc] initWithNavigationControllerOperation:operation
+                                                                               fromViewController:fromVC
+                                                                                 toViewController:toVC];
+    }
+    return nil;
 }
 
 @end
diff --git a/MVVMReactiveCocoa/View/Transition/MRCViewControllerAnimatedTransition.m b/MVVMReactiveCocoa/View/Transition/MRCViewControllerAnimatedTransition.m
@@ -82,6 +82,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
         [[transitionContext containerView] addSubview:toViewController.snapshot];
         [[transitionContext containerView] sendSubviewToBack:toViewController.snapshot];
         
+        toViewController.snapshot.transform = CGAffineTransformMakeScale(0.97, 0.97);
+        
         [fromViewController.view addSubview:fromViewController.snapshot];
         
 //        UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 250, SCREEN_WIDTH, 44)];
@@ -91,7 +93,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
         
         fromViewController.navigationController.navigationBar.hidden = YES;
         
-//        toViewController.snapshot.alpha = 0.0;
+        toViewController.snapshot.alpha = 0.0;
         
         [UIView animateWithDuration:duration
                               delay:0.0
@@ -103,7 +105,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
                              
 //                             fromViewController.snapshot.frame = CGRectOffset(fromViewController.snapshot.frame, 0, 0);
                              toViewController.snapshot.alpha = 1.0;
-                             toViewController.snapshot.frame = [transitionContext finalFrameForViewController:toViewController];
+//                             toViewController.snapshot.frame = [transitionContext finalFrameForViewController:toViewController];
+                             toViewController.snapshot.transform = CGAffineTransformIdentity;
                          }
                          completion:^(BOOL finished) {
                              toViewController.navigationController.navigationBar.hidden = NO;
