Skip to content

Commit 35c0cb9

Browse files
committed
Tweak animations.
1 parent 3295aab commit 35c0cb9

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

STPopup/STPopupController.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
231231
}
232232
else if (object == topViewController) {
233233
if (topViewController.isViewLoaded && topViewController.view.superview) {
234-
[UIView animateWithDuration:0.3 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
234+
[UIView animateWithDuration:0.3 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
235235
[self layoutContainerView];
236236
} completion:nil];
237237
}
@@ -338,7 +338,7 @@ - (void)transitFromViewController:(UIViewController *)fromViewController toViewC
338338

339339
_containerView.userInteractionEnabled = NO;
340340
toViewController.view.alpha = 0;
341-
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
341+
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
342342
[self layoutContainerView];
343343
[_contentView addSubview:toViewController.view];
344344
capturedView.alpha = 0;
@@ -416,7 +416,7 @@ - (void)updateNavigationBarAniamted:(BOOL)animated
416416
_navigationBar.topItem.titleView = toTitleView;
417417
toTitleView.alpha = 0;
418418

419-
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
419+
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
420420
fromTitleView.alpha = 0;
421421
toTitleView.alpha = 1;
422422
} completion:^(BOOL finished) {
@@ -460,7 +460,7 @@ - (void)setNavigationBarHidden:(BOOL)navigationBarHidden animated:(BOOL)animated
460460
if (!navigationBarHidden) {
461461
_navigationBar.hidden = navigationBarHidden;
462462
}
463-
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
463+
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
464464
_navigationBar.alpha = navigationBarHidden ? 0 : 1;
465465
[self layoutContainerView];
466466
} completion:^(BOOL finished) {
@@ -605,11 +605,11 @@ - (void)setCornerRadius:(CGFloat)cornerRadius
605605
- (void)orientationDidChange
606606
{
607607
[_containerView endEditing:YES];
608-
[UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
608+
[UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
609609
_containerView.alpha = 0;
610610
} completion:^(BOOL finished) {
611611
[self layoutContainerView];
612-
[UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
612+
[UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
613613
_containerView.alpha = 1;
614614
} completion:nil];
615615
}];
@@ -821,7 +821,7 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
821821
[UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0 options:UIViewAnimationOptionCurveEaseOut animations:animationBlock completion:completionBlock];
822822
break;
823823
case STPopupTransitionStyleSlideVertical:
824-
[UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:animationBlock completion:completionBlock];
824+
[UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:animationBlock completion:completionBlock];
825825
break;
826826
default:
827827
break;
@@ -896,7 +896,7 @@ - (void)popupNavigationBar:(STPopupNavigationBar *)navigationBar touchDidEndWith
896896
}
897897
else {
898898
[_containerView endEditing:YES];
899-
[UIView animateWithDuration:0.4 delay:0 usingSpringWithDamping:0.7 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
899+
[UIView animateWithDuration:0.4 delay:0 usingSpringWithDamping:0.7 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
900900
_containerView.transform = CGAffineTransformIdentity;
901901
} completion:nil];
902902
}

STPopup/STPopupLeftBarItem.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ - (void)setType:(STPopupLeftBarItemType)type animated:(BOOL)animated
4343
{
4444
_type = type;
4545
if (animated) {
46-
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
46+
[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
4747
[self updateLayout];
4848
} completion:nil];
4949
}

0 commit comments

Comments
 (0)