completed initial MotionAnimation and MotionTransition

9174d3d6 · Daniel Dahan · aad47c6d · 9174d3d6 · 9174d3d6 · 9174d3d6
Commit 9174d3d6 authored Jun 28, 2017 by Daniel Dahan
6 changed files
--- a/Sources/Extensions/Motion+CALayer.swift
+++ b/Sources/Extensions/Motion+CALayer.swift
@@ -133,32 +133,30 @@ public extension CALayer {
     - Parameter completion: An optional completion block.
     */
    func animate(_ animations: [MotionAnimation], completion: (() -> Void)? = nil) {
-        animate(delay: 0, duration: 0.35, timingFunction: .easeInOut, animations: animations, completion: completion)
+        animate(animations: animations, completion: completion)
    }
 }
 fileprivate extension CALayer {
    /**
     A function that executes an Array of MotionAnimation values.
-     - Parameter delay: The animation delay TimeInterval.
-     - Parameter duration: The animation duration TimeInterval.
-     - Parameter timingFunction: The animation CAMediaTimingFunctionType.
     - Parameter animations: An Array of MotionAnimations.
     - Parameter completion: An optional completion block.
     */
-    func animate(delay: TimeInterval, duration: TimeInterval, timingFunction: CAMediaTimingFunctionType, animations: [MotionAnimation], completion: (() -> Void)? = nil) {
+    func animate(animations: [MotionAnimation], completion: (() -> Void)? = nil) {
        let targetState = MotionAnimationState(animations: animations)
-        Motion.delay(targetState.delay) { [weak self] in
+        Motion.delay(targetState.delay) { [weak self,
+            targetState = targetState,
+            completion = completion] in
            guard let s = self else {
                return
            }
            var anims = [CABasicAnimation]()
+            var d = targetState.duration
-            let tf: CAMediaTimingFunction = targetState.timingFunction ?? CAMediaTimingFunction.from(mediaTimingFunctionType: timingFunction)
-            let d: TimeInterval = targetState.duration ?? duration
            if let v = targetState.backgroundColor {
                let a = MotionCAAnimation.background(color: UIColor(cgColor: v))
                a.fromValue = s.backgroundColor
@@ -258,23 +256,33 @@ fileprivate extension CALayer {
            }
            if #available(iOS 9.0, *), let (stiffness, damping) = targetState.spring {
-                for i in 0..<anims.count where "cornerRadius" != anims[i].keyPath {
+                for i in 0..<anims.count {
-                    anims[i] = MotionCAAnimation.convert(basic: anims[i], stiffness: stiffness, damping: damping)
+                    let v = anims[i]
+                    guard "cornerRadius" != v.keyPath else {
+                        continue
+                    }
+                    let a = MotionCAAnimation.convert(animation: v, stiffness: stiffness, damping: damping)
+                    anims[i] = a
+                    d = a.settlingDuration * 0.9
                }
            }
            let g = Motion.animate(group: anims, duration: d)
            g.fillMode = MotionAnimationFillModeToValue(mode: .forwards)
            g.isRemovedOnCompletion = false
-            g.timingFunction = tf
+            g.timingFunction = targetState.timingFunction
            s.animate(g)
-            guard let execute = completion else {
+            if let v = targetState.completion {
-                return
+                Motion.delay(d, execute: v)
            }
-            Motion.delay(d, execute: execute)
+            if let v = completion {
+                Motion.delay(d, execute: v)
+            }
        }
    }
 }
--- a/Sources/Extensions/Motion+CAMediaTimingFunction.swift
+++ b/Sources/Extensions/Motion+CAMediaTimingFunction.swift
@@ -39,15 +39,15 @@ public enum CAMediaTimingFunctionType {
    case sharp
    case easeOutBack
 }
 public extension CAMediaTimingFunction {
    //  default
    static let linear = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
    static let easeIn = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
    static let easeOut = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
    static let easeInOut = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-    //  material  
+    //  material
    static let standard = CAMediaTimingFunction(controlPoints: 0.4, 0.0, 0.2, 1.0)
    static let deceleration = CAMediaTimingFunction(controlPoints: 0.0, 0.0, 0.2, 1)
    static let acceleration = CAMediaTimingFunction(controlPoints: 0.4, 0.0, 1, 1)
@@ -55,37 +55,9 @@ public extension CAMediaTimingFunction {
    // easing.net
    static let easeOutBack = CAMediaTimingFunction(controlPoints: 0.175, 0.885, 0.32, 1.75)
+}
-    /**
-     Converts a string name matching a CAMediaTimingFunctionType to a 
+public extension CAMediaTimingFunction {
-     CAMediaTimingFunction value.
-     - Parameter mediaTimingFunctionType: A String.
-     */
-    static func from(mediaTimingFunctionType: String) -> CAMediaTimingFunction? {
-        switch mediaTimingFunctionType {
-        case "linear":
-            return .linear
-        case "easeIn":
-            return .easeIn
-        case "easeOut":
-            return .easeOut
-        case "easeInOut":
-            return  .easeInOut
-        case "standard":
-            return .standard
-        case "deceleration":
-            return  .deceleration
-        case "acceleration":
-            return .acceleration
-        case "sharp":
-            return .sharp
-        case "easeOutBack":
-            return .easeOutBack
-        default:
-            return nil
-        }
-    }
    /**
     Converts a CAMediaTimingFunctionType to a CAMediaTimingFunction value.
     - Parameter mediaTimingFunctionType: A CAMediaTimingFunctionType.

--- a/Sources/MotionAnimation.swift
+++ b/Sources/MotionAnimation.swift
@@ -36,19 +36,19 @@ public class MotionAnimation {
     An initializer that accepts a given callback.
     - Parameter applyFunction: A given callback.
     */
-    public init(applyFunction: @escaping (inout MotionAnimationState) -> Void) {
+    init(applyFunction: @escaping (inout MotionAnimationState) -> Void) {
        apply = applyFunction
    }
 }
-extension MotionAnimation {
+public extension MotionAnimation {
    /**
     Animates the view's current background color to the
     given color.
     - Parameter color: A UIColor.
     - Returns: A MotionAnimation.
     */
-    public static func background(color: UIColor) -> MotionAnimation {
+    static func background(color: UIColor) -> MotionAnimation {
        return MotionAnimation {
            $0.backgroundColor = color.cgColor
        }
@@ -60,7 +60,7 @@ extension MotionAnimation {
     - Parameter color: A UIColor.
     - Returns: A MotionAnimation.
     */
-    public static func border(color: UIColor) -> MotionAnimation {
+    static func border(color: UIColor) -> MotionAnimation {
        return MotionAnimation {
            $0.borderColor = color.cgColor
        }
@@ -72,7 +72,7 @@ extension MotionAnimation {
     - Parameter width: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func border(width: CGFloat) -> MotionAnimation {
+    static func border(width: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            $0.borderWidth = width
        }
@@ -84,7 +84,7 @@ extension MotionAnimation {
     - Parameter radius: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func corner(radius: CGFloat) -> MotionAnimation {
+    static func corner(radius: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            $0.cornerRadius = radius
        }
@@ -96,7 +96,7 @@ extension MotionAnimation {
     - Parameter _ transform: A CATransform3D.
     - Returns: A MotionAnimation.
     */
-    public static func transform(_ transform: CATransform3D) -> MotionAnimation {
+    static func transform(_ transform: CATransform3D) -> MotionAnimation {
        return MotionAnimation {
            $0.transform = transform
        }
@@ -108,7 +108,7 @@ extension MotionAnimation {
     - Parameter _ perspective: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func perspective(_ perspective: CGFloat) -> MotionAnimation {
+    static func perspective(_ perspective: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            var t = $0.transform ?? CATransform3DIdentity
            t.m34 = 1 / -perspective
@@ -124,7 +124,7 @@ extension MotionAnimation {
     - Parameter z: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func rotate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionAnimation {
+    static func rotate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionAnimation {
        return MotionAnimation {
            var t = $0.transform ?? CATransform3DIdentity
            t = CATransform3DRotate(t, CGFloat(Double.pi) * x / 180, 1, 0, 0)
@@ -139,7 +139,7 @@ extension MotionAnimation {
     - Parameter z: A CGFloat, default is 0.
     - Returns: A MotionAnimation.
     */
-    public static func rotate(_ point: CGPoint, z: CGFloat = 0) -> MotionAnimation {
+    static func rotate(_ point: CGPoint, z: CGFloat = 0) -> MotionAnimation {
        return .rotate(x: point.x, y: point.y, z: z)
    }
@@ -148,7 +148,7 @@ extension MotionAnimation {
     - Parameter _ z: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func rotate(_ z: CGFloat) -> MotionAnimation {
+    static func rotate(_ z: CGFloat) -> MotionAnimation {
        return .rotate(z: z)
    }
@@ -160,7 +160,7 @@ extension MotionAnimation {
     - Parameter z: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func spin(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionAnimation {
+    static func spin(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionAnimation {
        return MotionAnimation {
            $0.spin = (x, y, z)
        }
@@ -172,7 +172,7 @@ extension MotionAnimation {
     - Parameter z: A CGFloat, default is 0.
     - Returns: A MotionAnimation.
     */
-    public static func spin(_ point: CGPoint, z: CGFloat = 0) -> MotionAnimation {
+    static func spin(_ point: CGPoint, z: CGFloat = 0) -> MotionAnimation {
        return .spin(x: point.x, y: point.y, z: z)
    }
@@ -181,7 +181,7 @@ extension MotionAnimation {
     - Parameter _ z: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func spin(_ z: CGFloat) -> MotionAnimation {
+    static func spin(_ z: CGFloat) -> MotionAnimation {
        return .spin(z: z)
    }
@@ -192,7 +192,7 @@ extension MotionAnimation {
     - Parameter z: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func scale(x: CGFloat = 1, y: CGFloat = 1, z: CGFloat = 1) -> MotionAnimation {
+    static func scale(x: CGFloat = 1, y: CGFloat = 1, z: CGFloat = 1) -> MotionAnimation {
        return MotionAnimation {
            $0.transform = CATransform3DScale($0.transform ?? CATransform3DIdentity, x, y, z)
        }
@@ -203,7 +203,7 @@ extension MotionAnimation {
     - Parameter _ xy: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func scale(_ xy: CGFloat) -> MotionAnimation {
+    static func scale(_ xy: CGFloat) -> MotionAnimation {
        return .scale(x: xy, y: xy)
    }
@@ -215,7 +215,7 @@ extension MotionAnimation {
     - Parameter z: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func translate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionAnimation {
+    static func translate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionAnimation {
        return MotionAnimation {
            $0.transform = CATransform3DTranslate($0.transform ?? CATransform3DIdentity, x, y, z)
        }
@@ -228,7 +228,7 @@ extension MotionAnimation {
     - Parameter z: A CGFloat, default is 0.
     - Returns: A MotionAnimation.
     */
-    public static func translate(_ point: CGPoint, z: CGFloat = 0) -> MotionAnimation {
+    static func translate(_ point: CGPoint, z: CGFloat = 0) -> MotionAnimation {
        return .translate(x: point.x, y: point.y, z: z)
    }
@@ -237,24 +237,24 @@ extension MotionAnimation {
     - Parameter _ point: A CGPoint.
     - Returns: A MotionAnimation.
     */
-    public static func position(_ point: CGPoint) -> MotionAnimation {
+    static func position(_ point: CGPoint) -> MotionAnimation {
        return MotionAnimation {
            $0.position = point
        }
    }
    /// Fades the view in during an animation.
-    public static var fadeIn = MotionAnimation.fade(1)
+    static var fadeIn = MotionAnimation.fade(1)
    /// Fades the view out during an animation.
-    public static var fadeOut = MotionAnimation.fade(0)
+    static var fadeOut = MotionAnimation.fade(0)
    /**
     Animates the view's current opacity to the given one.
     - Parameter _ opacity: A Double.
     - Returns: A MotionAnimation.
     */
-    public static func fade(_ opacity: Double) -> MotionAnimation {
+    static func fade(_ opacity: Double) -> MotionAnimation {
        return MotionAnimation {
            $0.opacity = opacity
        }
@@ -265,7 +265,7 @@ extension MotionAnimation {
     - Parameter _ position: An Int.
     - Returns: A MotionAnimation.
     */
-    public static func zPosition(_ position: CGFloat) -> MotionAnimation {
+    static func zPosition(_ position: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            $0.zPosition = position
        }
@@ -276,7 +276,7 @@ extension MotionAnimation {
     - Parameter _ size: A CGSize.
     - Returns: A MotionAnimation.
     */
-    public static func size(_ size: CGSize) -> MotionAnimation {
+    static func size(_ size: CGSize) -> MotionAnimation {
        return MotionAnimation {
            $0.size = size
        }
@@ -287,7 +287,7 @@ extension MotionAnimation {
     - Parameter path: A CGPath.
     - Returns: A MotionAnimation.
     */
-    public static func shadow(path: CGPath) -> MotionAnimation {
+    static func shadow(path: CGPath) -> MotionAnimation {
        return MotionAnimation {
            $0.shadowPath = path
        }
@@ -298,7 +298,7 @@ extension MotionAnimation {
     - Parameter color: A UIColor.
     - Returns: A MotionAnimation.
     */
-    public static func shadow(color: UIColor) -> MotionAnimation {
+    static func shadow(color: UIColor) -> MotionAnimation {
        return MotionAnimation {
            $0.shadowColor = color.cgColor
        }
@@ -309,7 +309,7 @@ extension MotionAnimation {
     - Parameter offset: A CGSize.
     - Returns: A MotionAnimation.
     */
-    public static func shadow(offset: CGSize) -> MotionAnimation {
+    static func shadow(offset: CGSize) -> MotionAnimation {
        return MotionAnimation {
            $0.shadowOffset = offset
        }
@@ -320,7 +320,7 @@ extension MotionAnimation {
     - Parameter opacity: A Float.
     - Returns: A MotionAnimation.
     */
-    public static func shadow(opacity: Float) -> MotionAnimation {
+    static func shadow(opacity: Float) -> MotionAnimation {
        return MotionAnimation {
            $0.shadowOpacity = opacity
        }
@@ -331,7 +331,7 @@ extension MotionAnimation {
     - Parameter radius: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func shadow(radius: CGFloat) -> MotionAnimation {
+    static func shadow(radius: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            $0.shadowRadius = radius
        }
@@ -343,7 +343,7 @@ extension MotionAnimation {
     - Parameter opacity: A Float.
     - Parameter radius: A CGFloat.
     */
-    public static func depth(offset: CGSize, opacity: Float, radius: CGFloat) -> MotionAnimation {
+    static func depth(offset: CGSize, opacity: Float, radius: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            $0.shadowOffset = offset
            $0.shadowOpacity = opacity
@@ -355,7 +355,7 @@ extension MotionAnimation {
     Animates the views shadow offset, opacity, and radius.
     - Parameter _ depth: A tuple (CGSize, FLoat, CGFloat).
     */
-    public static func depth(_ depth: (CGSize, Float, CGFloat)) -> MotionAnimation {
+    static func depth(_ depth: (CGSize, Float, CGFloat)) -> MotionAnimation {
        return .depth(offset: depth.0, opacity: depth.1, radius: depth.2)
    }
@@ -364,7 +364,7 @@ extension MotionAnimation {
     - Parameter rect: A CGRect.
     - Returns: A MotionAnimation.
     */
-    public static func contents(rect: CGRect) -> MotionAnimation {
+    static func contents(rect: CGRect) -> MotionAnimation {
        return MotionAnimation {
            $0.contentsRect = rect
        }
@@ -375,7 +375,7 @@ extension MotionAnimation {
     - Parameter scale: A CGFloat.
     - Returns: A MotionAnimation.
     */
-    public static func contents(scale: CGFloat) -> MotionAnimation {
+    static func contents(scale: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            $0.contentsScale = scale
        }
@@ -386,24 +386,18 @@ extension MotionAnimation {
     - Parameter _ duration: A TimeInterval.
     - Returns: A MotionAnimation.
     */
-    public static func duration(_ duration: TimeInterval) -> MotionAnimation {
+    static func duration(_ duration: TimeInterval) -> MotionAnimation {
        return MotionAnimation {
            $0.duration = duration
        }
    }
    /**
-     Sets the view's animation duration to the longest
-     running animation.
-     */
-    public static var preferredDurationMatchesLongest = MotionAnimation.duration(.infinity)
-    /**
     Delays the animation of a given view.
     - Parameter _ time: TimeInterval.
     - Returns: A MotionAnimation.
     */
-    public static func delay(_ time: TimeInterval) -> MotionAnimation {
+    static func delay(_ time: TimeInterval) -> MotionAnimation {
        return MotionAnimation {
            $0.delay = time
        }
@@ -414,13 +408,22 @@ extension MotionAnimation {
     - Parameter _ timingFunction: A CAMediaTimingFunction.
     - Returns: A MotionAnimation.
     */
-    public static func timingFunction(_ timingFunction: CAMediaTimingFunction) -> MotionAnimation {
+    static func timingFunction(_ timingFunction: CAMediaTimingFunction) -> MotionAnimation {
        return MotionAnimation {
            $0.timingFunction = timingFunction
        }
    }
    /**
+     Sets the view's timing function for the animation.
+     - Parameter type: A CAMediaTimingFunctionType.
+     - Returns: A MotionAnimation.
+     */
+    static func timingFunction(type: CAMediaTimingFunctionType) -> MotionAnimation {
+        return .timingFunction(CAMediaTimingFunction.from(mediaTimingFunctionType: type))
+    }
+    /**
     Available in iOS 9+, animates a view using the spring API,
     given a stiffness and damping.
     - Parameter stiffness: A CGFlloat.
@@ -428,22 +431,20 @@ extension MotionAnimation {
     - Returns: A MotionAnimation.
     */
    @available(iOS 9, *)
-    public static func spring(stiffness: CGFloat, damping: CGFloat) -> MotionAnimation {
+    static func spring(stiffness: CGFloat, damping: CGFloat) -> MotionAnimation {
        return MotionAnimation {
            $0.spring = (stiffness, damping)
        }
    }
    /**
-     Animates the natural curve of a view. A value of 1 represents
+     Creates a completion block handler that executed once tha animation
-     a curve in a downward direction, and a value of -1
+     is done.
-     represents a curve in an upward direction.
+     - Parameter _ execute: A callback to execute once completed.
-     - Parameter intensity: A CGFloat.
-     - Returns: A MotionAnimation.
     */
-    public static func arc(intensity: CGFloat = 1) -> MotionAnimation {
+    static func completion(_ execute: @escaping () -> Void) -> MotionAnimation {
        return MotionAnimation {
-            $0.arc = intensity
+            $0.completion = execute
        }
    }
 }
--- a/Sources/MotionAnimationState.swift
+++ b/Sources/MotionAnimationState.swift
@@ -87,17 +87,17 @@ public struct MotionAnimationState {
    public var delay: TimeInterval = 0
    /// The duration of the animation.
-    public var duration: TimeInterval?
+    public var duration: TimeInterval = 0.35
    /// The timing function value of the animation.
-    public var timingFunction: CAMediaTimingFunction?
+    public var timingFunction = CAMediaTimingFunction.from(mediaTimingFunctionType: .easeInOut)
-    /// The arc curve value.
-    public var arc: CGFloat?
    /// Custom target states.
    public var custom: [String: Any]?
+    /// Completion block.
+    public var completion: (() -> Void)?
    /**
     An initializer that accepts an Array of MotionAnimations.
     - Parameter animations: An Array of MotionAnimations.

--- a/Sources/MotionCAAnimation.swift
+++ b/Sources/MotionCAAnimation.swift
@@ -90,17 +90,16 @@ fileprivate extension MotionCAAnimation {
 internal extension MotionCAAnimation {
    /**
     Converts a CABasicAnimation to a CASpringAnimation.
-     - Parameter basic: A CABasicAnimation.
+     - Parameter animation: A CABasicAnimation.
     - Parameter stiffness: A CGFloat.
     - Parameter damping: A CGFloat.
     */
-    static func convert(basic: CABasicAnimation, stiffness: CGFloat, damping: CGFloat) -> CASpringAnimation {
+    static func convert(animation: CABasicAnimation, stiffness: CGFloat, damping: CGFloat) -> CASpringAnimation {
-        let a = CASpringAnimation(keyPath: basic.keyPath)
+        let a = CASpringAnimation(keyPath: animation.keyPath)
-        a.fromValue = basic.fromValue
+        a.fromValue = animation.fromValue
-        a.toValue = basic.toValue
+        a.toValue = animation.toValue
        a.stiffness = stiffness
        a.damping = damping
-        a.duration = a.settlingDuration * 0.9
        return a
    }
 }

--- a/Sources/MotionTransition.swift
+++ b/Sources/MotionTransition.swift
@@ -36,18 +36,18 @@ public class MotionTransition {
     An initializer that accepts a given callback.
     - Parameter applyFunction: A given callback.
     */
-    public init(applyFunction: @escaping (inout MotionTransitionState) -> Void) {
+    init(applyFunction: @escaping (inout MotionTransitionState) -> Void) {
        apply = applyFunction
    }
 }
-extension MotionTransition {
+public extension MotionTransition {
    /**
     Animates the view with a matching motion identifier.
     - Parameter _ identifier: A String.
     - Returns: A MotionTransition.
     */
-    public static func motionIdentifier(_ identifier: String) -> MotionTransition {
+    static func motionIdentifier(_ identifier: String) -> MotionTransition {
        return MotionTransition {
            $0.motionIdentifier = identifier
        }
@@ -60,7 +60,7 @@ extension MotionTransition {
     masksToBounds state.
     - Returns: A MotionTransition.
     */
-    public static func masksToBounds(_ masksToBounds: Bool) -> MotionTransition {
+    static func masksToBounds(_ masksToBounds: Bool) -> MotionTransition {
        return MotionTransition {
            $0.masksToBounds = masksToBounds
        }
@@ -72,7 +72,7 @@ extension MotionTransition {
     - Parameter color: A UIColor.
     - Returns: A MotionTransition.
     */
-    public static func background(color: UIColor) -> MotionTransition {
+    static func background(color: UIColor) -> MotionTransition {
        return MotionTransition {
            $0.backgroundColor = color.cgColor
        }
@@ -84,7 +84,7 @@ extension MotionTransition {
     - Parameter color: A UIColor.
     - Returns: A MotionTransition.
     */
-    public static func border(color: UIColor) -> MotionTransition {
+    static func border(color: UIColor) -> MotionTransition {
        return MotionTransition {
            $0.borderColor = color.cgColor
        }
@@ -96,7 +96,7 @@ extension MotionTransition {
     - Parameter width: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func border(width: CGFloat) -> MotionTransition {
+    static func border(width: CGFloat) -> MotionTransition {
        return MotionTransition {
            $0.borderWidth = width
        }
@@ -108,7 +108,7 @@ extension MotionTransition {
     - Parameter radius: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func corner(radius: CGFloat) -> MotionTransition {
+    static func corner(radius: CGFloat) -> MotionTransition {
        return MotionTransition {
            $0.cornerRadius = radius
        }
@@ -120,7 +120,7 @@ extension MotionTransition {
     - Parameter _ transform: A CATransform3D.
     - Returns: A MotionTransition.
     */
-    public static func transform(_ transform: CATransform3D) -> MotionTransition {
+    static func transform(_ transform: CATransform3D) -> MotionTransition {
        return MotionTransition {
            $0.transform = transform
        }
@@ -132,7 +132,7 @@ extension MotionTransition {
     - Parameter _ perspective: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func perspective(_ perspective: CGFloat) -> MotionTransition {
+    static func perspective(_ perspective: CGFloat) -> MotionTransition {
        return MotionTransition {
            var t = $0.transform ?? CATransform3DIdentity
            t.m34 = 1 / -perspective
@@ -148,7 +148,7 @@ extension MotionTransition {
     - Parameter z: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func rotate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionTransition {
+    static func rotate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionTransition {
        return MotionTransition {
            var t = $0.transform ?? CATransform3DIdentity
            t = CATransform3DRotate(t, x, 1, 0, 0)
@@ -163,7 +163,7 @@ extension MotionTransition {
     - Parameter z: A CGFloat, default is 0.
     - Returns: A MotionTransition.
     */
-    public static func rotate(_ point: CGPoint, z: CGFloat = 0) -> MotionTransition {
+    static func rotate(_ point: CGPoint, z: CGFloat = 0) -> MotionTransition {
        return .rotate(x: point.x, y: point.y, z: z)
    }
@@ -172,7 +172,7 @@ extension MotionTransition {
     - Parameter _ z: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func rotate(_ z: CGFloat) -> MotionTransition {
+    static func rotate(_ z: CGFloat) -> MotionTransition {
        return .rotate(z: z)
    }
@@ -183,7 +183,7 @@ extension MotionTransition {
     - Parameter z: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func scale(x: CGFloat = 1, y: CGFloat = 1, z: CGFloat = 1) -> MotionTransition {
+    static func scale(x: CGFloat = 1, y: CGFloat = 1, z: CGFloat = 1) -> MotionTransition {
        return MotionTransition {
            $0.transform = CATransform3DScale($0.transform ?? CATransform3DIdentity, x, y, z)
        }
@@ -194,7 +194,7 @@ extension MotionTransition {
     - Parameter _ xy: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func scale(_ xy: CGFloat) -> MotionTransition {
+    static func scale(_ xy: CGFloat) -> MotionTransition {
        return .scale(x: xy, y: xy)
    }
@@ -206,7 +206,7 @@ extension MotionTransition {
     - Parameter z: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func translate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionTransition {
+    static func translate(x: CGFloat = 0, y: CGFloat = 0, z: CGFloat = 0) -> MotionTransition {
        return MotionTransition {
            $0.transform = CATransform3DTranslate($0.transform ?? CATransform3DIdentity, x, y, z)
        }
@@ -219,7 +219,7 @@ extension MotionTransition {
     - Parameter z: A CGFloat, default is 0.
     - Returns: A MotionTransition.
     */
-    public static func translate(_ point: CGPoint, z: CGFloat = 0) -> MotionTransition {
+    static func translate(_ point: CGPoint, z: CGFloat = 0) -> MotionTransition {
        return .translate(x: point.x, y: point.y, z: z)
    }
@@ -228,29 +228,29 @@ extension MotionTransition {
     - Parameter _ point: A CGPoint.
     - Returns: A MotionTransition.
     */
-    public static func position(_ point: CGPoint) -> MotionTransition {
+    static func position(_ point: CGPoint) -> MotionTransition {
        return MotionTransition {
            $0.position = point
        }
    }
    /// Forces the view to not fade during a transition.
-    public static var forceNonFade = MotionTransition {
+    static var forceNonFade = MotionTransition {
        $0.nonFade = true
    }
    /// Fades the view in during a transition.
-    public static var fadeIn = MotionTransition.fade(1)
+    static var fadeIn = MotionTransition.fade(1)
    /// Fades the view out during a transition.
-    public static var fadeOut = MotionTransition.fade(0)
+    static var fadeOut = MotionTransition.fade(0)
    /**
     Animates the view's current opacity to the given one.
     - Parameter to opacity: A Double.
     - Returns: A MotionTransition.
     */
-    public static func fade(_ opacity: Double) -> MotionTransition {
+    static func fade(_ opacity: Double) -> MotionTransition {
        return MotionTransition {
            $0.opacity = opacity
        }
@@ -261,7 +261,7 @@ extension MotionTransition {
     - Parameter _ position: An Int.
     - Returns: A MotionTransition.
     */
-    public static func zPosition(_ position: CGFloat) -> MotionTransition {
+    static func zPosition(_ position: CGFloat) -> MotionTransition {
        return MotionTransition {
            $0.zPosition = position
        }
@@ -272,7 +272,7 @@ extension MotionTransition {
     - Parameter _ size: A CGSize.
     - Returns: A MotionTransition.
     */
-    public static func size(_ size: CGSize) -> MotionTransition {
+    static func size(_ size: CGSize) -> MotionTransition {
        return MotionTransition {
            $0.size = size
        }
@@ -283,7 +283,7 @@ extension MotionTransition {
     - Parameter path: A CGPath.
     - Returns: A MotionTransition.
     */
-    public static func shadow(path: CGPath) -> MotionTransition {
+    static func shadow(path: CGPath) -> MotionTransition {
        return MotionTransition {
            $0.shadowPath = path
        }
@@ -294,7 +294,7 @@ extension MotionTransition {
     - Parameter color: A UIColor.
     - Returns: A MotionTransition.
     */
-    public static func shadow(color: UIColor) -> MotionTransition {
+    static func shadow(color: UIColor) -> MotionTransition {
        return MotionTransition {
            $0.shadowColor = color.cgColor
        }
@@ -305,7 +305,7 @@ extension MotionTransition {
     - Parameter offset: A CGSize.
     - Returns: A MotionTransition.
     */
-    public static func shadow(offset: CGSize) -> MotionTransition {
+    static func shadow(offset: CGSize) -> MotionTransition {
        return MotionTransition {
            $0.shadowOffset = offset
        }
@@ -316,7 +316,7 @@ extension MotionTransition {
     - Parameter opacity: A Float.
     - Returns: A MotionTransition.
     */
-    public static func shadow(opacity: Float) -> MotionTransition {
+    static func shadow(opacity: Float) -> MotionTransition {
        return MotionTransition {
            $0.shadowOpacity = opacity
        }
@@ -327,7 +327,7 @@ extension MotionTransition {
     - Parameter radius: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func shadow(radius: CGFloat) -> MotionTransition {
+    static func shadow(radius: CGFloat) -> MotionTransition {
        return MotionTransition {
            $0.shadowRadius = radius
        }
@@ -338,7 +338,7 @@ extension MotionTransition {
     - Parameter rect: A CGRect.
     - Returns: A MotionTransition.
     */
-    public static func contents(rect: CGRect) -> MotionTransition {
+    static func contents(rect: CGRect) -> MotionTransition {
        return MotionTransition {
            $0.contentsRect = rect
        }
@@ -349,7 +349,7 @@ extension MotionTransition {
     - Parameter scale: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func contents(scale: CGFloat) -> MotionTransition {
+    static func contents(scale: CGFloat) -> MotionTransition {
        return MotionTransition {
            $0.contentsScale = scale
        }
@@ -360,7 +360,7 @@ extension MotionTransition {
     - Parameter _ duration: A TimeInterval.
     - Returns: A MotionTransition.
     */
-    public static func duration(_ duration: TimeInterval) -> MotionTransition {
+    static func duration(_ duration: TimeInterval) -> MotionTransition {
        return MotionTransition {
            $0.duration = duration
        }
@@ -370,31 +370,40 @@ extension MotionTransition {
     Sets the view's animation duration to the longest
     running animation within a transition.
     */
-    public static var preferredDurationMatchesLongest = MotionTransition.duration(.infinity)
+    static var preferredDurationMatchesLongest = MotionTransition.duration(.infinity)
    /**
     Delays the animation of a given view.
     - Parameter _ time: TimeInterval.
     - Returns: A MotionTransition.
     */
-    public static func delay(_ time: TimeInterval) -> MotionTransition {
+    static func delay(_ time: TimeInterval) -> MotionTransition {
        return MotionTransition {
            $0.delay = time
        }
    }
    /**
-     Sets the view's timing function for the animation.
+     Sets the view's timing function for the transition.
     - Parameter _ timingFunction: A CAMediaTimingFunction.
     - Returns: A MotionTransition.
     */
-    public static func timingFunction(_ timingFunction: CAMediaTimingFunction) -> MotionTransition {
+    static func timingFunction(_ timingFunction: CAMediaTimingFunction) -> MotionTransition {
        return MotionTransition {
            $0.timingFunction = timingFunction
        }
    }
    /**
+     Sets the view's timing function for the transition.
+     - Parameter type: A CAMediaTimingFunctionType.
+     - Returns: A MotionAnimation.
+     */
+    static func timingFunction(type: CAMediaTimingFunctionType) -> MotionTransition {
+        return .timingFunction(CAMediaTimingFunction.from(mediaTimingFunctionType: type))
+    }
+    /**
     Available in iOS 9+, animates a view using the spring API,
     given a stiffness and damping.
     - Parameter stiffness: A CGFlloat.
@@ -402,7 +411,7 @@ extension MotionTransition {
     - Returns: A MotionTransition.
     */
    @available(iOS 9, *)
-    public static func spring(stiffness: CGFloat, damping: CGFloat) -> MotionTransition {
+    static func spring(stiffness: CGFloat, damping: CGFloat) -> MotionTransition {
        return MotionTransition {
            $0.spring = (stiffness, damping)
        }
@@ -415,7 +424,7 @@ extension MotionTransition {
     - Parameter intensity: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func arc(intensity: CGFloat = 1) -> MotionTransition {
+    static func arc(intensity: CGFloat = 1) -> MotionTransition {
        return MotionTransition {
            $0.arc = intensity
        }
@@ -429,7 +438,7 @@ extension MotionTransition {
     or not to delay the subview animation until all have started.
     - Returns: A MotionTransition.
     */
-    public static func cascade(delta: TimeInterval = 0.02, direction: CascadeDirection = .topToBottom, animationDelayUntilMatchedViews: Bool = false) -> MotionTransition {
+    static func cascade(delta: TimeInterval = 0.02, direction: CascadeDirection = .topToBottom, animationDelayUntilMatchedViews: Bool = false) -> MotionTransition {
        return MotionTransition {
            $0.cascade = (delta, direction, animationDelayUntilMatchedViews)
        }
@@ -441,21 +450,21 @@ extension MotionTransition {
     - Parameter opacity: A CGFloat.
     - Returns: A MotionTransition.
     */
-    public static func overlay(color: UIColor, opacity: CGFloat) -> MotionTransition {
+    static func overlay(color: UIColor, opacity: CGFloat) -> MotionTransition {
        return MotionTransition {
            $0.overlay = (color.cgColor, opacity)
        }
    }
 }
-extension MotionTransition {
+public extension MotionTransition {
    /**
     Apply transitions directly to the view at the start of the transition.
     The transitions supplied here won't be animated.
     For source views, transitions are set directly at the begining of the animation.
     For destination views, they replace the target state (final appearance).
     */
-    public static func beginWith(transitions: [MotionTransition]) -> MotionTransition {
+    static func beginWith(transitions: [MotionTransition]) -> MotionTransition {
        return MotionTransition {
            if $0.beginState == nil {
                $0.beginState = MotionTransitionStateWrapper(state: [])
@@ -471,7 +480,7 @@ extension MotionTransition {
     For source views, transitions are set directly at the begining of the animation.
     For destination views, they replace the target state (final appearance).
     */
-    public static func beginWithIfMatched(transitions: [MotionTransition]) -> MotionTransition {
+    static func beginWithIfMatched(transitions: [MotionTransition]) -> MotionTransition {
        return MotionTransition {
            if $0.beginStateIfMatched == nil {
                $0.beginStateIfMatched = []
@@ -491,24 +500,24 @@ extension MotionTransition {
     When a view is matched, this is automatically enabled.
     The `source` transition will also enable this.
     */
-    public static var useGlobalCoordinateSpace = MotionTransition {
+    static var useGlobalCoordinateSpace = MotionTransition {
        $0.coordinateSpace = .global
    }
    /// Use same parent coordinate space.
-    public static var useSameParentCoordinateSpace = MotionTransition {
+    static var useSameParentCoordinateSpace = MotionTransition {
        $0.coordinateSpace = .sameParent
    }
    /// Ignore all motion transition attributes for a view's direct subviews.
-    public static var ignoreSubviewTransitions: MotionTransition = .ignoreSubviewTransitions()
+    static var ignoreSubviewTransitions: MotionTransition = .ignoreSubviewTransitions()
    /**
     Ignore all motion transition attributes for a view's subviews.
     - Parameter recursive: If false, will only ignore direct subviews' transitions. 
     default false.
     */
-    public static func ignoreSubviewTransitions(recursive: Bool = false) -> MotionTransition {
+    static func ignoreSubviewTransitions(recursive: Bool = false) -> MotionTransition {
        return MotionTransition {
            $0.ignoreSubviewTransitions = recursive
        }
@@ -522,12 +531,12 @@ extension MotionTransition {
     This transition actually does nothing by itself since .useOptimizedSnapshot is the default.
     */
-    public static var useOptimizedSnapshot = MotionTransition {
+    static var useOptimizedSnapshot = MotionTransition {
        $0.snapshotType = .optimized
    }
    /// Create a snapshot using snapshotView(afterScreenUpdates:).
-    public static var useNormalSnapshot = MotionTransition {
+    static var useNormalSnapshot = MotionTransition {
        $0.snapshotType = .normal
    }
@@ -536,7 +545,7 @@ extension MotionTransition {
     This is slower than .useNormalSnapshot but gives more accurate snapshots for some views 
     (eg. UIStackView).
     */
-    public static var useLayerRenderSnapshot = MotionTransition {
+    static var useLayerRenderSnapshot = MotionTransition {
        $0.snapshotType = .layerRender
    }
@@ -545,7 +554,7 @@ extension MotionTransition {
     This will mess up the view hierarchy, therefore, view controllers have to rebuild
     their view structure after the transition finishes.
     */
-    public static var useNoSnapshot = MotionTransition {
+    static var useNoSnapshot = MotionTransition {
        $0.snapshotType = .noSnapshot
    }
@@ -553,7 +562,7 @@ extension MotionTransition {
     Force the view to animate (Motion will create animation contexts & snapshots for them, so 
     that they can be interactive).
     */
-    public static var forceAnimate = MotionTransition {
+    static var forceAnimate = MotionTransition {
        $0.forceAnimate = true
    }
@@ -562,7 +571,7 @@ extension MotionTransition {
     a .scale transition. This is to help Motion animate layers that doesn't support bounds animations.
     This also gives better performance.
     */
-    public static var useScaleBasedSizeChange = MotionTransition {
+    static var useScaleBasedSizeChange = MotionTransition {
        $0.useScaleBasedSizeChange = true
    }
 }