Commit 18169434 by Daniel Dahan

fixed pulse animation

parent a26c532b
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
import UIKit import UIKit
internal class MotionDefaultAnimator<T: MotionAnimatorViewContext>: MotionAnimator, MotionHasInsertOrder { internal class MotionTransitionAnimator<T: MotionAnimatorViewContext>: MotionAnimator, MotionHasInsertOrder {
/// A reference to a MotionContext. /// A reference to a MotionContext.
weak public var context: MotionContext! weak public var context: MotionContext!
...@@ -38,7 +38,7 @@ internal class MotionDefaultAnimator<T: MotionAnimatorViewContext>: MotionAnimat ...@@ -38,7 +38,7 @@ internal class MotionDefaultAnimator<T: MotionAnimatorViewContext>: MotionAnimat
var insertToViewFirst = false var insertToViewFirst = false
} }
extension MotionDefaultAnimator { extension MotionTransitionAnimator {
/** /**
Animates a given view. Animates a given view.
- Parameter view: A UIView. - Parameter view: A UIView.
...@@ -55,7 +55,7 @@ extension MotionDefaultAnimator { ...@@ -55,7 +55,7 @@ extension MotionDefaultAnimator {
} }
} }
extension MotionDefaultAnimator { extension MotionTransitionAnimator {
/// Cleans the contexts. /// Cleans the contexts.
func clean() { func clean() {
for v in viewToContexts.values { for v in viewToContexts.values {
......
...@@ -146,33 +146,6 @@ public extension MotionCAAnimation { ...@@ -146,33 +146,6 @@ public extension MotionCAAnimation {
} }
/** /**
Creates a CABasicAnimation for the transform.rotate.x key path.
- Parameter x: An optional CGFloat.
- Returns: A CABasicAnimation.
*/
static func spin(x: CGFloat) -> CABasicAnimation {
return MotionCAAnimation.createAnimation(keyPath: .rotateX, toValue: NSNumber(value: Double(CGFloat(Double.pi) * 2 * x)))
}
/**
Creates a CABasicAnimation for the transform.rotate.y key path.
- Parameter y: An optional CGFloat.
- Returns: A CABasicAnimation.
*/
static func spin(y: CGFloat) -> CABasicAnimation {
return MotionCAAnimation.createAnimation(keyPath: .rotateY, toValue: NSNumber(value: Double(CGFloat(Double.pi) * 2 * y)))
}
/**
Creates a CABasicAnimation for the transform.rotate.z key path.
- Parameter z: An optional CGFloat.
- Returns: A CABasicAnimation.
*/
static func spin(z: CGFloat) -> CABasicAnimation {
return MotionCAAnimation.createAnimation(keyPath: .rotateZ, toValue: NSNumber(value: Double(CGFloat(Double.pi) * 2 * z)))
}
/**
Creates a CABasicAnimation for the transform.scale key path. Creates a CABasicAnimation for the transform.scale key path.
- Parameter xyz: A CGFloat. - Parameter xyz: A CGFloat.
- Returns: A CABasicAnimation. - Returns: A CABasicAnimation.
...@@ -217,6 +190,33 @@ public extension MotionCAAnimation { ...@@ -217,6 +190,33 @@ public extension MotionCAAnimation {
} }
/** /**
Creates a CABasicAnimation for the transform.rotate.x key path.
- Parameter x: An optional CGFloat.
- Returns: A CABasicAnimation.
*/
static func spin(x: CGFloat) -> CABasicAnimation {
return MotionCAAnimation.createAnimation(keyPath: .rotateX, toValue: NSNumber(value: Double(CGFloat(Double.pi) * 2 * x)))
}
/**
Creates a CABasicAnimation for the transform.rotate.y key path.
- Parameter y: An optional CGFloat.
- Returns: A CABasicAnimation.
*/
static func spin(y: CGFloat) -> CABasicAnimation {
return MotionCAAnimation.createAnimation(keyPath: .rotateY, toValue: NSNumber(value: Double(CGFloat(Double.pi) * 2 * y)))
}
/**
Creates a CABasicAnimation for the transform.rotate.z key path.
- Parameter z: An optional CGFloat.
- Returns: A CABasicAnimation.
*/
static func spin(z: CGFloat) -> CABasicAnimation {
return MotionCAAnimation.createAnimation(keyPath: .rotateZ, toValue: NSNumber(value: Double(CGFloat(Double.pi) * 2 * z)))
}
/**
Creates a CABasicAnimation for the position key path. Creates a CABasicAnimation for the position key path.
- Parameter _ point: A CGPoint. - Parameter _ point: A CGPoint.
- Returns: A CABasicAnimation. - Returns: A CABasicAnimation.
......
...@@ -495,10 +495,10 @@ fileprivate extension MotionController { ...@@ -495,10 +495,10 @@ fileprivate extension MotionController {
/// Prepares the animators. /// Prepares the animators.
func prepareAnimators() { func prepareAnimators() {
animators.append(MotionDefaultAnimator<MotionCoreAnimationViewContext>()) animators.append(MotionTransitionAnimator<MotionCoreAnimationViewContext>())
if #available(iOS 10, tvOS 10, *) { if #available(iOS 10, tvOS 10, *) {
animators.append(MotionDefaultAnimator<MotionViewPropertyViewContext>()) animators.append(MotionTransitionAnimator<MotionViewPropertyViewContext>())
} }
for v in animators { for v in animators {
......
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