diff --git a/.DS_Store b/.DS_Store index c69eb02..a1452d6 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/SubmitTransition/Classes/SpinerLayer.swift b/SubmitTransition/Classes/SpinerLayer.swift index 3aa2562..93ae28f 100644 --- a/SubmitTransition/Classes/SpinerLayer.swift +++ b/SubmitTransition/Classes/SpinerLayer.swift @@ -14,9 +14,10 @@ class SpinerLayer: CAShapeLayer { let radius:CGFloat = (frame.height / 2) * 0.5 self.frame = CGRect(x: 0, y: 0, width: frame.height, height: frame.height) + let center = CGPoint(x: frame.height / 2, y: bounds.center.y) - let startAngle = 0 - M_PI_2 - let endAngle = M_PI * 2 - M_PI_2 + let startAngle = 0 - (Double.pi / 2) + 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 @@ -36,7 +37,7 @@ class SpinerLayer: CAShapeLayer { self.isHidden = false let rotate = CABasicAnimation(keyPath: "transform.rotation.z") rotate.fromValue = 0 - rotate.toValue = M_PI * 2 + rotate.toValue = Double.pi * 2 rotate.duration = 0.4 rotate.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear) diff --git a/SubmitTransition/Classes/TimerEx.swift b/SubmitTransition/Classes/TimerEx.swift index 7646003..e5e3cc3 100644 --- a/SubmitTransition/Classes/TimerEx.swift +++ b/SubmitTransition/Classes/TimerEx.swift @@ -20,4 +20,19 @@ extension Timer { CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, .commonModes) return timer } + + + /*class func schedule(delay delay: NSTimeInterval, handler: NSTimer! -> Void) -> NSTimer { + let fireDate = delay + CFAbsoluteTimeGetCurrent() + let timer = CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, fireDate, 0, 0, 0, handler) + CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes) + return timer + } + + class func schedule(repeatInterval interval: NSTimeInterval, handler: NSTimer! -> Void) -> NSTimer { + let fireDate = interval + CFAbsoluteTimeGetCurrent() + let timer = CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, fireDate, interval, 0, 0, handler) + CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes) + return timer + }*/ } diff --git a/SubmitTransition/Classes/TransitionSubmitButton.swift b/SubmitTransition/Classes/TransitionSubmitButton.swift index 33e0612..1e9bc39 100644 --- a/SubmitTransition/Classes/TransitionSubmitButton.swift +++ b/SubmitTransition/Classes/TransitionSubmitButton.swift @@ -53,7 +53,6 @@ open class TKTransitionSubmitButton : UIButton, UIViewControllerTransitioningDel }, completion: { (done) -> Void in self.shrink() Timer.schedule(delay: self.shrinkDuration - 0.25) { timer in - self.spiner.animation() } })