public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 13:35:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iOS: fixed #769 (Safari swipe to dismiss)

Browse source 
Now uses a linear animation curve when tracking the gesture, so it
follows the finger, and an ease in/out curve and the same speed as
other animations when not.
This commit is contained in:
David Sinclair 2015-10-26 20:28:38 -07:00
parent 49149d75e6
commit 6232df3bfa
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/ios/Classes/NBModalPushPopTransition.m
View file

@ -22,7 +22,7 @@
}
- (CGFloat)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext {
return 0.75;
return 0.35;
}
- (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
@ -56,7 +56,7 @@
shadowView.transform = self.dismissing ? CGAffineTransformMakeScale(0.01, 1.0) : CGAffineTransformIdentity;
shadowView.alpha = self.dismissing ? 1.0 : 0.0;
[UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0.0 usingSpringWithDamping:0.9 initialSpringVelocity:1.0 options:self.animationOpts animations:^{
[UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0.0 options:[self animationOpts] animations:^{
topView.transform = self.dismissing ? CGAffineTransformMakeTranslation(offset, 0.0) : CGAffineTransformIdentity;
shadowView.transform = self.dismissing ? CGAffineTransformIdentity : CGAffineTransformMakeScale(0.01, 1.0);
shadowView.alpha = self.dismissing ? 0.0 : 1.0;
@ -68,7 +68,9 @@
}
- (UIViewAnimationOptions)animationOpts {
return UIViewAnimationOptionAllowAnimatedContent | UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionLayoutSubviews;
UIViewAnimationOptions opts = self.percentageDriven ? UIViewAnimationOptionCurveLinear : UIViewAnimationOptionCurveEaseInOut;
return opts | UIViewAnimationOptionAllowAnimatedContent | UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionLayoutSubviews;
}
@end

2
clients/ios/Classes/NewsBlurAppDelegate.m
View file

@ -1371,7 +1371,7 @@
- (void)handleGesture:(UIScreenEdgePanGestureRecognizer *)recognizer {
self.safariAnimator.percentageDriven = YES;
CGFloat percentComplete = [recognizer locationInView:self.view].x / self.view.bounds.size.width / 2.0;
CGFloat percentComplete = [recognizer locationInView:self.view].x / self.view.bounds.size.width;
switch (recognizer.state) {
case UIGestureRecognizerStateBegan: