Skip to content

Commit 37fcfe6

Browse files
committed
Replace CASpringAnimation with AXCASpringAnimation.
1 parent 815fdbe commit 37fcfe6

3 files changed

Lines changed: 22 additions & 20 deletions

File tree

AXAnimationChain/AnimationConvertableViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ - (IBAction)extends:(UIButton *)sender {
118118
*/
119119
[_transitionView.layer removeAllAnimations];
120120
[_keyframeTransitionView.layer removeAllAnimations];
121-
CASpringAnimation *animation = [CASpringAnimation animationWithKeyPath:@"position"];
121+
AXCASpringAnimation *animation = [AXCASpringAnimation animationWithKeyPath:@"position"];
122122
animation.removedOnCompletion = NO;
123123
animation.fillMode = kCAFillModeForwards;
124124
// animation.initialVelocity = -10;

AXAnimationChain/Classes/AXChainAnimator.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#import <Foundation/Foundation.h>
2727
#import <UIKit/UIKit.h>
2828
#import <QuartzCore/QuartzCore.h>
29+
#import "AXCoreAnimation.h"
30+
2931
NS_ASSUME_NONNULL_BEGIN
3032
/// CAMediaTiming protocol reachable.
3133
@protocol AXMediaTimingDelegate <NSObject>
@@ -456,7 +458,7 @@ NS_ASSUME_NONNULL_BEGIN
456458

457459
@interface AXSpringChainAnimator : AXBasicChainAnimator <AXSpringChainAnimatorDelegate>
458460
/// Core animation.
459-
@property(readonly, nonatomic) CASpringAnimation *animation;
461+
@property(readonly, nonatomic) AXCASpringAnimation *animation;
460462
@end
461463

462464
@interface AXTransitionChainAnimator : AXChainAnimator <AXTransitionChainAnimatorDelegate>

AXAnimationChain/Classes/AXChainAnimator.m

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,23 @@ - (instancetype)beginWith:(nonnull AXChainAnimator *)animator {
9292
if ([self isKindOfClass:[AXBasicChainAnimator class]]) {
9393
[animator _setAnimation:[CAKeyframeAnimation animationWithBasic:(CABasicAnimation *)self.animation]];
9494
} else if ([self isKindOfClass:[AXSpringChainAnimator class]]) {
95-
[animator _setAnimation:[CAKeyframeAnimation animationWithSpring:(CASpringAnimation *)self.animation]];
95+
[animator _setAnimation:[CAKeyframeAnimation animationWithSpring:(AXCASpringAnimation *)self.animation]];
9696
}
97-
} else if ([animator isKindOfClass:[AXBasicChainAnimator class]] && ![animator isKindOfClass:[AXSpringChainAnimator class]]) {
98-
if ([self isKindOfClass:[AXBasicChainAnimator class]] && ![self isKindOfClass:[AXSpringChainAnimator class]]) return self;
97+
} else if ([animator isKindOfClass:[AXBasicChainAnimator class]] && ![animator isKindOfClass:[AXCASpringAnimation class]]) {
98+
if ([self isKindOfClass:[AXBasicChainAnimator class]] && ![self isKindOfClass:[AXCASpringAnimation class]]) return self;
9999

100100
if ([self isKindOfClass:[AXKeyframeChainAnimator class]]) {
101101
[animator _setAnimation:[CABasicAnimation animationWithKeyframe:(CAKeyframeAnimation *)self.animation]];
102-
} else if ([self isKindOfClass:[AXSpringChainAnimator class]]) {
103-
[animator _setAnimation:[CABasicAnimation animationWithSpring:(CASpringAnimation *)self.animation]];
102+
} else if ([self isKindOfClass:[AXCASpringAnimation class]]) {
103+
[animator _setAnimation:[CABasicAnimation animationWithSpring:(AXCASpringAnimation *)self.animation]];
104104
}
105-
} else if ([animator isKindOfClass:[AXSpringChainAnimator class]]) {
106-
if ([self isKindOfClass:[AXSpringChainAnimator class]]) return self;
105+
} else if ([animator isKindOfClass:[AXCASpringAnimation class]]) {
106+
if ([self isKindOfClass:[AXCASpringAnimation class]]) return self;
107107

108108
if ([self isKindOfClass:[AXKeyframeChainAnimator class]]) {
109-
[animator _setAnimation:[CASpringAnimation animationWithKeyframe:(CAKeyframeAnimation *)self.animation]];
109+
[animator _setAnimation:[AXCASpringAnimation animationWithKeyframe:(CAKeyframeAnimation *)self.animation]];
110110
} else if ([self isKindOfClass:[AXBasicChainAnimator class]]) {
111-
[animator _setAnimation:[CASpringAnimation animationWithBasic:(CABasicAnimation *)self.animation]];
111+
[animator _setAnimation:[AXCASpringAnimation animationWithBasic:(CABasicAnimation *)self.animation]];
112112
}
113113
}
114114
[self _relinkAnimatorsWithAnimatorToReplace:animator];
@@ -244,7 +244,7 @@ - (AXKeyframeChainAnimator *)_keyframeAnimator {
244244
}
245245

246246
- (AXSpringChainAnimator *)_springAnimator {
247-
CASpringAnimation *animation = [CASpringAnimation animation];
247+
AXCASpringAnimation *animation = [AXCASpringAnimation animation];
248248
animation.removedOnCompletion = NO;
249249
animation.fillMode = kCAFillModeForwards;
250250
animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault];
@@ -423,9 +423,9 @@ - (void)_beginAnimating {
423423
}
424424

425425
- (void)_addAnimationsToAnimatedLayer {
426-
if ([_animation isKindOfClass:CASpringAnimation.class]) {
426+
if ([_animation isKindOfClass:AXCASpringAnimation.class]) {
427427
if (!_animation.duration && [_animation respondsToSelector:@selector(settlingDuration)]) {
428-
_animation.duration = [(CASpringAnimation *)_animation settlingDuration];
428+
_animation.duration = [(AXCASpringAnimation *)_animation settlingDuration];
429429
}
430430
}/* else if ([self isKindOfClass:AXKeyframeChainAnimator.class]) { // Handle the custom timing functions.
431431
AXKeyframeChainAnimator *animator = (AXKeyframeChainAnimator *)self;
@@ -700,8 +700,8 @@ - (void)_animationGroupsForCombinedWithGroup:(CAAnimationGroup **)group {
700700
CAAnimation *animation = [animator animation];
701701
[animations addObject:animation];
702702
// Fixs the spring animation of duration.
703-
if ([animation isMemberOfClass:CASpringAnimation.class]) {
704-
CASpringAnimation *springAnimation = (CASpringAnimation *)animation;
703+
if ([animation isMemberOfClass:AXCASpringAnimation.class]) {
704+
AXCASpringAnimation *springAnimation = (AXCASpringAnimation *)animation;
705705
if (springAnimation.duration) {
706706
springAnimation.duration = MIN(springAnimation.duration, springAnimation.settlingDuration);
707707
} else {
@@ -735,8 +735,8 @@ - (void)_animationGroupsForNextToWithGroup:(CAAnimationGroup **)group {
735735
while (animator) {
736736
CAAnimation *nextAnimation = [animator animation];
737737
// Fixs the spring animation of duration.
738-
if ([nextAnimation isMemberOfClass:CASpringAnimation.class]) {
739-
CASpringAnimation *springAnimation = (CASpringAnimation *)nextAnimation;
738+
if ([nextAnimation isMemberOfClass:AXCASpringAnimation.class]) {
739+
AXCASpringAnimation *springAnimation = (AXCASpringAnimation *)nextAnimation;
740740
if (springAnimation.duration) {
741741
springAnimation.duration = MIN(springAnimation.duration, springAnimation.settlingDuration);
742742
} else {
@@ -969,8 +969,8 @@ - (instancetype)beginWith:(AXChainAnimator *)animator {
969969
return [super beginWith:animator];
970970
}
971971
#pragma mark - Getters.
972-
- (CASpringAnimation *)animation {
973-
return (CASpringAnimation *)[super animation];
972+
- (AXCASpringAnimation *)animation {
973+
return (AXCASpringAnimation *)[super animation];
974974
}
975975

976976
#pragma mark - PropertiesHandler.

0 commit comments

Comments
 (0)