|
@@ -10,7 +10,7 @@
|
10
|
10
|
}
|
11
|
11
|
|
12
|
12
|
- (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext {
|
13
|
|
- return 0.5;
|
|
13
|
+ return self.screenTransition.content.duration;
|
14
|
14
|
}
|
15
|
15
|
|
16
|
16
|
- (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
|
|
@@ -20,11 +20,13 @@
|
20
|
20
|
|
21
|
21
|
[self.screenTransition.content setupInitialTransitionForView:toViewController.view];
|
22
|
22
|
[self.screenTransition.topBar setupInitialTransitionForView:toViewController.navigationController.navigationBar];
|
|
23
|
+ [self.screenTransition.bottomTabs setupInitialTransitionForView:toViewController.tabBarController.tabBar];
|
23
|
24
|
|
24
|
25
|
|
25
|
|
- [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{
|
|
26
|
+ [UIView animateWithDuration:[self transitionDuration:transitionContext] delay:self.screenTransition.content.startDelay options:self.screenTransition.content.interpolation animations:^{
|
26
|
27
|
[self.screenTransition.content completeTransitionForView:toViewController.view];
|
27
|
28
|
[self.screenTransition.topBar completeTransitionForView:toViewController.navigationController.navigationBar];
|
|
29
|
+ [self.screenTransition.bottomTabs completeTransitionForView:toViewController.tabBarController.tabBar];
|
28
|
30
|
} completion:^(BOOL finished) {
|
29
|
31
|
[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
|
30
|
32
|
}];
|