From 01a32328329950e2c663319f34fcad2fa09f4829 Mon Sep 17 00:00:00 2001
From: Bhargav Bajani <bhargav.b@simformsolutions.com>
Date: Mon, 12 Nov 2018 20:36:25 +0530
Subject: [PATCH] Shadow_Issue_fix Update attributed & normal title for all
 states of button fix issue of inserted gradient layer

---
 SSSpinnerButton.podspec                       |   2 +-
 SSSpinnerButton/Base.lproj/Main.storyboard    |  11 +-
 .../SpinnerAnimationDelegate.swift            |   1 +
 .../SSErrorMark.swift                         |  12 +-
 .../SpinerShapes/SpinnerTypes.swift           |  42 ++--
 .../SpinnerButton/SSSpinnerButton.swift       | 217 +++++++++++++-----
 SSSpinnerButton/ViewController.swift          |   5 +-
 7 files changed, 209 insertions(+), 81 deletions(-)

diff --git a/SSSpinnerButton.podspec b/SSSpinnerButton.podspec
index fe523e7..c86e012 100644
--- a/SSSpinnerButton.podspec
+++ b/SSSpinnerButton.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "SSSpinnerButton"
-  s.version      = "1.1.1"
+  s.version      = "1.1.2"
   s.summary      = "SSSpinnerButton is an elegant button with a different spinner animations."
 
   #s.description  = "SSSpinnerButton is an elegant button with a different spinner animations."
diff --git a/SSSpinnerButton/Base.lproj/Main.storyboard b/SSSpinnerButton/Base.lproj/Main.storyboard
index 528d81e..88a4bb1 100644
--- a/SSSpinnerButton/Base.lproj/Main.storyboard
+++ b/SSSpinnerButton/Base.lproj/Main.storyboard
@@ -24,7 +24,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="L6t-dE-3h7">
                                         <rect key="frame" x="0.0" y="0.0" width="135" height="360"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UW4-Lx-QHw" customClass="SSSpinnerButton" customModule="SSSpinnerButton" customModuleProvider="target">
+                                            <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UW4-Lx-QHw" customClass="SSSpinnerButton" customModule="SSSpinnerButton" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="135" height="40"/>
                                                 <color key="backgroundColor" red="0.97647058823529409" green="0.58039215686274503" blue="0.6470588235294118" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
@@ -33,6 +33,11 @@
                                                 <state key="normal" title="BallClipRotate">
                                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 </state>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="cornrRadius">
+                                                        <real key="value" value="10"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
                                                 <connections>
                                                     <action selector="onSpinnnerButtonClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="WSs-Ty-TWf"/>
                                                 </connections>
@@ -95,7 +100,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="WvR-h8-XhK">
                                         <rect key="frame" x="145" y="0.0" width="135" height="360"/>
                                         <subviews>
-                                            <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e7v-OB-5yI" customClass="SSSpinnerButton" customModule="SSSpinnerButton" customModuleProvider="target">
+                                            <button opaque="NO" clipsSubviews="YES" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e7v-OB-5yI" customClass="SSSpinnerButton" customModule="SSSpinnerButton" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="135" height="40"/>
                                                 <color key="backgroundColor" red="0.97647058819999999" green="0.58039215690000001" blue="0.64705882349999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
@@ -184,7 +189,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="111" y="24"/>
+            <point key="canvasLocation" x="699" y="22"/>
         </scene>
     </scenes>
 </document>
diff --git a/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerAnimationDelegate/SpinnerAnimationDelegate.swift b/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerAnimationDelegate/SpinnerAnimationDelegate.swift
index 36aa2fb..8c68967 100644
--- a/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerAnimationDelegate/SpinnerAnimationDelegate.swift
+++ b/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerAnimationDelegate/SpinnerAnimationDelegate.swift
@@ -20,4 +20,5 @@ protocol SSSpinnerAnimationDelegate {
     ///   - color: color of spinner
     ///   - spinnerSize: size of spinner layer
     func setupSpinnerAnimation(layer: CALayer, frame: CGRect, color: UIColor, spinnerSize: UInt?)
+
 }
