Tweak animations.

kevin-lyn · Aug 2, 2016 · 35c0cb9 · 35c0cb9
1 parent 3295aab
commit 35c0cb9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/STPopup/STPopupController.m b/STPopup/STPopupController.m
@@ -231,7 +231,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     }
     else if (object == topViewController) {
         if (topViewController.isViewLoaded && topViewController.view.superview) {
-            [UIView animateWithDuration:0.3 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+            [UIView animateWithDuration:0.3 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
                 [self layoutContainerView];
             } completion:nil];
         }
@@ -338,7 +338,7 @@ - (void)transitFromViewController:(UIViewController *)fromViewController toViewC
 
         _containerView.userInteractionEnabled = NO;
         toViewController.view.alpha = 0;
-        [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+        [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
             [self layoutContainerView];
             [_contentView addSubview:toViewController.view];
             capturedView.alpha = 0;
@@ -416,7 +416,7 @@ - (void)updateNavigationBarAniamted:(BOOL)animated
         _navigationBar.topItem.titleView = toTitleView;
         toTitleView.alpha = 0;
 
-        [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+        [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
             fromTitleView.alpha = 0;
             toTitleView.alpha = 1;
         } completion:^(BOOL finished) {
@@ -460,7 +460,7 @@ - (void)setNavigationBarHidden:(BOOL)navigationBarHidden animated:(BOOL)animated
     if (!navigationBarHidden) {
         _navigationBar.hidden = navigationBarHidden;
     }
-    [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+    [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
         _navigationBar.alpha = navigationBarHidden ? 0 : 1;
         [self layoutContainerView];
     } completion:^(BOOL finished) {
@@ -605,11 +605,11 @@ - (void)setCornerRadius:(CGFloat)cornerRadius
 - (void)orientationDidChange
 {
     [_containerView endEditing:YES];
-    [UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+    [UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
         _containerView.alpha = 0;
     } completion:^(BOOL finished) {
         [self layoutContainerView];
-        [UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+        [UIView animateWithDuration:0.2 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
             _containerView.alpha = 1;
         } completion:nil];
     }];
@@ -821,7 +821,7 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
                 [UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0 options:UIViewAnimationOptionCurveEaseOut animations:animationBlock completion:completionBlock];
                 break;
             case STPopupTransitionStyleSlideVertical:
-                [UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:animationBlock completion:completionBlock];
+                [UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:animationBlock completion:completionBlock];
                 break;
             default:
                 break;
@@ -896,7 +896,7 @@ - (void)popupNavigationBar:(STPopupNavigationBar *)navigationBar touchDidEndWith
     }
     else {
         [_containerView endEditing:YES];
-        [UIView animateWithDuration:0.4 delay:0 usingSpringWithDamping:0.7 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+        [UIView animateWithDuration:0.4 delay:0 usingSpringWithDamping:0.7 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
             _containerView.transform = CGAffineTransformIdentity;
         } completion:nil];
     }

diff --git a/STPopup/STPopupLeftBarItem.m b/STPopup/STPopupLeftBarItem.m
@@ -43,7 +43,7 @@ - (void)setType:(STPopupLeftBarItemType)type animated:(BOOL)animated
 {
     _type = type;
     if (animated) {
-        [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+        [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
             [self updateLayout];
         } completion:nil];
     }