diff --git a/HHTransition.podspec b/HHTransition.podspec index 22627e9..f111880 100644 --- a/HHTransition.podspec +++ b/HHTransition.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'HHTransition' - s.version = '2.0.0' + s.version = '2.0.1' s.summary = 'Transition' s.description = 'Mainstream transition animation' s.homepage = 'https://github.com/yuwind/HHTransition/wiki' diff --git a/HHTransition/VCInteractionDelegate.m b/HHTransition/VCInteractionDelegate.m index c9f8b06..27860f0 100755 --- a/HHTransition/VCInteractionDelegate.m +++ b/HHTransition/VCInteractionDelegate.m @@ -26,6 +26,7 @@ @interface VCInteractionDelegate () @property (nonatomic, assign) BOOL isPop; @property (nonatomic, assign) BOOL isInteraction; +@property (nonatomic, assign) BOOL isCATransition; @end @@ -67,6 +68,7 @@ @implementation VCInteractionDelegate case AnimationStyleRippleEffect: case AnimationStylePageCurl: case AnimationStyleCameralIrisHollowOpen: + self.isCATransition = YES; objc = [AnimationTransitionBegin animationStyle:toVC.animationStyle]; break; case AnimationStyleTopBack: @@ -130,6 +132,11 @@ - (void)edgePanAction:(UIScreenEdgePanGestureRecognizer *)gesture{ case UIGestureRecognizerStateEnded: self.completionCurve = UIViewAnimationCurveEaseInOut; _isInteraction = NO; + if (self.isCATransition) { + [self finishInteractiveTransition]; + self.navigation.delegate = self.delegate; + return; + } if (rate >= 0.3f){ [self finishInteractiveTransition]; UIView *firstView = self.navigation.view.subviews[0]; diff --git a/HHTransitionDemo/Info.plist b/HHTransitionDemo/Info.plist index fb2d005..4e8f71f 100644 --- a/HHTransitionDemo/Info.plist +++ b/HHTransitionDemo/Info.plist @@ -2,6 +2,8 @@ + UIUserInterfaceStyle + Light CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable diff --git a/README.md b/README.md index 39fb663..15efe66 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ ```objc target 'MyApp' do - pod 'HHTransition', '~> 2.0.0' + pod 'HHTransition', '~> 2.0.1' end ```