Merge branch 'release-candidate' into stable

Author: Jeff Verkoeyen

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.1.0
+
+This minor change resolves some Xcode 9 warnings and introduces the ability to speed up or slow down animations.
+
+## New features
+
+- Added a new keypath constant, `MDMKeyPathScale`.
+- MDMAnimator animation timing can now be scaled using the new `timeScaleFactor` property.
+
+## Source changes
+
+* [If settlingDuration is unavailable, use the provided spring duration. (#5)](https://github.com/material-motion/motion-animator-objc/commit/4baa99681c0a73180bc0a25019dc575a5fee5ab1) (featherless)
+* [Resolve Xcode 9 warnings. (#7)](https://github.com/material-motion/motion-animator-objc/commit/6f84058ca729299261cae0865b8bbb1ccd163179) (featherless)
+* [Add a timeScaleFactor API to the animator. (#6)](https://github.com/material-motion/motion-animator-objc/commit/b2a0f96b617edea13517d33b20d8d95b10426bb7) (featherless)
+* [Add transform.scale keypath. (#3)](https://github.com/material-motion/motion-animator-objc/commit/9bdf4f6e833283da452797a254a090da61607a2b) (featherless)
+
 # 1.0.1
 
 This is a patch fix release to address build issues within Google's build environment.

MotionAnimator.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "MotionAnimator"
   s.summary      = "A Motion Animator creates performant, interruptible animations from motion specs."
-  s.version      = "1.0.1"
+  s.version      = "1.1.0"
   s.authors      = "The Material Motion Authors"
   s.license      = "Apache 2.0"
   s.homepage     = "https://github.com/material-motion/motion-animator-objc"

Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - CatalogByConvention (2.1.1)
-  - MotionAnimator (1.0.1):
+  - MotionAnimator (1.1.0):
     - MotionInterchange
   - MotionInterchange (1.0.1)
 
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
-  MotionAnimator: ddf0bc7f92605c81e4d9864167bf18aab84823c6
+  MotionAnimator: 9d025cda7572737e5db5ca779eb28c767fe6cf45
   MotionInterchange: 7a7c355ba2ed5d36c5cf2ceb76cacd3d3680dbf5
 
 PODFILE CHECKSUM: 634239e7b183e669593b273198da9227ed207777

src/MDMAnimatableKeyPaths.h

@@ -25,6 +25,7 @@ typedef NSString * const MDMAnimatableKeyPath __attribute__((swift_wrapper(enum)
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathCornerRadius NS_SWIFT_NAME(cornerRadius);
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathHeight NS_SWIFT_NAME(height);
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathOpacity NS_SWIFT_NAME(opacity);
+FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathScale NS_SWIFT_NAME(scale);
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathWidth NS_SWIFT_NAME(width);
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathX NS_SWIFT_NAME(x);
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathY NS_SWIFT_NAME(y);

src/MDMAnimatableKeyPaths.m

@@ -19,6 +19,7 @@
 MDMAnimatableKeyPath MDMKeyPathCornerRadius = @"cornerRadius";
 MDMAnimatableKeyPath MDMKeyPathHeight = @"bounds.size.height";
 MDMAnimatableKeyPath MDMKeyPathOpacity = @"opacity";
+MDMAnimatableKeyPath MDMKeyPathScale = @"transform.scale";
 MDMAnimatableKeyPath MDMKeyPathWidth = @"bounds.size.width";
 MDMAnimatableKeyPath MDMKeyPathX = @"position.x";
 MDMAnimatableKeyPath MDMKeyPathY = @"position.y";

src/MDMMotionAnimator.h

@@ -27,6 +27,15 @@
 NS_SWIFT_NAME(MotionAnimator)
 @interface MDMMotionAnimator : NSObject
 
+/**
+ The scaling factor to apply to all time-related values.
+
+ For example, a timeScaleFactor of 2 will double the length of all animations.
+
+ 1.0 by default.
+ */
+@property(nonatomic, assign) CGFloat timeScaleFactor;
+
 /**
  If enabled, all animations will be added with their values reversed.
 
@@ -83,7 +92,7 @@ NS_SWIFT_NAME(MotionAnimator)
                   toLayer:(nonnull CALayer *)layer
                withValues:(nonnull NSArray *)values
                   keyPath:(nonnull MDMAnimatableKeyPath)keyPath
-               completion:(nullable void(^)())completion;
+               completion:(nullable void(^)(void))completion;
 
 /**
  Adds a block that will be invoked each time an animation is added to a layer.

src/MDMMotionAnimator.m

@@ -32,7 +32,7 @@ static CGFloat simulatorAnimationDragCoefficient(void) {
 
 static CAMediaTimingFunction* timingFunctionWithControlPoints(CGFloat controlPoints[4]);
 static NSArray* coerceUIKitValuesToCoreAnimationValues(NSArray *values);
-static CABasicAnimation *animationFromTiming(MDMMotionTiming timing);
+static CABasicAnimation *animationFromTiming(MDMMotionTiming timing, CGFloat timeScaleFactor);
 static void makeAnimationAdditive(CABasicAnimation *animation);
 
 @implementation MDMMotionAnimator {
@@ -42,6 +42,7 @@ @implementation MDMMotionAnimator {
 - (instancetype)init {
   self = [super init];
   if (self) {
+    _timeScaleFactor = 1;
     _additive = true;
   }
   return self;
@@ -58,7 +59,7 @@ - (void)animateWithTiming:(MDMMotionTiming)timing
                   toLayer:(CALayer *)layer
                withValues:(NSArray *)values
                   keyPath:(MDMAnimatableKeyPath)keyPath
-               completion:(void(^)())completion {
+               completion:(void(^)(void))completion {
   NSAssert([values count] == 2, @"The values array must contain exactly two values.");
 
   if (_shouldReverseValues) {
@@ -74,7 +75,8 @@ - (void)animateWithTiming:(MDMMotionTiming)timing
     return;
   }
 
-  CABasicAnimation *animation = animationFromTiming(timing);
+  CGFloat timeScaleFactor = simulatorAnimationDragCoefficient() * _timeScaleFactor;
+  CABasicAnimation *animation = animationFromTiming(timing, timeScaleFactor);
 
   if (animation) {
     animation.keyPath = keyPath;
@@ -100,7 +102,7 @@ - (void)animateWithTiming:(MDMMotionTiming)timing
 
       if (timing.delay != 0) {
         animation.beginTime = ([layer convertTime:CACurrentMediaTime() fromLayer:nil]
-                               + timing.delay * simulatorAnimationDragCoefficient());
+                               + timing.delay * timeScaleFactor);
         animation.fillMode = kCAFillModeBackwards;
       }
 
@@ -160,7 +162,7 @@ - (void)addCoreAnimationTracer:(void (^)(CALayer *, CAAnimation *))tracer {
   return values;
 }
 
-static CABasicAnimation *animationFromTiming(MDMMotionTiming timing) {
+static CABasicAnimation *animationFromTiming(MDMMotionTiming timing, CGFloat timeScaleFactor) {
   CABasicAnimation *animation;
   switch (timing.curve.type) {
     case MDMMotionCurveTypeInstant:
@@ -171,7 +173,7 @@ - (void)addCoreAnimationTracer:(void (^)(CALayer *, CAAnimation *))tracer {
     case MDMMotionCurveTypeBezier:
       animation = [CABasicAnimation animation];
       animation.timingFunction = timingFunctionWithControlPoints(timing.curve.data);
-      animation.duration = timing.duration * simulatorAnimationDragCoefficient();
+      animation.duration = timing.duration * timeScaleFactor;
       break;
 
     case MDMMotionCurveTypeSpring: {
@@ -182,7 +184,7 @@ - (void)addCoreAnimationTracer:(void (^)(CALayer *, CAAnimation *))tracer {
       if ([spring respondsToSelector:@selector(settlingDuration)]) {
         spring.duration = spring.settlingDuration;
       } else {
-        spring.duration = 1;
+        spring.duration = timing.duration;
       }
       animation = spring;
       break;

tests/unit/MotionAnimatorTests.m

@@ -146,7 +146,11 @@ - (void)testSpringAnimationFloatValue {
 
     XCTAssertEqual(springAnimation.keyPath, keyPath);
 
-    XCTAssertEqual(springAnimation.duration, springAnimation.settlingDuration);
+    if ([springAnimation respondsToSelector:@selector(settlingDuration)]) {
+      XCTAssertEqual(springAnimation.duration, springAnimation.settlingDuration);
+    } else {
+      XCTAssertEqual(springAnimation.duration, timing.duration);
+    }
     XCTAssertGreaterThan(springAnimation.beginTime, 0);
 
     XCTAssertTrue(springAnimation.additive);

tests/unit/MotionAnimatorTests.swift

@@ -30,6 +30,7 @@ class MotionAnimatorTests: XCTestCase {
     animator.animate(with: timing, to: layer, withValues: [0, 1], keyPath: .cornerRadius)
     animator.animate(with: timing, to: layer, withValues: [0, 1], keyPath: .height)
     animator.animate(with: timing, to: layer, withValues: [0, 1], keyPath: .opacity)
+    animator.animate(with: timing, to: layer, withValues: [0, 1], keyPath: .scale)
     animator.animate(with: timing, to: layer, withValues: [0, 1], keyPath: .width)
     animator.animate(with: timing, to: layer, withValues: [0, 1], keyPath: .x)
     animator.animate(with: timing, to: layer, withValues: [0, 1], keyPath: .y)