Skip to content

M
Motion
Commit 4a1008d8 by Daniel Dahan
Options

removed enum CAMediaTimingFunctionType

parent b969bc18
Showing with 78 additions and 67 deletions
Motion.xcodeproj/project.pbxproj
......@@ -43,6 +43,41 @@
96AEB6B01EE4610F009A3BE0 /* SourcePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB68C1EE4610F009A3BE0 /* SourcePreprocessor.swift */; };
96E49A401EEA08F8006D5A93 /* MotionTransitionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E49A3F1EEA08F8006D5A93 /* MotionTransitionObserver.swift */; };
96F8905B1F045099004BEB1A /* MotionCAAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F8905A1F045099004BEB1A /* MotionCAAnimation.swift */; };
96FE06CC1F15360B00E34953 /* Motion.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6771EE4610F009A3BE0 /* Motion.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06CD1F15360B00E34953 /* MotionController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6781EE4610F009A3BE0 /* MotionController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06CE1F15360B00E34953 /* MotionAnimationState.swift in Headers */ = {isa = PBXBuildFile; fileRef = 966C17701F037CD900D3E83C /* MotionAnimationState.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06CF1F15360B00E34953 /* MotionAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963150D41EE51C7A002B0D42 /* MotionAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D01F15360B00E34953 /* MotionContext.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6791EE4610F009A3BE0 /* MotionContext.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D11F15360B00E34953 /* MotionIndependentController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB67A1EE4610F009A3BE0 /* MotionIndependentController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D21F15360B00E34953 /* MotionSnapshotType.swift in Headers */ = {isa = PBXBuildFile; fileRef = 966A7F081EEC422000A2DAAC /* MotionSnapshotType.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D31F15360B00E34953 /* MotionCoordinateSpace.swift in Headers */ = {isa = PBXBuildFile; fileRef = 966A7F0A1EEC424000A2DAAC /* MotionCoordinateSpace.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D41F15360B00E34953 /* MotionTransitionState.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB67F1EE4610F009A3BE0 /* MotionTransitionState.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D51F15360B00E34953 /* MotionTransition.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB67B1EE4610F009A3BE0 /* MotionTransition.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D61F15360B00E34953 /* MotionTransitionObserver.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E49A3F1EEA08F8006D5A93 /* MotionTransitionObserver.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D71F15360B00E34953 /* MotionPlugin.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB67D1EE4610F009A3BE0 /* MotionPlugin.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D81F15360B00E34953 /* MotionCAAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96F8905A1F045099004BEB1A /* MotionCAAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06D91F15360B00E34953 /* MotionAnimator.swift in Headers */ = {isa = PBXBuildFile; fileRef = 968989DD1EE6633E003B8F3D /* MotionAnimator.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06DA1F15360B00E34953 /* MotionAnimatorViewContext.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6651EE4610F009A3BE0 /* MotionAnimatorViewContext.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06DB1F15360B00E34953 /* MotionCoreAnimationViewContext.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6661EE4610F009A3BE0 /* MotionCoreAnimationViewContext.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06DC1F15360B00E34953 /* MotionDefaultAnimator.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6671EE4610F009A3BE0 /* MotionDefaultAnimator.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06DD1F15360B00E34953 /* MotionViewPropertyViewContext.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6681EE4610F009A3BE0 /* MotionViewPropertyViewContext.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06DE1F15360B00E34953 /* MotionHasInsertOrder.swift in Headers */ = {isa = PBXBuildFile; fileRef = 968989B81EE5B34B003B8F3D /* MotionHasInsertOrder.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06DF1F15360B00E34953 /* MotionAnimationFillMode.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963150D91EE51EB4002B0D42 /* MotionAnimationFillMode.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E01F15360B00E34953 /* Motion+Array.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB66E1EE4610F009A3BE0 /* Motion+Array.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E11F15360B00E34953 /* Motion+CALayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB66F1EE4610F009A3BE0 /* Motion+CALayer.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E21F15360B00E34953 /* Motion+CAMediaTimingFunction.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6701EE4610F009A3BE0 /* Motion+CAMediaTimingFunction.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E31F15360B00E34953 /* Motion+CG.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6711EE4610F009A3BE0 /* Motion+CG.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E41F15360B00E34953 /* Motion+Obj-C.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963150D11EE50DA6002B0D42 /* Motion+Obj-C.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E51F15360B00E34953 /* Motion+UIKit.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6731EE4610F009A3BE0 /* Motion+UIKit.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E61F15360B00E34953 /* Motion+UIView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6741EE4610F009A3BE0 /* Motion+UIView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E71F15360B00E34953 /* Motion+UIViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6751EE4610F009A3BE0 /* Motion+UIViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E81F15360B00E34953 /* MotionPreprocessor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 968989DB1EE65F2B003B8F3D /* MotionPreprocessor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06E91F15360B00E34953 /* TransitionPreprocessor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB66C1EE4610F009A3BE0 /* TransitionPreprocessor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06EA1F15360B00E34953 /* CascadePreprocessor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6881EE4610F009A3BE0 /* CascadePreprocessor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06EB1F15360B00E34953 /* DurationPreprocessor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB6891EE4610F009A3BE0 /* DurationPreprocessor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06EC1F15360B00E34953 /* IgnoreSubviewModifiersPreprocessor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB68A1EE4610F009A3BE0 /* IgnoreSubviewModifiersPreprocessor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06ED1F15360B00E34953 /* MatchPreprocessor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB68B1EE4610F009A3BE0 /* MatchPreprocessor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96FE06EE1F15360B00E34953 /* SourcePreprocessor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96AEB68C1EE4610F009A3BE0 /* SourcePreprocessor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -191,6 +226,41 @@
buildActionMask = 2147483647;
files = (
961409B81E43D21300E7BA99 /* Motion.h in Headers */,
96FE06CC1F15360B00E34953 /* Motion.swift in Headers */,
96FE06CD1F15360B00E34953 /* MotionController.swift in Headers */,
96FE06CE1F15360B00E34953 /* MotionAnimationState.swift in Headers */,
96FE06CF1F15360B00E34953 /* MotionAnimation.swift in Headers */,
96FE06D01F15360B00E34953 /* MotionContext.swift in Headers */,
96FE06D11F15360B00E34953 /* MotionIndependentController.swift in Headers */,
96FE06D21F15360B00E34953 /* MotionSnapshotType.swift in Headers */,
96FE06D31F15360B00E34953 /* MotionCoordinateSpace.swift in Headers */,
96FE06D41F15360B00E34953 /* MotionTransitionState.swift in Headers */,
96FE06D51F15360B00E34953 /* MotionTransition.swift in Headers */,
96FE06D61F15360B00E34953 /* MotionTransitionObserver.swift in Headers */,
96FE06D71F15360B00E34953 /* MotionPlugin.swift in Headers */,
96FE06D81F15360B00E34953 /* MotionCAAnimation.swift in Headers */,
96FE06D91F15360B00E34953 /* MotionAnimator.swift in Headers */,
96FE06DA1F15360B00E34953 /* MotionAnimatorViewContext.swift in Headers */,
96FE06DB1F15360B00E34953 /* MotionCoreAnimationViewContext.swift in Headers */,
96FE06DC1F15360B00E34953 /* MotionDefaultAnimator.swift in Headers */,
96FE06DD1F15360B00E34953 /* MotionViewPropertyViewContext.swift in Headers */,
96FE06DE1F15360B00E34953 /* MotionHasInsertOrder.swift in Headers */,
96FE06DF1F15360B00E34953 /* MotionAnimationFillMode.swift in Headers */,
96FE06E01F15360B00E34953 /* Motion+Array.swift in Headers */,
96FE06E11F15360B00E34953 /* Motion+CALayer.swift in Headers */,
96FE06E21F15360B00E34953 /* Motion+CAMediaTimingFunction.swift in Headers */,
96FE06E31F15360B00E34953 /* Motion+CG.swift in Headers */,
96FE06E41F15360B00E34953 /* Motion+Obj-C.swift in Headers */,
96FE06E51F15360B00E34953 /* Motion+UIKit.swift in Headers */,
96FE06E61F15360B00E34953 /* Motion+UIView.swift in Headers */,
96FE06E71F15360B00E34953 /* Motion+UIViewController.swift in Headers */,
96FE06E81F15360B00E34953 /* MotionPreprocessor.swift in Headers */,
96FE06E91F15360B00E34953 /* TransitionPreprocessor.swift in Headers */,
96FE06EA1F15360B00E34953 /* CascadePreprocessor.swift in Headers */,
96FE06EB1F15360B00E34953 /* DurationPreprocessor.swift in Headers */,
96FE06EC1F15360B00E34953 /* IgnoreSubviewModifiersPreprocessor.swift in Headers */,
96FE06ED1F15360B00E34953 /* MatchPreprocessor.swift in Headers */,
96FE06EE1F15360B00E34953 /* SourcePreprocessor.swift in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Sources/Animator/MotionCoreAnimationViewContext.swift
......@@ -33,7 +33,7 @@ internal class MotionCoreAnimationViewContext: MotionAnimatorViewContext {
fileprivate var transitionStates = [String: (Any?, Any?)]()
/// A reference to the animation timing function.
fileprivate var timingFunction = CAMediaTimingFunction.from(mediaTimingFunctionType: .standard)
fileprivate var timingFunction = CAMediaTimingFunction.standard
/// Layer which holds the content.
fileprivate var contentLayer: CALayer? {
......
Sources/Extensions/Motion+CAMediaTimingFunction.swift
......@@ -28,18 +28,6 @@
import UIKit
public enum CAMediaTimingFunctionType {
case linear
case easeIn
case easeOut
case easeInOut
case standard
case deceleration
case acceleration
case sharp
case easeOutBack
}
public extension CAMediaTimingFunction {
// default
static let linear = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
......@@ -56,32 +44,3 @@ public extension CAMediaTimingFunction {
// easing.net
static let easeOutBack = CAMediaTimingFunction(controlPoints: 0.175, 0.885, 0.32, 1.75)
}
public extension CAMediaTimingFunction {
/**
Converts a CAMediaTimingFunctionType to a CAMediaTimingFunction value.
- Parameter mediaTimingFunctionType: A CAMediaTimingFunctionType.
*/
static func from(mediaTimingFunctionType: CAMediaTimingFunctionType) -> 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
}
}
}
Sources/Motion.swift
......@@ -820,15 +820,15 @@ extension Motion {
Runs an animation with a specified duration.
- Parameter duration: An animation duration time.
- Parameter animations: An animation block.
- Parameter mediaTimingFunctionType: An CAMediaTimingFunctionType value.
- Parameter timingFunction: A CAMediaTimingFunction.
- Parameter completion: A completion block that is executed once
the animations have completed.
*/
public class func animate(duration: CFTimeInterval, mediaTimingFunctionType: CAMediaTimingFunctionType = .easeInOut, animations: (() -> Void), completion: (() -> Void)? = nil) {
public class func animate(duration: CFTimeInterval, timingFunction: CAMediaTimingFunction = .easeInOut, animations: (() -> Void), completion: (() -> Void)? = nil) {
CATransaction.begin()
CATransaction.setAnimationDuration(duration)
CATransaction.setCompletionBlock(completion)
CATransaction.setAnimationTimingFunction(CAMediaTimingFunction.from(mediaTimingFunctionType: mediaTimingFunctionType))
CATransaction.setAnimationTimingFunction(timingFunction)
animations()
CATransaction.commit()
}
......@@ -836,17 +836,17 @@ extension Motion {
/**
Creates a CAAnimationGroup.
- Parameter animations: An Array of CAAnimation objects.
- Parameter mediaTimingFunctionType: An CAMediaTimingFunctionType value.
- Parameter timingFunction: A CAMediaTimingFunction.
- Parameter duration: An animation duration time for the group.
- Returns: A CAAnimationGroup.
*/
public class func animate(group animations: [CAAnimation], mediaTimingFunctionType: CAMediaTimingFunctionType = .easeInOut, duration: CFTimeInterval = 0.5) -> CAAnimationGroup {
public class func animate(group animations: [CAAnimation], timingFunction: CAMediaTimingFunction = .easeInOut, duration: CFTimeInterval = 0.5) -> CAAnimationGroup {
let group = CAAnimationGroup()
group.fillMode = MotionAnimationFillModeToValue(mode: .both)
group.isRemovedOnCompletion = false
group.animations = animations
group.duration = duration
group.timingFunction = CAMediaTimingFunction.from(mediaTimingFunctionType: mediaTimingFunctionType)
group.timingFunction = timingFunction
return group
}
}
Sources/MotionAnimation.swift
......@@ -380,15 +380,6 @@ public extension MotionAnimation {
}
/**
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.
......
Sources/MotionAnimationState.swift
......@@ -84,7 +84,7 @@ public struct MotionAnimationState {
public var duration: TimeInterval = 0.35
/// The timing function value of the animation.
public var timingFunction = CAMediaTimingFunction.from(mediaTimingFunctionType: .easeInOut)
public var timingFunction = CAMediaTimingFunction.easeInOut
/// Custom target states.
public var custom: [String: Any]?
......
Sources/MotionTransition.swift
......@@ -395,15 +395,6 @@ public extension MotionTransition {
}
/**
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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment