diff --git a/Determinate/CircularProgressView.swift b/Determinate/CircularProgressView.swift index 27f25dc..766f6d9 100644 --- a/Determinate/CircularProgressView.swift +++ b/Determinate/CircularProgressView.swift @@ -46,7 +46,7 @@ open class CircularProgressView: DeterminateAnimation { } else { CATransaction.setDisableActions(true) } - let timing = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + let timing = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) CATransaction.setAnimationTimingFunction(timing) progressLayer.strokeEnd = max(0, min(progress, 1)) percentLabelLayer.string = "\(Int(progress * 100))%" @@ -77,7 +77,7 @@ open class CircularProgressView: DeterminateAnimation { do { progressLayer.strokeEnd = 0 //REMOVe this progressLayer.fillColor = NSColor.clear.cgColor - progressLayer.lineCap = kCALineCapRound + progressLayer.lineCap = CAShapeLayerLineCap.round progressLayer.lineWidth = strokeWidth == -1 ? (rect.width * strokeScalingFactor) : strokeWidth progressLayer.frame = rect @@ -95,7 +95,7 @@ open class CircularProgressView: DeterminateAnimation { percentLabelLayer.foregroundColor = foreground.cgColor percentLabelLayer.frame = rect percentLabelLayer.font = "Helvetica Neue Light" as CFTypeRef - percentLabelLayer.alignmentMode = kCAAlignmentCenter + percentLabelLayer.alignmentMode = CATextLayerAlignmentMode.center percentLabelLayer.position.y = rect.midY * 0.25 percentLabelLayer.fontSize = rect.width * 0.2 self.layer?.addSublayer(percentLabelLayer) diff --git a/Determinate/ProgressBar.swift b/Determinate/ProgressBar.swift index 545e431..1a6e745 100644 --- a/Determinate/ProgressBar.swift +++ b/Determinate/ProgressBar.swift @@ -51,7 +51,7 @@ open class ProgressBar: DeterminateAnimation { } else { CATransaction.setDisableActions(true) } - let timing = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + let timing = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) CATransaction.setAnimationTimingFunction(timing) progressLayer.frame.size.width = (borderLayer.bounds.width - 6) * progress CATransaction.commit() diff --git a/InDeterminate/Crawler.swift b/InDeterminate/Crawler.swift index d58be53..9007a9a 100644 --- a/InDeterminate/Crawler.swift +++ b/InDeterminate/Crawler.swift @@ -52,9 +52,9 @@ open class Crawler: IndeterminateAnimation { let rotationAnimation = CAKeyframeAnimation(keyPath: "position") rotationAnimation.path = arcPath.CGPath - rotationAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + rotationAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) rotationAnimation.beginTime = (duration * 0.075) * Double(i) - rotationAnimation.calculationMode = kCAAnimationCubicPaced + rotationAnimation.calculationMode = CAAnimationCalculationMode.cubicPaced let animationGroup = CAAnimationGroup() animationGroup.animations = [rotationAnimation] diff --git a/InDeterminate/MaterialProgress.swift b/InDeterminate/MaterialProgress.swift index eb5ccc0..c80b0d0 100644 --- a/InDeterminate/MaterialProgress.swift +++ b/InDeterminate/MaterialProgress.swift @@ -31,7 +31,7 @@ open class MaterialProgress: IndeterminateAnimation { var progressLayer: CAShapeLayer = { var tempLayer = CAShapeLayer() tempLayer.strokeEnd = CGFloat(strokeRange.end) - tempLayer.lineCap = kCALineCapRound + tempLayer.lineCap = CAShapeLayerLineCap.round tempLayer.fillColor = NSColor.clear.cgColor return tempLayer }() @@ -64,7 +64,7 @@ open class MaterialProgress: IndeterminateAnimation { let tempAnimation = CABasicAnimation(keyPath: keyPath) tempAnimation.repeatCount = 1 tempAnimation.speed = 2.0 - tempAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut) + tempAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) tempAnimation.fromValue = strokeRange.start tempAnimation.toValue = strokeRange.end diff --git a/InDeterminate/ShootingStars.swift b/InDeterminate/ShootingStars.swift index df29543..d9c2607 100644 --- a/InDeterminate/ShootingStars.swift +++ b/InDeterminate/ShootingStars.swift @@ -51,7 +51,7 @@ open class ShootingStars: IndeterminateAnimation { animation.fromValue = -dimension animation.toValue = rect.width * 0.9 animation.duration = animationDuration - animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn) + animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn) animation.isRemovedOnCompletion = false animation.repeatCount = Float.infinity } @@ -64,7 +64,7 @@ open class ShootingStars: IndeterminateAnimation { tempAnimation.toValue = rect.width tempAnimation.delegate = self tempAnimation.duration = animationDuration / 2 - tempAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn) + tempAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn) } //MARK: Indeterminable protocol diff --git a/InDeterminate/Spinner.swift b/InDeterminate/Spinner.swift index 7502f37..66f97a7 100644 --- a/InDeterminate/Spinner.swift +++ b/InDeterminate/Spinner.swift @@ -19,7 +19,7 @@ open class Spinner: IndeterminateAnimation { var animation: CAKeyframeAnimation = { var animation = CAKeyframeAnimation(keyPath: "transform.rotation") animation.repeatCount = Float.infinity - animation.calculationMode = kCAAnimationDiscrete + animation.calculationMode = CAAnimationCalculationMode.discrete return animation }() diff --git a/ProgressKit.podspec b/ProgressKit.podspec index 08cd621..36a39d6 100644 --- a/ProgressKit.podspec +++ b/ProgressKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'ProgressKit' - spec.version = '0.7' + spec.version = '0.8' spec.license = 'MIT' spec.summary = 'Animated ProgressViews for macOS' spec.homepage = 'https://github.com/kaunteya/ProgressKit' diff --git a/ProgressUtils.swift b/ProgressUtils.swift index deab6a8..fe300cd 100644 --- a/ProgressUtils.swift +++ b/ProgressUtils.swift @@ -25,13 +25,13 @@ extension NSBezierPath { for index in 0..