diff --git a/ASProgressPopupView/ASPopupView.m b/ASProgressPopupView/ASPopupView.m index 1cac3ba..27eee49 100644 --- a/ASProgressPopupView/ASPopupView.m +++ b/ASProgressPopupView/ASPopupView.m @@ -157,7 +157,7 @@ - (void)show [scaleAnim setTimingFunction:[CAMediaTimingFunction functionWithControlPoints:0.8 :2.5 :0.35 :0.5]]; scaleAnim.removedOnCompletion = NO; scaleAnim.fillMode = kCAFillModeForwards; - scaleAnim.duration = 0.4; + scaleAnim.duration = 0.8; [self.layer addAnimation:scaleAnim forKey:@"transform"]; CABasicAnimation* fadeInAnim = [CABasicAnimation animationWithKeyPath:@"opacity"]; @@ -178,7 +178,7 @@ - (void)hide CABasicAnimation *scaleAnim = [CABasicAnimation animationWithKeyPath:@"transform"]; scaleAnim.fromValue = [self.layer.presentationLayer valueForKey:@"transform"]; scaleAnim.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.5, 0.5, 1)]; - scaleAnim.duration = 0.6; + scaleAnim.duration = 0.9; scaleAnim.removedOnCompletion = NO; scaleAnim.fillMode = kCAFillModeForwards; [scaleAnim setTimingFunction:[CAMediaTimingFunction functionWithControlPoints:0.1 :-2 :0.3 :3]]; @@ -187,7 +187,7 @@ - (void)hide CABasicAnimation* fadeOutAnim = [CABasicAnimation animationWithKeyPath:@"opacity"]; fadeOutAnim.fromValue = [self.layer.presentationLayer valueForKey:@"opacity"]; fadeOutAnim.toValue = @0.0; - fadeOutAnim.duration = 0.8; + fadeOutAnim.duration = 1.0; [self.layer addAnimation:fadeOutAnim forKey:@"opacity"]; self.layer.opacity = 0.0; } [CATransaction commit];