Skip to content

Commit

Permalink
bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
huxuewei authored and huxuewei committed Dec 9, 2019
1 parent 5dbb3f3 commit a30cf8c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion HHTransition.podspec
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
7 changes: 7 additions & 0 deletions HHTransition/VCInteractionDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ @interface VCInteractionDelegate ()

@property (nonatomic, assign) BOOL isPop;
@property (nonatomic, assign) BOOL isInteraction;
@property (nonatomic, assign) BOOL isCATransition;

@end

Expand Down Expand Up @@ -67,6 +68,7 @@ @implementation VCInteractionDelegate
case AnimationStyleRippleEffect:
case AnimationStylePageCurl:
case AnimationStyleCameralIrisHollowOpen:
self.isCATransition = YES;
objc = [AnimationTransitionBegin animationStyle:toVC.animationStyle];
break;
case AnimationStyleTopBack:
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 2 additions & 0 deletions HHTransitionDemo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
```objc
target 'MyApp' do
pod 'HHTransition', '~> 2.0.0'
pod 'HHTransition', '~> 2.0.1'
end
```

0 comments on commit a30cf8c

Please sign in to comment.