- Dynamic spinner enhancement

- Ball clip rotate
- Line spin fade
- Circle stroke pin

Author: Ketan Chopda

SSSpinnerButton.xcodeproj/project.pbxproj

@@ -221,7 +221,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if hash tailor 2>/dev/null; then\ntailor\nelse\necho \"warning: Please install Tailor from https://tailor.sh\"\nfi\n";
+			shellScript = "if hash tailor 2>/dev/null; then\ntailor\nelse\necho \"warning: Please install Tailor from https://tailor.sh\"\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSBallRotateChase.swift

@@ -20,16 +20,13 @@ class SSBallRotateChase: SSSpinnerAnimationDelegate {
     func setupSpinnerAnimation(layer: CALayer, frame: CGRect, color: UIColor, spinnerSize: UInt?) {
 
         var defaultPadding: CGFloat = 10.0
-        
         var sizeofSpinner: CGFloat?
         if spinnerSize != nil {
             defaultPadding = 0.0
             sizeofSpinner =  max(CGFloat(spinnerSize!) - defaultPadding, 1.0)
         }
-        
         var size =  max(min(frame.width, frame.height) - defaultPadding, 1.0)
-       
-        if sizeofSpinner != nil && sizeofSpinner! > (size - 10) {
+        if sizeofSpinner != nil && sizeofSpinner! > (size - defaultPadding) {
             defaultPadding = 10.0
             size =  max(min(frame.width, frame.height) - defaultPadding, 1.0)
             sizeofSpinner = size

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSBallSpinFadeLoader.swift

@@ -26,7 +26,7 @@ class SSBallSpinFadeLoader: SSSpinnerAnimationDelegate {
         if spinnerSize != nil {
             sizeOfSpinner =   max(min(CGFloat(spinnerSize!), sizeOfSpinner), 1.0)
         }
-        let center = CGPoint(x: (sizeValue/2), y: (sizeValue/2))
+        let center = CGPoint(x: (sizeValue / 2), y: (sizeValue / 2))
         let circleSpacing: CGFloat = 1
         let circleSize =  max((sizeOfSpinner * circleSpacing / 8), 1.0)
 
@@ -82,7 +82,7 @@ class SSBallSpinFadeLoader: SSSpinnerAnimationDelegate {
     ///   - color: spinner color
     /// - Returns: 
     func circleAt(angle: CGFloat, size: CGFloat, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
-        let radius = (containerSize.width/2) - (size/2)
+        let radius = (containerSize.width / 2) - (size / 2)
         let circle = SpinnerShape.circle.layerWith(size: CGSize(width: size, height: size), color: color)
         let frame = CGRect(
             x: origin.x + radius * (cos(angle)) - (size / 2),
@@ -92,7 +92,6 @@ class SSBallSpinFadeLoader: SSSpinnerAnimationDelegate {
 
         circle.frame = frame
 
-        
         return circle
     }
 

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSCircleStrokeSpin.swift

@@ -21,9 +21,11 @@ class SSCircleStrokeSpin: SSSpinnerAnimationDelegate {
     func setupSpinnerAnimation(layer: CALayer, frame: CGRect, color: UIColor, spinnerSize: UInt?) {
 
         let defaultPadding: CGFloat = 10.0
+        var center = CGPoint(x: defaultPadding / 2, y: defaultPadding / 2)
         var sizeValue = max(min(frame.width, frame.height) - defaultPadding, 1.0)
-        if spinnerSize != nil {
-            sizeValue =  max(CGFloat(spinnerSize!) - defaultPadding, 1.0)
+        if spinnerSize != nil && CGFloat(spinnerSize!) < sizeValue {
+            sizeValue =  max(CGFloat(spinnerSize!), 1.0)
+            center = CGPoint(x: frame.height / 2 - sizeValue / 2, y: frame.height / 2 - sizeValue / 2)
         }
         let beginTime: Double = 0.5
         let strokeStartDuration: Double = 1.2
@@ -55,8 +57,8 @@ class SSCircleStrokeSpin: SSSpinnerAnimationDelegate {
 
         let circle = SpinnerShape.stroke.layerWith(size: CGSize(width: sizeValue, height: sizeValue), color: color)
         let frame = CGRect(
-            x: defaultPadding / 2,
-            y: defaultPadding / 2,
+            x: center.x,
+            y: center.y,
             width: sizeValue,
             height: sizeValue
         )

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSLineSpinFadeLoader.swift

@@ -23,10 +23,11 @@ class SSLineSpinFadeLoader: SSSpinnerAnimationDelegate {
         let defaultPadding: CGFloat = 4.0
 
         var sizeValue = max(min(frame.width, frame.height) - defaultPadding, 1.0)
-        if spinnerSize != nil {
-            sizeValue =  max(CGFloat(spinnerSize!) - defaultPadding, 1.0)
+        var center = CGPoint(x: (sizeValue / 2) + (defaultPadding / 2), y: (sizeValue/2) + (defaultPadding / 2))
+        if spinnerSize != nil && CGFloat(spinnerSize!) < sizeValue {
+            sizeValue =  max(CGFloat(spinnerSize!), 1.0)
+            center = CGPoint(x: frame.height / 2, y: frame.height / 2)
         }
-        let center = CGPoint(x: (sizeValue/2) + (defaultPadding / 2), y: (sizeValue/2) + (defaultPadding / 2))
         let duration: CFTimeInterval = 1.2
         let beginTime = CACurrentMediaTime()
         let beginTimes: [CFTimeInterval] = [0.12, 0.24, 0.36, 0.48, 0.6, 0.72, 0.84, 0.96]

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSSpinnerBallClipRotate.swift

@@ -12,8 +12,6 @@ import UIKit
 /// 
 class SSSpinnerBallClipRotate: SSSpinnerAnimationDelegate {
 
-    
-    
     ///  setup spinner layer
     ///
     /// - Parameters:
@@ -23,11 +21,15 @@ class SSSpinnerBallClipRotate: SSSpinnerAnimationDelegate {
     func setupSpinnerAnimation(layer: CALayer, frame: CGRect, color: UIColor, spinnerSize: UInt?) {
 
         var sizeValue = min(frame.width, frame.height)
-        if spinnerSize != nil {
+        var center = CGPoint(x: 0, y: 0)
+        if spinnerSize != nil && CGFloat(spinnerSize!) < sizeValue {
             sizeValue =  max(CGFloat(spinnerSize!), 1.0)
+            center = CGPoint(x: frame.height / 2 - sizeValue / 2, y: frame.height / 2 - sizeValue / 2)
         }
         let ballClip = SpinnerShape.ring.layerWith(size: CGSize(width: sizeValue, height: sizeValue), color: color)
-        ballClip.frame = CGRect(x: 0, y: 0, width: sizeValue, height: sizeValue)
+        ballClip.frame = CGRect(x: center.x, y: center.x, width: sizeValue, height: sizeValue)
+        ballClip.frame.size.height = sizeValue
+        ballClip.frame.size.width = sizeValue
 
         layer.addSublayer(ballClip)
 

SSSpinnerButton/SSSpinnerButton/SpinnerButton/SSSpinnerButton.swift

@@ -229,15 +229,14 @@ private extension SSSpinnerButton {
         self.setImage(storedHighlightedImage, for: .highlighted)
         isUserInteractionEnabled = true
 
-        let animaton = CABasicAnimation(keyPath: "bounds.size.width")
-        
-        animaton.fromValue = frame.height
-        animaton.toValue = frame.width
-        animaton.duration = animationDuration
-        animaton.fillMode = kCAFillModeForwards
-        animaton.isRemovedOnCompletion = false
-        
-        layer.add(animaton, forKey: animaton.keyPath)
+        let animation = CABasicAnimation(keyPath: "bounds.size.width")
+        animation.fromValue = frame.height
+        animation.toValue = frame.width
+        animation.duration = animationDuration
+        animation.fillMode = kCAFillModeForwards
+        animation.isRemovedOnCompletion = false
+        
+        layer.add(animation, forKey: animation.keyPath)
         isAnimating = false
         self.layer.cornerRadius = self.cornrRadius
         if complete != nil {

SSSpinnerButton/ViewController.swift

@@ -31,7 +31,7 @@ class ViewController: UIViewController {
 
         let arr: [SpinnerType] = [.ballClipRotate, .ballSpinFade, .lineSpinFade, .ballRotateChase, .circleStrokeSpin]
 
-        sender.startAnimate(spinnerType: arr[sender.tag], spinnercolor: .white, spinnerSize: 15 , complete: nil)
+        sender.startAnimate(spinnerType: arr[sender.tag], spinnercolor: .white, spinnerSize: 20, complete: nil)
                 Timer.scheduledTimer(withTimeInterval: 5, repeats: false) { (_) in
             sender.stopAnimate(complete: {
             })