Skip to content

fix hidden TabBarController & Navigation Controller after back to pre… #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix hidden TabBarController & Navigation Controller after back to pre… #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c14e7d9
fix hidden TabBarController & Navigation Controller after back to pre…
calvinsug Aug 22, 2017
14d4347
modify speed animation when push & pop view controller and remove unn…
calvinsug Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 13 additions & 24 deletions Pod/Classes/RMPZoomTransitionAnimator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ - (RMPZoomTransitionAnimator * _Nonnull)initWithAnimationDurationForward:(NSTime
instead of repeatability having to use the convenience init method.
*/
- (void)setDefaultAnimationDuration {
kForwardAnimationDuration = 0.3;
kForwardAnimationDuration = 0.45;
kForwardCompleteAnimationDuration = 0.2;
kBackwardAnimationDuration = 0.25;
kBackwardCompleteAnimationDuration = 0.18;
kBackwardAnimationDuration = 0.45;
kBackwardCompleteAnimationDuration = 0;
}

#pragma mark - <UIViewControllerAnimatedTransitioning>
Expand Down Expand Up @@ -150,27 +150,16 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
alphaView.alpha = 0;
}
completion:^(BOOL finished) {
[UIView animateWithDuration:kBackwardCompleteAnimationDuration
delay:0
options:UIViewAnimationOptionCurveEaseOut
animations:^{
sourceImageView.alpha = 0;
}
completion:^(BOOL finished) {
if ([self.destinationTransition conformsToProtocol:@protocol(RMPZoomTransitionAnimating)] &&
[self.destinationTransition respondsToSelector:@selector(zoomTransitionAnimator:didCompleteTransition:animatingSourceImageView:)]) {
[self.destinationTransition zoomTransitionAnimator:self
didCompleteTransition:![transitionContext transitionWasCancelled]
animatingSourceImageView:sourceImageView];
}
[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
if(![[UIApplication sharedApplication].keyWindow.subviews containsObject:toVC.view]) {
[[UIApplication sharedApplication].keyWindow addSubview:toVC.view];
}
// Remove the views from superviews to release the references
[alphaView removeFromSuperview];
[sourceImageView removeFromSuperview];
}];
if ([self.destinationTransition conformsToProtocol:@protocol(RMPZoomTransitionAnimating)] &&
[self.destinationTransition respondsToSelector:@selector(zoomTransitionAnimator:didCompleteTransition:animatingSourceImageView:)]) {
[self.destinationTransition zoomTransitionAnimator:self
didCompleteTransition:![transitionContext transitionWasCancelled]
animatingSourceImageView:sourceImageView];
}
[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
// Remove the views from superviews to release the references
[alphaView removeFromSuperview];
[sourceImageView removeFromSuperview];
}];
}
}
Expand Down