ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-23 12:38:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #377 from welshm/reverseSupport

Browse Source 
Add better support for negative animation speeds
This commit is contained in:
Brandon Withrow
2017-08-17 15:04:30 -07:00
committed by GitHub
parent e15565420c fbf6ca5686
commit 8f86819fff
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lottie-ios/Classes/Private/LOTAnimationView.m
View File

@@ -14,6 +14,8 @@
#import "LOTAnimationCache.h"
#import "LOTCompositionContainer.h"
static NSString * const kCompContainerAnimationKey = @"play";
@implementation LOTAnimationView {
LOTCompositionContainer *_compContainer;
NSNumber *_playRangeStartFrame;
@@ -218,6 +220,11 @@
return @(((_sceneModel.endFrame.floatValue - _sceneModel.startFrame.floatValue) * progress) + _sceneModel.startFrame.floatValue);
}
- (BOOL)_isSpeedNegative {
// If the animation speed is negative, then we're moving backwards.
return _animationSpeed >= 0;
}
# pragma mark - Completion Block
- (void)_callCompletionIfNecessary:(BOOL)complete {
@@ -293,10 +300,13 @@
return;
}
NSNumber *currentFrame = [self _frameForProgress:_animationProgress];
currentFrame = @(MAX(MIN(currentFrame.floatValue, toEndFrame.floatValue), fromStartFrame.floatValue));
if (currentFrame.floatValue == toEndFrame.floatValue) {
BOOL playingForward = [self _isSpeedNegative];
if (currentFrame.floatValue == toEndFrame.floatValue && playingForward) {
currentFrame = fromStartFrame;
} else if (currentFrame.floatValue == fromStartFrame.floatValue && !playingForward) {
currentFrame = toEndFrame;
}
_animationProgress = [self _progressForFrame:currentFrame];
@@ -313,7 +323,7 @@
animation.delegate = self;
animation.removedOnCompletion = NO;
animation.beginTime = CACurrentMediaTime() - offset;
[_compContainer addAnimation:animation forKey:@"play"];
[_compContainer addAnimation:animation forKey:kCompContainerAnimationKey];
_isAnimationPlaying = YES;
}
@@ -464,7 +474,7 @@
if (!_sceneModel) {
return 0;
}
CAAnimation *play = [_compContainer animationForKey:@"play"];
CAAnimation *play = [_compContainer animationForKey:kCompContainerAnimationKey];
if (play) {
return play.duration;
}
@@ -596,12 +606,14 @@
# pragma mark - CAANimationDelegate
- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)complete {
if ([_compContainer animationForKey:@"play"] == anim &&
if ([_compContainer animationForKey:kCompContainerAnimationKey] == anim &&
[anim isKindOfClass:[CABasicAnimation class]]) {
CABasicAnimation *playAnimation = (CABasicAnimation *)anim;
NSNumber *frame = _compContainer.presentationLayer.currentFrame;
if (complete) {
frame = (NSNumber *)playAnimation.toValue;
// Set the final frame based on the animation to/from values. If playing forward, use the
// toValue otherwise we want to end on the fromValue.
frame = [self _isSpeedNegative] ? (NSNumber *)playAnimation.toValue : (NSNumber *)playAnimation.fromValue;
}
[self _removeCurrentAnimationIfNecessary];
[self setProgressWithFrame:frame callCompletionIfNecessary:NO];

8
lottie-ios/Classes/PublicHeaders/LOTAnimationView.h
View File

@@ -44,11 +44,13 @@ typedef void (^LOTAnimationCompletionBlock)(BOOL animationFinished);
/// The animation will play forward and then backwards if loopAnimation is also YES
@property (nonatomic, assign) BOOL autoReverseAnimation;
// TODO
/// Sets a progress from 0 - 1 of the animation. If the animation is playing it will stop and the completion block will be called.
/// Sets a progress from 0 - 1 of the animation. If the animation is playing it will stop and the compeltion block will be called.
/// The current progress of the animation in absolute time.
/// e.g. a value of 0.75 always represents the same point in the animation, regardless of positive
/// or negative speed.
@property (nonatomic, assign) CGFloat animationProgress;
/// Sets the speed of the animation. Accepts a negative value for reversing animation
/// Sets the speed of the animation. Accepts a negative value for reversing animation.
@property (nonatomic, assign) CGFloat animationSpeed;
/// Read only of the duration in seconds of the animation at speed of 1