|
@@ -90,7 +90,7 @@
|
90
|
90
|
return YES;
|
91
|
91
|
}
|
92
|
92
|
- (void)animationEnded:(BOOL)transitionCompleted {
|
93
|
|
-
|
|
93
|
+
|
94
|
94
|
}
|
95
|
95
|
|
96
|
96
|
- (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext
|
|
@@ -104,8 +104,8 @@
|
104
|
104
|
self.transitionContext = transitionContext;
|
105
|
105
|
UIViewController* toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
|
106
|
106
|
UIViewController* fromVC = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
|
107
|
|
- UIView* componentView = [transitionContext componentView];
|
108
|
|
-
|
|
107
|
+ UIView* componentView = [transitionContext containerView];
|
|
108
|
+
|
109
|
109
|
toVC.view.frame = fromVC.view.frame;
|
110
|
110
|
UIView* topViewContent = [self.topView subviews][0];
|
111
|
111
|
UIImage* image = [[self.topView subviews][0] image];
|
|
@@ -143,7 +143,7 @@
|
143
|
143
|
if (![transitionContext transitionWasCancelled]) {
|
144
|
144
|
[componentView addSubview: toVC.view];
|
145
|
145
|
[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
|
146
|
|
-
|
|
146
|
+
|
147
|
147
|
}
|
148
|
148
|
if ([transitionContext transitionWasCancelled]) {
|
149
|
149
|
[self.topView setHidden:NO];
|
|
@@ -157,15 +157,15 @@
|
157
|
157
|
animationControllerForOperation:(UINavigationControllerOperation)operation
|
158
|
158
|
fromViewController:(UIViewController*)fromVC
|
159
|
159
|
toViewController:(UIViewController*)toVC {
|
160
|
|
-
|
|
160
|
+
|
161
|
161
|
if (operation == UINavigationControllerOperationPop) {
|
162
|
162
|
return self;
|
163
|
163
|
} else {
|
164
|
164
|
return nil;
|
165
|
165
|
}
|
166
|
|
-
|
|
166
|
+
|
167
|
167
|
return nil;
|
168
|
|
-
|
|
168
|
+
|
169
|
169
|
}
|
170
|
170
|
- (id<UIViewControllerInteractiveTransitioning>)navigationController:(UINavigationController *)navigationController
|
171
|
171
|
interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransitioning>)animationController {
|