Merge branch 'master' into master

takuoka · Sep 10, 2019 · 1421cdc · 1421cdc
2 parents 6a9b8fe + 795bdf2
commit 1421cdc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/SubmitTransition.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SubmitTransition.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SubmitTransition/Classes/SpinerLayer.swift b/SubmitTransition/Classes/SpinerLayer.swift
@@ -11,7 +11,7 @@ class SpinerLayer: CAShapeLayer {
 
     init(frame:CGRect) {
         super.init()
-
+        
         let radius:CGFloat = (frame.height / 2) * 0.5
         self.frame = CGRect(x: 0, y: 0, width: frame.height, height: frame.height)
 
@@ -20,15 +20,15 @@ class SpinerLayer: CAShapeLayer {
         let endAngle = Double.pi * 2 - (Double.pi / 2)
         let clockwise: Bool = true
         self.path = UIBezierPath(arcCenter: center, radius: radius, startAngle: CGFloat(startAngle), endAngle: CGFloat(endAngle), clockwise: clockwise).cgPath
-
+        
         self.fillColor = nil
         self.strokeColor = spinnerColor.cgColor
         self.lineWidth = 1
 
         self.strokeEnd = 0.4
         self.isHidden = true
-     }
-
+    }
+    
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -39,13 +39,13 @@ class SpinerLayer: CAShapeLayer {
         rotate.fromValue = 0
         rotate.toValue = Double.pi * 2
         rotate.duration = 0.4
-        rotate.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
+        rotate.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
 
         rotate.repeatCount = HUGE
-        rotate.fillMode = kCAFillModeForwards
+        rotate.fillMode = CAMediaTimingFillMode.forwards
         rotate.isRemovedOnCompletion = false
         self.add(rotate, forKey: rotate.keyPath)
-
+        
     }
 
     func stopAnimation() {

diff --git a/SubmitTransition/Classes/TransitionSubmitButton.swift b/SubmitTransition/Classes/TransitionSubmitButton.swift
@@ -18,7 +18,7 @@ open class TKTransitionSubmitButton : UIButton, UIViewControllerTransitioningDel
     open var didEndFinishAnimation : (()->())? = nil
 
     let springGoEase = CAMediaTimingFunction(controlPoints: 0.45, -0.36, 0.44, 0.92)
-    let shrinkCurve = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
+    let shrinkCurve = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
     let expandCurve = CAMediaTimingFunction(controlPoints: 0.95, 0.02, 1, 0.05)
     let shrinkDuration: CFTimeInterval  = 0.1
     @IBInspectable open var normalCornerRadius:CGFloat = 0.0 {
@@ -63,14 +63,14 @@ open class TKTransitionSubmitButton : UIButton, UIViewControllerTransitioningDel
         self.isAnimating = true
         _ = Timer.schedule(delay: delay) { timer in
             self.didEndFinishAnimation = completion
-            self.expand(animation)
+            self.expand()
             self.spiner.stopAnimation()
         }
     }
 
     open func animate(_ duration: TimeInterval,_ animation: CAMediaTimingFunction, completion:(()->())?) {
         startLoadingAnimation()
-        startFinishAnimation(duration, animation, completion: completion)
+        startFinishAnimation(duration, completion: completion)
     }
 
     open func setOriginalState() {
@@ -91,7 +91,7 @@ open class TKTransitionSubmitButton : UIButton, UIViewControllerTransitioningDel
     open func returnToOriginalState() {
         self.spiner.removeFromSuperlayer()
         self.layer.removeAllAnimations()
-        self.setTitle(self.cachedTitle, for: UIControlState())
+        self.setTitle(self.cachedTitle, for: UIControl.State())
         self.spiner.stopAnimation()
         self.isAnimating = false
     }
@@ -114,19 +114,19 @@ open class TKTransitionSubmitButton : UIButton, UIViewControllerTransitioningDel
         shrinkAnim.toValue = frame.height
         shrinkAnim.duration = shrinkDuration
         shrinkAnim.timingFunction = shrinkCurve
-        shrinkAnim.fillMode = kCAFillModeForwards
+        shrinkAnim.fillMode = CAMediaTimingFillMode.forwards
         shrinkAnim.isRemovedOnCompletion = false
         layer.add(shrinkAnim, forKey: shrinkAnim.keyPath)
     }
 
-    func expand(_ animation: CAMediaTimingFunction) {
+    func expand() {
         let expandAnim = CABasicAnimation(keyPath: "transform.scale")
         expandAnim.fromValue = 1.0
         expandAnim.toValue = 26.0
-        expandAnim.timingFunction = animation
+        expandAnim.timingFunction = expandCurve
         expandAnim.duration = 0.3
         expandAnim.delegate = self
-        expandAnim.fillMode = kCAFillModeForwards
+        expandAnim.fillMode = CAMediaTimingFillMode.forwards
         expandAnim.isRemovedOnCompletion = false
         layer.add(expandAnim, forKey: expandAnim.keyPath)
     }