Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sometimes animations became choppy and even not working #67

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sometimes animations became choppy and even not working #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions DACircularProgress/DACircularProgressView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,32 +204,31 @@ - (void)setProgress:(CGFloat)progress
withDuration:(CFTimeInterval)duration
{
[self.layer removeAnimationForKey:@"indeterminateAnimation"];
[self.circularProgressLayer removeAnimationForKey:@"progress"];

// on basic animations, the value is reset to its original value once animation is finished
// to avoid this, just set the progress value before removing animation
CGFloat currentProgress = ((DACircularProgressLayer*)self.circularProgressLayer.presentationLayer).progress;
self.circularProgressLayer.progress = currentProgress;

[self.circularProgressLayer removeAnimationForKey:@"progress"];

CGFloat pinnedProgress = MIN(MAX(progress, 0.0f), 1.0f);
if (animated) {
CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"progress"];
animation.duration = duration;
animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
animation.fillMode = kCAFillModeForwards;
animation.fromValue = [NSNumber numberWithFloat:self.progress];
animation.fromValue = [NSNumber numberWithFloat:currentProgress];
animation.toValue = [NSNumber numberWithFloat:pinnedProgress];
animation.removedOnCompletion = NO;
animation.beginTime = CACurrentMediaTime() + initialDelay;
animation.delegate = self;
[self.circularProgressLayer addAnimation:animation forKey:@"progress"];
} else {
[self.circularProgressLayer setNeedsDisplay];
self.circularProgressLayer.progress = pinnedProgress;
}
}

- (void)animationDidStop:(CAAnimation *)animation finished:(BOOL)flag
{
NSNumber *pinnedProgressNumber = [animation valueForKey:@"toValue"];
self.circularProgressLayer.progress = [pinnedProgressNumber floatValue];
}


#pragma mark - UIAppearance methods

- (UIColor *)trackTintColor
Expand Down