Skip to content

Update from dcoletto #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wowansm merged 2 commits into from
Oct 24, 2019
Merged

Update from dcoletto #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee8166d
Using constants for CAMediaTimingFunction and CAFillMode
dcoletto Feb 4, 2019
393fe65
Constants for CAMediaTimingFunction and CAFillMode
dcoletto Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/SpinerLayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ class SpinerLayer: CAShapeLayer {
rotate.fromValue = 0
rotate.toValue = Double.pi * 2
rotate.duration = 0.4
rotate.timingFunction = CAMediaTimingFunction(name: .linear)
rotate.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)

rotate.repeatCount = HUGE
rotate.fillMode = .forwards
rotate.fillMode = kCAFillModeForwards
rotate.isRemovedOnCompletion = false
self.add(rotate, forKey: rotate.keyPath)

Expand Down
10 changes: 5 additions & 5 deletions Source/TransitionButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public enum StopAnimationStyle {
private var cachedImage: UIImage?

private let springGoEase:CAMediaTimingFunction = CAMediaTimingFunction(controlPoints: 0.45, -0.36, 0.44, 0.92)
private let shrinkCurve:CAMediaTimingFunction = CAMediaTimingFunction(name: .linear)
private let shrinkCurve:CAMediaTimingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
private let expandCurve:CAMediaTimingFunction = CAMediaTimingFunction(controlPoints: 0.95, 0.02, 1, 0.05)
private let shrinkDuration: CFTimeInterval = 0.1

Expand Down Expand Up @@ -151,7 +151,7 @@ public enum StopAnimationStyle {
NSValue(cgPoint: CGPoint(x: CGFloat(point.x + 10), y: CGFloat(point.y))),
NSValue(cgPoint: point)]

keyFrame.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
keyFrame.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
keyFrame.duration = 0.7
self.layer.position = point

Expand All @@ -178,7 +178,7 @@ public enum StopAnimationStyle {
shrinkAnim.toValue = (self.bounds.width)
shrinkAnim.duration = shrinkDuration
shrinkAnim.timingFunction = shrinkCurve
shrinkAnim.fillMode = .forwards
shrinkAnim.fillMode = kCAFillModeForwards
shrinkAnim.isRemovedOnCompletion = false

CATransaction.setCompletionBlock {
Expand All @@ -195,7 +195,7 @@ public enum StopAnimationStyle {
shrinkAnim.toValue = frame.height
shrinkAnim.duration = shrinkDuration
shrinkAnim.timingFunction = shrinkCurve
shrinkAnim.fillMode = .forwards
shrinkAnim.fillMode = kCAFillModeForwards
shrinkAnim.isRemovedOnCompletion = false

layer.add(shrinkAnim, forKey: shrinkAnim.keyPath)
Expand All @@ -209,7 +209,7 @@ public enum StopAnimationStyle {
expandAnim.toValue = max(expandScale,26.0)
expandAnim.timingFunction = expandCurve
expandAnim.duration = 0.4
expandAnim.fillMode = .forwards
expandAnim.fillMode = kCAFillModeForwards
expandAnim.isRemovedOnCompletion = false

CATransaction.setCompletionBlock {
Expand Down