Merge pull request #566 from shoheiyokoyama/improve-animation

Define enumerations for animation

Sources/iOS/Animation.swift

@@ -55,6 +55,35 @@ public func AnimationFillModeToValue(mode: AnimationFillMode) -> String {
 	}
 	}
 }
 }
 
 
+@objc(AnimationTimingFunction)
+public enum AnimationTimingFunction: Int {
+    case liner
+    case easeIn
+    case easeOut
+    case easeInEaseOut
+    case systemDefault
+}
+
+/**
+ Converts the AnimationTimingFunction enum value to a corresponding CAMediaTimingFunction.
+ - Parameter function: An AnimationTimingFunction enum value.
+ */
+public func AnimationTimingFunctionToValue(function: AnimationTimingFunction) -> CAMediaTimingFunction {
+    switch function {
+    case .liner:
+        return CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
+    case .easeIn:
+        return CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
+    case .easeOut:
+        return CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+    case .easeInEaseOut:
+        return CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+    case .systemDefault:
+        return CAMediaTimingFunction(name: kCAMediaTimingFunctionDefault)
+    }
+}
+
+
 public typealias AnimationDelayCancelBlock = (Bool) -> Void
 public typealias AnimationDelayCancelBlock = (Bool) -> Void
 
 
 public struct Animation {
 public struct Animation {
@@ -106,7 +135,7 @@ public struct Animation {
 		CATransaction.begin()
 		CATransaction.begin()
 		CATransaction.setAnimationDuration(duration)
 		CATransaction.setAnimationDuration(duration)
 		CATransaction.setCompletionBlock(completion)
 		CATransaction.setCompletionBlock(completion)
-		CATransaction.setAnimationTimingFunction(CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut))
+		CATransaction.setAnimationTimingFunction(AnimationTimingFunctionToValue(function: .easeInEaseOut))
 		animations()
 		animations()
 		CATransaction.commit()
 		CATransaction.commit()
 	}
 	}
@@ -120,7 +149,7 @@ public struct Animation {
 		group.isRemovedOnCompletion = false
 		group.isRemovedOnCompletion = false
 		group.animations = animations
 		group.animations = animations
 		group.duration = duration
 		group.duration = duration
-		group.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+		group.timingFunction = AnimationTimingFunctionToValue(function: .easeInEaseOut)
 		return group
 		return group
 	}
 	}
 	
 	

Sources/iOS/KeyframeAnimation.swift

@@ -57,7 +57,7 @@ extension Animation {
 	*/
 	*/
 	public static func path(bezierPath: UIBezierPath, mode: AnimationRotationMode = .auto, duration: CFTimeInterval? = nil) -> CAKeyframeAnimation {
 	public static func path(bezierPath: UIBezierPath, mode: AnimationRotationMode = .auto, duration: CFTimeInterval? = nil) -> CAKeyframeAnimation {
 		let animation: CAKeyframeAnimation = CAKeyframeAnimation()
 		let animation: CAKeyframeAnimation = CAKeyframeAnimation()
-		animation.keyPath = "position"
+		animation.keyPath = AnimationKey.position.rawValue
 		animation.path = bezierPath.cgPath
 		animation.path = bezierPath.cgPath
         animation.rotationMode = AnimationRotationModeToValue(mode: mode)
         animation.rotationMode = AnimationRotationModeToValue(mode: mode)
 		if let v = duration {
 		if let v = duration {