diff --git a/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSErrorMark.swift b/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSErrorMark.swift
index 0787b9a..f3ca2ef 100644
--- a/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSErrorMark.swift
+++ b/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSErrorMark.swift
@@ -23,26 +23,28 @@ class SSErrorMark: SSSpinnerAnimationDelegate {
         // add layer
         let errorMark = CheckMarkShape.errorMark.layerWith(frame: frame, color: color)
         layer.addSublayer(errorMark)
-        
+
         // end status
         let strokeEnd: CGFloat = 10
         errorMark.strokeEnd = strokeEnd
-        
+
         // animation
         let animation = CABasicAnimation(keyPath: "strokeEnd")
         animation.duration = 2.0
         animation.fromValue = 0.0
         animation.toValue = strokeEnd
-        errorMark.add(animation, forKey: nil)
+        animation.isRemovedOnCompletion = true
+        errorMark.add(animation, forKey: animation.keyPath)
         
         // shake animation
         let anim = CABasicAnimation(keyPath: "transform.rotation.z")
         anim.fromValue = (-Double.pi / 10)
         anim.toValue = (Double.pi / 10)
-        anim.duration = 0.05
+        anim.duration = 0.08
         anim.repeatCount = 4
         anim.autoreverses = true
-        layer.add(anim, forKey: nil)
+        anim.isRemovedOnCompletion = true
+        layer.add(anim, forKey: anim.keyPath)
     }
     
 }
