Added from value of timing functions extensions.

devedbox · Feb 16, 2017 · 582a94a · 582a94a
1 parent 9c6630c
commit 582a94a
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/AXAnimationChain/Classes/UIView+AnimationChain.m b/AXAnimationChain/Classes/UIView+AnimationChain.m
@@ -647,32 +647,38 @@ - (instancetype)easeInOutBack {
 }
 
 - (instancetype)easeInElastic {
-    [self.chainAnimator.topAnimator.combinedAnimators.lastObject.beginBasic easeInElastic];
+    AXChainAnimator *lastAnimator = self.chainAnimator.topAnimator.combinedAnimators.lastObject;
+    [lastAnimator.beginBasic.fromValue([self.layer valueForKey:((CAPropertyAnimation *)lastAnimator.animation).keyPath]) easeInElastic];
     return self;
 }
 
 - (instancetype)easeOutElastic {
-    [self.chainAnimator.topAnimator.combinedAnimators.lastObject.beginBasic easeOutElastic];
+    AXChainAnimator *lastAnimator = self.chainAnimator.topAnimator.combinedAnimators.lastObject;
+    [lastAnimator.beginBasic.fromValue([self.layer valueForKey:((CAPropertyAnimation *)lastAnimator.animation).keyPath]) easeOutElastic];
     return self;
 }
 
 - (instancetype)easeInOutElastic {
-    [self.chainAnimator.topAnimator.combinedAnimators.lastObject.beginBasic easeInOutElastic];
+    AXChainAnimator *lastAnimator = self.chainAnimator.topAnimator.combinedAnimators.lastObject;
+    [lastAnimator.beginBasic.fromValue([self.layer valueForKey:((CAPropertyAnimation *)lastAnimator.animation).keyPath]) easeInOutElastic];
     return self;
 }
 
 - (instancetype)easeInBounce {
-    [self.chainAnimator.topAnimator.combinedAnimators.lastObject.beginBasic easeInBounce];
+    AXChainAnimator *lastAnimator = self.chainAnimator.topAnimator.combinedAnimators.lastObject;
+    [lastAnimator.beginBasic.fromValue([self.layer valueForKey:((CAPropertyAnimation *)lastAnimator.animation).keyPath]) easeInBounce];
     return self;
 }
 
 - (instancetype)easeOutBounce {
-    [self.chainAnimator.topAnimator.combinedAnimators.lastObject.beginBasic easeOutBounce];
+    AXChainAnimator *lastAnimator = self.chainAnimator.topAnimator.combinedAnimators.lastObject;
+    [lastAnimator.beginBasic.fromValue([self.layer valueForKey:((CAPropertyAnimation *)lastAnimator.animation).keyPath]) easeOutBounce];
     return self;
 }
 
 - (instancetype)easeInOutBounce {
-    [self.chainAnimator.topAnimator.combinedAnimators.lastObject.beginBasic easeInOutBounce];
+    AXChainAnimator *lastAnimator = self.chainAnimator.topAnimator.combinedAnimators.lastObject;
+    [lastAnimator.beginBasic.fromValue([self.layer valueForKey:((CAPropertyAnimation *)lastAnimator.animation).keyPath]) easeInOutBounce];
     return self;
 }