Modify transition parameter

leichunfeng · leichunfeng · commit 7c00b30779c2 · 2015-12-10T22:23:32.000+08:00
Former-commit-id: 20d0f94
diff --git a/MVVMReactiveCocoa/View/BaseClass/MRCNavigationControllerStack.m b/MVVMReactiveCocoa/View/BaseClass/MRCNavigationControllerStack.m
@@ -142,7 +142,7 @@ - (void)registerNavigationHooks {
                                   animationControllerForOperation:(UINavigationControllerOperation)operation
                                                fromViewController:(MRCViewController *)fromVC
                                                  toViewController:(MRCViewController *)toVC {
-    if (operation == UINavigationControllerOperationPop) {
+    if (fromVC.interactivePopTransition != nil) {
         return [[MRCViewControllerAnimatedTransition alloc] initWithNavigationControllerOperation:operation
                                                                                fromViewController:fromVC
                                                                                  toViewController:toVC];
diff --git a/MVVMReactiveCocoa/View/BaseClass/MRCViewController.m b/MVVMReactiveCocoa/View/BaseClass/MRCViewController.m
@@ -148,7 +148,7 @@ - (void)viewWillDisappear:(BOOL)animated {
     if ([self isMovingFromParentViewController]) {
         self.snapshot = [self.navigationController.view snapshotViewAfterScreenUpdates:NO];
     }
-    
+
 //    NSLog(@"isMovingToParentViewController: %@", @([self isMovingToParentViewController]));
 //    NSLog(@"isMovingFromParentViewController: %@", @([self isMovingFromParentViewController]));
 }
@@ -175,13 +175,12 @@ - (void)handlePopRecognizer:(UIScreenEdgePanGestureRecognizer *)recognizer {
         // Create a interactive transition and pop the view controller
         self.interactivePopTransition = [[UIPercentDrivenInteractiveTransition alloc] init];
         [self.navigationController popViewControllerAnimated:YES];
-//        [self.viewModel.services popViewModelAnimated:YES];
     } else if (recognizer.state == UIGestureRecognizerStateChanged) {
         // Update the interactive transition's progress
         [self.interactivePopTransition updateInteractiveTransition:progress];
     } else if (recognizer.state == UIGestureRecognizerStateEnded || recognizer.state == UIGestureRecognizerStateCancelled) {
         // Finish or cancel the interactive transition
-        if (progress > 0.3) {
+        if (progress > 0.25) {
             [self.interactivePopTransition finishInteractiveTransition];
         } else {
             [self.interactivePopTransition cancelInteractiveTransition];
diff --git a/MVVMReactiveCocoa/View/Transition/MRCViewControllerAnimatedTransition.m b/MVVMReactiveCocoa/View/Transition/MRCViewControllerAnimatedTransition.m
@@ -31,7 +31,7 @@ - (instancetype)initWithNavigationControllerOperation:(UINavigationControllerOpe
 }
 
 - (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext {
-    return 0.25;
+    return 0.5;
 }
 
 - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
@@ -82,7 +82,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
         [[transitionContext containerView] addSubview:toViewController.snapshot];
         [[transitionContext containerView] sendSubviewToBack:toViewController.snapshot];
         
-        toViewController.snapshot.transform = CGAffineTransformMakeScale(0.97, 0.97);
+        toViewController.snapshot.transform = CGAffineTransformMakeScale(0.95, 0.95);
         
         [fromViewController.view addSubview:fromViewController.snapshot];
         

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ - (instancetype)initWithNavigationControllerOperation:(UINavigationControllerOpe`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext {`
`34`		`- return 0.25;`
	`34`	`+ return 0.5;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`- (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext {`
`@@ -82,7 +82,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo`
`82`	`82`	`[[transitionContext containerView] addSubview:toViewController.snapshot];`
`83`	`83`	`[[transitionContext containerView] sendSubviewToBack:toViewController.snapshot];`
`84`	`84`
`85`		`- toViewController.snapshot.transform = CGAffineTransformMakeScale(0.97, 0.97);`
	`85`	`+ toViewController.snapshot.transform = CGAffineTransformMakeScale(0.95, 0.95);`
`86`	`86`
`87`	`87`	`[fromViewController.view addSubview:fromViewController.snapshot];`
`88`	`88`