From 64749af7c712b23ae8ff8e0961c7b1829d15f55f Mon Sep 17 00:00:00 2001 From: Laurentiu Ungur Date: Tue, 28 Mar 2017 18:05:28 +0300 Subject: [PATCH] Fix some castings of `.pi` --- PKHUD/PKHUDAnimation.swift | 54 +++++++++++++++++++------------------- PKHUD/PKHUDErrorView.swift | 6 ++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/PKHUD/PKHUDAnimation.swift b/PKHUD/PKHUDAnimation.swift index bb475bd..9f63dec 100644 --- a/PKHUD/PKHUDAnimation.swift +++ b/PKHUD/PKHUDAnimation.swift @@ -15,34 +15,34 @@ public final class PKHUDAnimation { public static let discreteRotation: CAAnimation = { let animation = CAKeyframeAnimation(keyPath: "transform.rotation.z") animation.values = [ - NSNumber(value: 0.0 as Float), - NSNumber(value: 1.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 2.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 3.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 4.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 5.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 6.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 7.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 8.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 9.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 10.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 11.0 * Float(Double.pi) / 6.0 as Float), - NSNumber(value: 2.0 * Float(Double.pi) as Float) + NSNumber(value: 0.0), + NSNumber(value: 1.0 * .pi / 6.0), + NSNumber(value: 2.0 * .pi / 6.0), + NSNumber(value: 3.0 * .pi / 6.0), + NSNumber(value: 4.0 * .pi / 6.0), + NSNumber(value: 5.0 * .pi / 6.0), + NSNumber(value: 6.0 * .pi / 6.0), + NSNumber(value: 7.0 * .pi / 6.0), + NSNumber(value: 8.0 * .pi / 6.0), + NSNumber(value: 9.0 * .pi / 6.0), + NSNumber(value: 10.0 * .pi / 6.0), + NSNumber(value: 11.0 * .pi / 6.0), + NSNumber(value: 2.0 * .pi) ] animation.keyTimes = [ - NSNumber(value: 0.0 as Float), - NSNumber(value: 1.0 / 12.0 as Float), - NSNumber(value: 2.0 / 12.0 as Float), - NSNumber(value: 3.0 / 12.0 as Float), - NSNumber(value: 4.0 / 12.0 as Float), - NSNumber(value: 5.0 / 12.0 as Float), - NSNumber(value: 0.5 as Float), - NSNumber(value: 7.0 / 12.0 as Float), - NSNumber(value: 8.0 / 12.0 as Float), - NSNumber(value: 9.0 / 12.0 as Float), - NSNumber(value: 10.0 / 12.0 as Float), - NSNumber(value: 11.0 / 12.0 as Float), - NSNumber(value: 1.0 as Float) + NSNumber(value: 0.0), + NSNumber(value: 1.0 / 12.0), + NSNumber(value: 2.0 / 12.0), + NSNumber(value: 3.0 / 12.0), + NSNumber(value: 4.0 / 12.0), + NSNumber(value: 5.0 / 12.0), + NSNumber(value: 0.5), + NSNumber(value: 7.0 / 12.0), + NSNumber(value: 8.0 / 12.0), + NSNumber(value: 9.0 / 12.0), + NSNumber(value: 10.0 / 12.0), + NSNumber(value: 11.0 / 12.0), + NSNumber(value: 1.0) ] animation.duration = 1.2 animation.calculationMode = "discrete" @@ -53,7 +53,7 @@ public final class PKHUDAnimation { static let continuousRotation: CAAnimation = { let animation = CABasicAnimation(keyPath: "transform.rotation.z") animation.fromValue = 0 - animation.toValue = 2.0 * Double.pi + animation.toValue = 2.0 * .pi animation.duration = 1.2 animation.repeatCount = Float(INT_MAX) return animation diff --git a/PKHUD/PKHUDErrorView.swift b/PKHUD/PKHUDErrorView.swift index 3c4aa42..6c60d5d 100644 --- a/PKHUD/PKHUDErrorView.swift +++ b/PKHUD/PKHUDErrorView.swift @@ -62,7 +62,7 @@ open class PKHUDErrorView: PKHUDSquareBaseView, PKHUDAnimating { } animation.fromValue = 0.0 - animation.toValue = angle * CGFloat(Double.pi / 180.0) + animation.toValue = angle * CGFloat(.pi / 180.0) animation.duration = 1.0 animation.timingFunction = CAMediaTimingFunction(name:kCAMediaTimingFunctionEaseInEaseOut) return animation @@ -72,8 +72,8 @@ open class PKHUDErrorView: PKHUDSquareBaseView, PKHUDAnimating { let dashOneAnimation = rotationAnimation(-45.0) let dashTwoAnimation = rotationAnimation(45.0) - dashOneLayer.transform = CATransform3DMakeRotation(-45 * CGFloat(Double.pi/180), 0.0, 0.0, 1.0) - dashTwoLayer.transform = CATransform3DMakeRotation(45 * CGFloat(Double.pi/180), 0.0, 0.0, 1.0) + dashOneLayer.transform = CATransform3DMakeRotation(-45 * CGFloat(.pi / 180.0), 0.0, 0.0, 1.0) + dashTwoLayer.transform = CATransform3DMakeRotation(45 * CGFloat(.pi / 180.0), 0.0, 0.0, 1.0) dashOneLayer.add(dashOneAnimation, forKey: "dashOneAnimation") dashTwoLayer.add(dashTwoAnimation, forKey: "dashTwoAnimation")