Merge pull request #47 from bfolkens/AddDurationOptionToSetProgress

Added duration option to setProgress
danielamitay · Mar 21, 2015 · 035f957 · 035f957
2 parents cc4b128 + 5bd1317
commit 035f957
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/DACircularProgress/DACircularProgressView.h b/DACircularProgress/DACircularProgressView.h
@@ -23,5 +23,6 @@
 
 - (void)setProgress:(CGFloat)progress animated:(BOOL)animated;
 - (void)setProgress:(CGFloat)progress animated:(BOOL)animated initialDelay:(CFTimeInterval)initialDelay;
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated initialDelay:(CFTimeInterval)initialDelay withDuration:(CFTimeInterval)duration;
 
 @end
diff --git a/DACircularProgress/DACircularProgressView.m b/DACircularProgress/DACircularProgressView.m
@@ -191,14 +191,26 @@ - (void)setProgress:(CGFloat)progress animated:(BOOL)animated
 - (void)setProgress:(CGFloat)progress
            animated:(BOOL)animated
        initialDelay:(CFTimeInterval)initialDelay
+{
+    CGFloat pinnedProgress = MIN(MAX(progress, 0.0f), 1.0f);
+    [self setProgress:progress
+             animated:animated
+         initialDelay:initialDelay
+         withDuration:fabsf(self.progress - pinnedProgress)];
+}
+
+- (void)setProgress:(CGFloat)progress
+           animated:(BOOL)animated
+       initialDelay:(CFTimeInterval)initialDelay
+       withDuration:(CFTimeInterval)duration
 {
     [self.layer removeAnimationForKey:@"indeterminateAnimation"];
     [self.circularProgressLayer removeAnimationForKey:@"progress"];
 
     CGFloat pinnedProgress = MIN(MAX(progress, 0.0f), 1.0f);
     if (animated) {
         CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"progress"];
-        animation.duration = fabsf(self.progress - pinnedProgress); // Same duration as UIProgressView animation
+        animation.duration = duration;
         animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
         animation.fillMode = kCAFillModeForwards;
         animation.fromValue = [NSNumber numberWithFloat:self.progress];