Skip to content

M
Material
Commit 2b0679cd by shoheiyokoyama
Options

define AnimationKey

parent c96c6fd8
Showing with 44 additions and 18 deletions
Sources/iOS/BasicAnimation.swift
...@@ -30,12 +30,38 @@ ...@@ -30,12 +30,38 @@
import UIKit import UIKit
public enum AnimationKey: String {
case backgroundColor
case cornerRadius
case transform
case transformRotation = "transform.rotation"
case transformRotationX = "transform.rotation.x"
case transformRotationY = "transform.rotation.y"
case transformRotationZ = "transform.rotation.z"
case transformScale = "transform.scale"
case transformScaleX = "transform.scale.x"
case transformScaleY = "transform.scale.y"
case transformScaleZ = "transform.scale.z"
case transformTranslation = "transform.translation"
case transformTranslationX = "transform.translation.x"
case transformTranslationY = "transform.translation.y"
case transformTranslationZ = "transform.translation.z"
case position
case shadowPath
}
extension CABasicAnimation {
convenience init(keyPath key: AnimationKey) {
self.init(keyPath: key.rawValue)
}
}
extension Animation { extension Animation {
/** /**
:name: backgroundColor :name: backgroundColor
*/ */
public static func backgroundColor(color: UIColor, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func backgroundColor(color: UIColor, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "backgroundColor") let animation = CABasicAnimation(keyPath: .backgroundColor)
animation.toValue = color.cgColor animation.toValue = color.cgColor
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -50,7 +76,7 @@ extension Animation { ...@@ -50,7 +76,7 @@ extension Animation {
:name: cornerRadius :name: cornerRadius
*/ */
public static func cornerRadius(radius: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func cornerRadius(radius: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "cornerRadius") let animation = CABasicAnimation(keyPath: .cornerRadius)
animation.toValue = radius animation.toValue = radius
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -65,7 +91,7 @@ extension Animation { ...@@ -65,7 +91,7 @@ extension Animation {
:name: translation :name: translation
*/ */
public static func transform(transform: CATransform3D, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func transform(transform: CATransform3D, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform") let animation = CABasicAnimation(keyPath: .transform)
animation.toValue = NSValue(caTransform3D: transform) animation.toValue = NSValue(caTransform3D: transform)
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -80,7 +106,7 @@ extension Animation { ...@@ -80,7 +106,7 @@ extension Animation {
:name: rotate :name: rotate
*/ */
public static func rotate(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func rotate(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.rotation") let animation = CABasicAnimation(keyPath: .transformRotation)
if let v: CGFloat = angle { if let v: CGFloat = angle {
animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber
} else if let v: CGFloat = rotation { } else if let v: CGFloat = rotation {
...@@ -99,7 +125,7 @@ extension Animation { ...@@ -99,7 +125,7 @@ extension Animation {
:name: rotateX :name: rotateX
*/ */
public static func rotateX(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func rotateX(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.rotation.x") let animation = CABasicAnimation(keyPath: .transformRotationX)
if let v: CGFloat = angle { if let v: CGFloat = angle {
animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber
} else if let v: CGFloat = rotation { } else if let v: CGFloat = rotation {
...@@ -118,7 +144,7 @@ extension Animation { ...@@ -118,7 +144,7 @@ extension Animation {
:name: rotateY :name: rotateY
*/ */
public static func rotateY(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func rotateY(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.rotation.y") let animation = CABasicAnimation(keyPath: .transformRotationY)
if let v: CGFloat = angle { if let v: CGFloat = angle {
animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber
} else if let v: CGFloat = rotation { } else if let v: CGFloat = rotation {
...@@ -137,7 +163,7 @@ extension Animation { ...@@ -137,7 +163,7 @@ extension Animation {
:name: rotateZ :name: rotateZ
*/ */
public static func rotateZ(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func rotateZ(angle: CGFloat? = nil, rotation: CGFloat? = nil, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.rotation.z") let animation = CABasicAnimation(keyPath: .transformRotationZ)
if let v: CGFloat = angle { if let v: CGFloat = angle {
animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber animation.toValue = (CGFloat(M_PI) * v / 180) as NSNumber
} else if let v: CGFloat = rotation { } else if let v: CGFloat = rotation {
...@@ -156,7 +182,7 @@ extension Animation { ...@@ -156,7 +182,7 @@ extension Animation {
:name: scale :name: scale
*/ */
public static func scale(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func scale(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.scale") let animation = CABasicAnimation(keyPath: .transformScale)
animation.toValue = scale as NSNumber animation.toValue = scale as NSNumber
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -171,7 +197,7 @@ extension Animation { ...@@ -171,7 +197,7 @@ extension Animation {
:name: scaleX :name: scaleX
*/ */
public static func scaleX(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func scaleX(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.scale.x") let animation = CABasicAnimation(keyPath: .transformScaleX)
animation.toValue = scale as NSNumber animation.toValue = scale as NSNumber
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -186,7 +212,7 @@ extension Animation { ...@@ -186,7 +212,7 @@ extension Animation {
:name: scaleY :name: scaleY
*/ */
public static func scaleY(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func scaleY(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.scale.y") let animation = CABasicAnimation(keyPath: .transformScaleY)
animation.toValue = scale as NSNumber animation.toValue = scale as NSNumber
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -201,7 +227,7 @@ extension Animation { ...@@ -201,7 +227,7 @@ extension Animation {
:name: scaleZ :name: scaleZ
*/ */
public static func scaleZ(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func scaleZ(scale: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.scale.z") let animation = CABasicAnimation(keyPath: .transformScaleZ)
animation.toValue = scale as NSNumber animation.toValue = scale as NSNumber
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -216,7 +242,7 @@ extension Animation { ...@@ -216,7 +242,7 @@ extension Animation {
:name: translate :name: translate
*/ */
public static func translate(translation: CGSize, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func translate(translation: CGSize, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.translation") let animation = CABasicAnimation(keyPath: .transformTranslation)
animation.toValue = NSValue(cgSize: translation) animation.toValue = NSValue(cgSize: translation)
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -231,7 +257,7 @@ extension Animation { ...@@ -231,7 +257,7 @@ extension Animation {
:name: translateX :name: translateX
*/ */
public static func translateX(translation: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func translateX(translation: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.translation.x") let animation = CABasicAnimation(keyPath: .transformTranslationX)
animation.toValue = translation as NSNumber animation.toValue = translation as NSNumber
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -246,7 +272,7 @@ extension Animation { ...@@ -246,7 +272,7 @@ extension Animation {
:name: translateY :name: translateY
*/ */
public static func translateY(translation: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func translateY(translation: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.translation.y") let animation = CABasicAnimation(keyPath: .transformTranslationY)
animation.toValue = translation as NSNumber animation.toValue = translation as NSNumber
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -261,7 +287,7 @@ extension Animation { ...@@ -261,7 +287,7 @@ extension Animation {
:name: translateZ :name: translateZ
*/ */
public static func translateZ(translation: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func translateZ(translation: CGFloat, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "transform.translation.z") let animation = CABasicAnimation(keyPath: .transformTranslationZ)
animation.toValue = translation as NSNumber animation.toValue = translation as NSNumber
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -276,7 +302,7 @@ extension Animation { ...@@ -276,7 +302,7 @@ extension Animation {
:name: position :name: position
*/ */
public static func position(point: CGPoint, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func position(point: CGPoint, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "position") let animation = CABasicAnimation(keyPath: .position)
animation.toValue = NSValue(cgPoint: point) animation.toValue = NSValue(cgPoint: point)
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
...@@ -288,7 +314,7 @@ extension Animation { ...@@ -288,7 +314,7 @@ extension Animation {
} }
public static func shadowPath(path: CGPath, duration: CFTimeInterval? = nil) -> CABasicAnimation { public static func shadowPath(path: CGPath, duration: CFTimeInterval? = nil) -> CABasicAnimation {
let animation = CABasicAnimation(keyPath: "shadowPath") let animation = CABasicAnimation(keyPath: .shadowPath)
animation.toValue = path animation.toValue = path
animation.fillMode = AnimationFillModeToValue(mode: .forwards) animation.fillMode = AnimationFillModeToValue(mode: .forwards)
animation.isRemovedOnCompletion = false animation.isRemovedOnCompletion = false
......
Sources/iOS/KeyframeAnimation.swift
...@@ -57,7 +57,7 @@ extension Animation { ...@@ -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 {
......
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