diff --git a/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerTypes.swift b/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerTypes.swift
index 7f25c41..4900863 100644
--- a/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerTypes.swift
+++ b/SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerTypes.swift
@@ -50,40 +50,50 @@ public enum SpinnerType: Int {
      - returns: Instance of SSCircleStrokeSpin.
      */
     case circleStrokeSpin
+    
+    /// Animation of spinner
+    ///
+    /// - Returns: 
+    func animation() -> SSSpinnerAnimationDelegate {
+        switch self {
+        case .ballClipRotate:
+            return SSSpinnerBallClipRotate()
+        case .ballSpinFade:
+            return SSBallSpinFadeLoader()
+        case .lineSpinFade:
+            return SSLineSpinFadeLoader()
+        case .ballRotateChase:
+            return SSBallRotateChase()
+        case .circleStrokeSpin:
+            return SSCircleStrokeSpin()
+        
+        }
+    }
+    
+}
+
+public enum SpinnerCompletionType: Int {
     /**
-     CircleStrokeSpin.
+     CheckMark.
      
      - returns: Instance of SSCheckMark.
      */
     case checkMark
     /**
-     CircleStrokeSpin.
+     FailMark.
      
      - returns: Instance of SSFailMark.
      */
     case failMark
     /**
-     CircleStrokeSpin.
+     ErrorMark.
      
      - returns: Instance of SSErrorMark.
      */
     case errorMark
     
-    /// Animation of spinner
-    ///
-    /// - Returns: 
     func animation() -> SSSpinnerAnimationDelegate {
         switch self {
-        case .ballClipRotate:
-            return SSSpinnerBallClipRotate()
-        case .ballSpinFade:
-            return SSBallSpinFadeLoader()
-        case .lineSpinFade:
-            return SSLineSpinFadeLoader()
-        case .ballRotateChase:
-            return SSBallRotateChase()
-        case .circleStrokeSpin:
-            return SSCircleStrokeSpin()
         case .checkMark:
             return SSSuccessMark()
         case .failMark:
diff --git a/SSSpinnerButton/SSSpinnerButton/SpinnerButton/SSSpinnerButton.swift b/SSSpinnerButton/SSSpinnerButton/SpinnerButton/SSSpinnerButton.swift
index 9972180..9af61c2 100644
--- a/SSSpinnerButton/SSSpinnerButton/SpinnerButton/SSSpinnerButton.swift
+++ b/SSSpinnerButton/SSSpinnerButton/SpinnerButton/SSSpinnerButton.swift
@@ -9,14 +9,6 @@
 import Foundation
 import UIKit
 
-// MARK: - 
-extension CAGradientLayer {
-    convenience init(frame: CGRect) {
-        self.init()
-        self.frame = frame
-    }
-}
-
 public enum CompletionType {
     case none
     case success
@@ -26,8 +18,16 @@ public enum CompletionType {
 ///
 open class SSSpinnerButton: UIButton {
     // MARK: - Properties
-    internal var storedTitle: String?
-    internal var storedAttributedTitle: NSAttributedString?
+    internal var storedNormalTitle: String?
+    internal var storedSelectedTitle: String?
+    internal var storedDisableTitle: String?
+    internal var storedHighlitedTitle: String?
+    
+    internal var storedAttributedNormalTitle: NSAttributedString?
+    internal var storedAttributedSelectedTitle: NSAttributedString?
+    internal var storedAttributedDisableTitle: NSAttributedString?
+    internal var storedAttributedHighlitedTitle: NSAttributedString?
+    
     internal var storedBackgroundNormalImage: UIImage?
     internal var storedBackgroundSelectedImage: UIImage?
     internal var storedBackgroundDisabledImage: UIImage?
@@ -55,18 +55,48 @@ open class SSSpinnerButton: UIButton {
     
     var spinnerSize: UInt?
     /// Sets the button title for its normal state
-    public var title: String? {
+    public var normalTitle: String? {
         get {
             return self.title(for: .normal)
         }
         set {
+            
             self.setTitle(newValue, for: .normal)
         }
     }
     
+    /// Sets the button title for its selected state
+    public var selectedTitle: String? {
+        get {
+            return self.title(for: .selected)
+        }
+        set {
+            self.setTitle(newValue, for: .selected)
+        }
+    }
+    
+    /// Sets the button title for its disabled state
+    public var disabledTitle: String? {
+        get {
+            return self.title(for: .disabled)
+        }
+        set {
+            self.setTitle(newValue, for: .disabled)
+        }
+    }
+    
+    /// Sets the button title for its highlighted state
+    public var highlightedTitle: String? {
+        get {
+            return self.title(for: .highlighted)
+        }
+        set {
+            self.setTitle(newValue, for: .highlighted)
+        }
+    }
     
     /// Sets the button attributed title for its normal state
-    public var attributedTitle: NSAttributedString? {
+    public var attributedNormalTitle: NSAttributedString? {
         get {
             return self.attributedTitle(for: .normal)
         } set {
@@ -74,6 +104,33 @@ open class SSSpinnerButton: UIButton {
         }
     }
     
+    /// Sets the button attributed title for its normal state
+    public var attributedSelectedTitle: NSAttributedString? {
+        get {
+            return self.attributedTitle(for: .selected)
+        } set {
+            self.setAttributedTitle(newValue, for: .selected)
+        }
+    }
+
+    /// Sets the button attributed title for its normal state
+    public var attributedDisableTitle: NSAttributedString? {
+        get {
+            return self.attributedTitle(for: .disabled)
+        } set {
+            self.setAttributedTitle(newValue, for: .disabled)
+        }
+    }
+    
+    /// Sets the button attributed title for its normal state
+    public var attributedHighlitedTitle: NSAttributedString? {
+        get {
+            return self.attributedTitle(for: .highlighted)
+        } set {
+            self.setAttributedTitle(newValue, for: .highlighted)
+        }
+    }
+    
     /// Sets the button title color.
     public var titleColor: UIColor? {
         get {
@@ -101,25 +158,6 @@ open class SSSpinnerButton: UIButton {
     
     open override func layoutSubviews() {
         super.layoutSubviews()
-        clipsToBounds = true
-        gradientLayer.frame = self.bounds
-    }
-    
-    
-    /// Gradient 
-    internal lazy var gradientLayer: CAGradientLayer = {
-        let gradient = CAGradientLayer(frame: self.frame)
-        gradient.startPoint = CGPoint(x: 0.0, y: 0.0)
-        gradient.endPoint = CGPoint(x: 1.0, y: 1.0)
-        self.layer.insertSublayer(gradient, at: 0)
-        return gradient
-    }()
-    
-    /// Sets the colors for the gradient background
-    public var gradientColors: [UIColor]? {
-        willSet {
-            gradientLayer.colors = newValue?.map({$0.cgColor})
-        }
     }
     
 }
@@ -133,10 +171,18 @@ private extension SSSpinnerButton {
         if self.cornrRadius == 0 {
             self.cornrRadius = self.layer.cornerRadius
         }
+        if layer.sublayers != nil {
+            
+            for item in layer.sublayers! where item is CAGradientLayer {
+                
+                item.cornerRadius = self.cornrRadius
+                item.masksToBounds = true
+            }
+        }
         self.layer.cornerRadius = self.cornrRadius
         self.layer.masksToBounds = true
         
-        if self.image(for: .normal) != nil && self.title != nil {
+        if self.image(for: .normal) != nil && self.normalTitle != nil {
             let spacing: CGFloat = 10
             // the amount of spacing to appear between image and title\
             self.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: spacing)
@@ -178,6 +224,14 @@ public extension SSSpinnerButton {
         self.spinnerSize = spinnerSize
         
         self.layer.cornerRadius = self.frame.height / 2
+        if layer.sublayers != nil {
+            
+            for item in layer.sublayers! where item is CAGradientLayer {
+            
+                item.cornerRadius = self.frame.height / 2
+            
+            }
+        }
         self.collapseAnimation(complete: complete)
         
     }
@@ -233,31 +287,61 @@ private extension SSSpinnerButton {
     /// - Parameter complete: complation block (call after animation Stop)
     func collapseAnimation(complete: (() -> Void)?) {
         
-        storedTitle = title
-        title = ""
+        storedNormalTitle = normalTitle
+        normalTitle = nil
+        
+        storedSelectedTitle = selectedTitle
+        selectedTitle = nil
+        
+        storedDisableTitle = disabledTitle
+        disabledTitle = nil
+        
+        storedHighlitedTitle = highlightedTitle
+        highlightedTitle = nil
+        
+        storedAttributedNormalTitle = attributedNormalTitle
+        attributedNormalTitle = nil
+        
+        storedAttributedSelectedTitle = attributedSelectedTitle
+        attributedSelectedTitle = nil
+        
+        storedAttributedDisableTitle = attributedDisableTitle
+        attributedDisableTitle = nil
+        
+        storedAttributedHighlitedTitle = attributedHighlitedTitle
+        attributedHighlitedTitle = nil
+        
         
-        storedAttributedTitle = attributedTitle
-        attributedTitle = nil
         storedBackgroundNormalImage = self.backgroundImage(for: .normal)
         storedBackgroundDisabledImage = self.backgroundImage(for: .disabled)
         storedBackgroundSelectedImage = self.backgroundImage(for: .selected)
         storedBackgroundHighlightedImage = self.backgroundImage(for: .highlighted)
+        
         storedNormalImage = self.image(for: .normal)
         storedDisabledImage = self.image(for: .disabled)
         storedSelectedImage = self.image(for: .selected)
         storedHighlightedImage = self.image(for: .highlighted)
+        
         storedBackgroundColor = self.backgroundColor
+        
         self.setImage(nil, for: .normal)
         self.setImage(nil, for: .disabled)
         self.setImage(nil, for: .selected)
         self.setImage(nil, for: .highlighted)
         isUserInteractionEnabled = false
+        
         let animaton = CABasicAnimation(keyPath: "bounds.size.width")
         animaton.fromValue = bounds.width
         animaton.toValue =  bounds.height
         animaton.duration = animationDuration
         animaton.fillMode = kCAFillModeBoth
         animaton.isRemovedOnCompletion = false
+        if layer.sublayers != nil {
+            
+            for item in layer.sublayers! where item is CAGradientLayer {
+                item.add(animaton, forKey: animaton.keyPath)
+            }
+        }
         layer.add(animaton, forKey: animaton.keyPath)
         self.perform(#selector(startSpinner), with: nil, afterDelay: animationDuration)
         
@@ -285,13 +369,13 @@ private extension SSSpinnerButton {
             self.setDefaultDataToButton(complete: complete)
             break
         case .success:
-            let animation: SSSpinnerAnimationDelegate = SpinnerType.checkMark.animation()
+            let animation: SSSpinnerAnimationDelegate = SpinnerCompletionType.checkMark.animation()
             animation.setupSpinnerAnimation(layer: self.layer, frame: self.frame, color: self.spinnerColor, spinnerSize: self.spinnerSize)
         case .error:
-            let animation: SSSpinnerAnimationDelegate = SpinnerType.errorMark.animation()
+            let animation: SSSpinnerAnimationDelegate = SpinnerCompletionType.errorMark.animation()
             animation.setupSpinnerAnimation(layer: self.layer, frame: self.frame, color: self.spinnerColor, spinnerSize: self.spinnerSize)
         case .fail:
-            let animation: SSSpinnerAnimationDelegate = SpinnerType.failMark.animation()
+            let animation: SSSpinnerAnimationDelegate = SpinnerCompletionType.failMark.animation()
             animation.setupSpinnerAnimation(layer: self.layer, frame: self.frame, color: self.spinnerColor, spinnerSize: self.spinnerSize)
         }
         
@@ -311,34 +395,61 @@ private extension SSSpinnerButton {
     ///
     /// - Parameter complete: complation block (call after animation Stop)
     func setDefaultDataToButton(complete: (() -> Void)?) {
+        
+        
         self.removeAnimationLayer()
-        setTitle(storedTitle, for: .normal)
-        if self.storedAttributedTitle != nil {
-            self.setAttributedTitle(self.storedAttributedTitle, for: .normal)
+        self.setTitle(self.storedNormalTitle, for: .normal)
+        self.setTitle(self.storedSelectedTitle, for: .selected)
+        self.setTitle(self.storedDisableTitle, for: .disabled)
+        self.setTitle(self.storedHighlitedTitle, for: .highlighted)
+        
+        if self.storedAttributedNormalTitle != nil {
+            self.setAttributedTitle(self.storedAttributedNormalTitle, for: .normal)
+        }
+        
+        if self.storedAttributedSelectedTitle != nil {
+            self.setAttributedTitle(self.storedAttributedSelectedTitle, for: .selected)
+        }
+        
+        if self.storedAttributedDisableTitle != nil {
+            self.setAttributedTitle(self.storedAttributedDisableTitle, for: .disabled)
         }
+       
+        if self.storedAttributedHighlitedTitle != nil {
+            self.setAttributedTitle(self.storedAttributedHighlitedTitle, for: .highlighted)
+        }
+        
         self.setBackgroundImage(self.storedBackgroundNormalImage, for: .normal)
         self.setBackgroundImage(self.storedBackgroundDisabledImage, for: .disabled)
         self.setBackgroundImage(self.storedBackgroundSelectedImage, for: .selected)
         self.setBackgroundImage(self.storedBackgroundHighlightedImage, for: .highlighted)
-        self.setImage(storedNormalImage, for: .normal)
-        self.setImage(storedDisabledImage, for: .disabled)
-        self.setImage(storedSelectedImage, for: .selected)
-        self.setImage(storedHighlightedImage, for: .highlighted)
-        isUserInteractionEnabled = true
+        self.setImage(self.storedNormalImage, for: .normal)
+        self.setImage(self.storedDisabledImage, for: .disabled)
+        self.setImage(self.storedSelectedImage, for: .selected)
+        self.setImage(self.storedHighlightedImage, for: .highlighted)
+        self.isUserInteractionEnabled = true
         
         let animation = CABasicAnimation(keyPath: "bounds.size.width")
-        animation.fromValue = frame.height
-        animation.toValue = frame.width
-        animation.duration = animationDuration
+        animation.fromValue = self.frame.height
+        animation.toValue = self.frame.width
+        animation.duration = self.animationDuration
         animation.fillMode = kCAFillModeForwards
         animation.isRemovedOnCompletion = false
         
-        layer.add(animation, forKey: animation.keyPath)
-        isAnimating = false
+        self.layer.add(animation, forKey: animation.keyPath)
+        if self.layer.sublayers != nil {
+            
+            for item in self.layer.sublayers! where item is CAGradientLayer {
+                item.add(animation, forKey: animation.keyPath)
+                item.cornerRadius = self.cornrRadius
+            }
+        }
+        self.isAnimating = false
         self.layer.cornerRadius = self.cornrRadius
         if complete != nil {
             complete!()
-        }
+            }
+        
     }
     
     /// start spinner
diff --git a/SSSpinnerButton/ViewController.swift b/SSSpinnerButton/ViewController.swift
index 55411d7..96bc20d 100644
--- a/SSSpinnerButton/ViewController.swift
+++ b/SSSpinnerButton/ViewController.swift
@@ -19,7 +19,7 @@ class ViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+       
         // Do any additional setup after loading the view, typically from a nib.
     }
 
@@ -29,8 +29,7 @@ class ViewController: UIViewController {
     }
 
     @IBAction func onSpinnnerButtonClick(_ sender: SSSpinnerButton) {
-
-        
+        sender.isSelected = !sender.isSelected
         let arr: [SpinnerType] = [.ballClipRotate, .ballSpinFade, .lineSpinFade, .ballRotateChase, .circleStrokeSpin, .ballClipRotate, .ballSpinFade, .lineSpinFade, .ballRotateChase, .circleStrokeSpin]
         
         // MARK: Start Animating