From c14e7d94fc34b29a859a6f31593b44c4d6d3a2b5 Mon Sep 17 00:00:00 2001 From: Calvin Sugianto Date: Tue, 22 Aug 2017 17:03:16 +0700 Subject: [PATCH 1/2] fix hidden TabBarController & Navigation Controller after back to previous view controller when using push navigation controller --- Pod/Classes/RMPZoomTransitionAnimator.m | 3 --- 1 file changed, 3 deletions(-) diff --git a/Pod/Classes/RMPZoomTransitionAnimator.m b/Pod/Classes/RMPZoomTransitionAnimator.m index 43db6dd..4c4472d 100644 --- a/Pod/Classes/RMPZoomTransitionAnimator.m +++ b/Pod/Classes/RMPZoomTransitionAnimator.m @@ -164,9 +164,6 @@ - (void)animateTransition:(id)transitionCo 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]; From 14d4347470cbd255559f266c59cdd480291de758 Mon Sep 17 00:00:00 2001 From: Calvin Sugianto Date: Wed, 23 Aug 2017 16:03:57 +0700 Subject: [PATCH 2/2] modify speed animation when push & pop view controller and remove unnecessary animation when going backward --- Pod/Classes/RMPZoomTransitionAnimator.m | 34 ++++++++++--------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/Pod/Classes/RMPZoomTransitionAnimator.m b/Pod/Classes/RMPZoomTransitionAnimator.m index 4c4472d..917177a 100644 --- a/Pod/Classes/RMPZoomTransitionAnimator.m +++ b/Pod/Classes/RMPZoomTransitionAnimator.m @@ -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 - @@ -150,24 +150,16 @@ - (void)animateTransition:(id)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]]; - // 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]; }]; } }