@@ -231,7 +231,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
231
231
}
232
232
else if (object == topViewController) {
233
233
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: ^{
235
235
[self layoutContainerView ];
236
236
} completion: nil ];
237
237
}
@@ -338,7 +338,7 @@ - (void)transitFromViewController:(UIViewController *)fromViewController toViewC
338
338
339
339
_containerView.userInteractionEnabled = NO ;
340
340
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: ^{
342
342
[self layoutContainerView ];
343
343
[_contentView addSubview: toViewController.view];
344
344
capturedView.alpha = 0 ;
@@ -416,7 +416,7 @@ - (void)updateNavigationBarAniamted:(BOOL)animated
416
416
_navigationBar.topItem .titleView = toTitleView;
417
417
toTitleView.alpha = 0 ;
418
418
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: ^{
420
420
fromTitleView.alpha = 0 ;
421
421
toTitleView.alpha = 1 ;
422
422
} completion: ^(BOOL finished) {
@@ -460,7 +460,7 @@ - (void)setNavigationBarHidden:(BOOL)navigationBarHidden animated:(BOOL)animated
460
460
if (!navigationBarHidden) {
461
461
_navigationBar.hidden = navigationBarHidden;
462
462
}
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: ^{
464
464
_navigationBar.alpha = navigationBarHidden ? 0 : 1 ;
465
465
[self layoutContainerView ];
466
466
} completion: ^(BOOL finished) {
@@ -605,11 +605,11 @@ - (void)setCornerRadius:(CGFloat)cornerRadius
605
605
- (void )orientationDidChange
606
606
{
607
607
[_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: ^{
609
609
_containerView.alpha = 0 ;
610
610
} completion: ^(BOOL finished) {
611
611
[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: ^{
613
613
_containerView.alpha = 1 ;
614
614
} completion: nil ];
615
615
}];
@@ -821,7 +821,7 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
821
821
[UIView animateWithDuration: [self transitionDuration: transitionContext] delay: 0 options: UIViewAnimationOptionCurveEaseOut animations: animationBlock completion: completionBlock];
822
822
break ;
823
823
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];
825
825
break ;
826
826
default :
827
827
break ;
@@ -896,7 +896,7 @@ - (void)popupNavigationBar:(STPopupNavigationBar *)navigationBar touchDidEndWith
896
896
}
897
897
else {
898
898
[_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: ^{
900
900
_containerView.transform = CGAffineTransformIdentity;
901
901
} completion: nil ];
902
902
}
0 commit comments