Merge pull request #52 from SimformSolutionsPvtLtd/develop

Develop

Author: bhargavbajani-simformsolutions

README.md

@@ -81,7 +81,7 @@ SSSpinnerButton is a versatile library for iOS developers, written in Swift, tha
      
      **To Change the RippleEffect**
 
-        button.setRippleEffect(rippleEffectAnimationDuration: Double, initialOpacity: Double, rippleEffectColor: UIColor, rippleEffectPercent: Double, initalRippleEffectPercent: Double)
+        button.setRippleEffect(rippleEffectAnimationDuration: Double, initialOpacity: Double, rippleEffectColor: UIColor, rippleEffectPercent: Double, initialRippleEffectPercent: Double)
 
 # Migration
 **Version 3.0.1**

SSSpinnerButton Demo/Base.lproj/Main.storyboard

@@ -36,7 +36,7 @@
                                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 </state>
                                                 <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="cornrRadius">
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                                         <real key="value" value="10"/>
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
@@ -238,24 +238,6 @@
             </objects>
             <point key="canvasLocation" x="1608.6956521739132" y="21.428571428571427"/>
         </scene>
-        <!--View Controller-->
-        <scene sceneID="vFC-gR-D9D">
-            <objects>
-                <viewController modalPresentationStyle="fullScreen" id="mLP-3M-IlK" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Z0W-Nf-uIL"/>
-                        <viewControllerLayoutGuide type="bottom" id="hMo-eG-eFa"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Olu-jz-NGk">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="3Jl-aI-SX3" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-443" y="144"/>
-        </scene>
         <!--Navigation Controller-->
         <scene sceneID="AlF-cJ-MGF">
             <objects>

SSSpinnerButton Demo/ViewController.swift

@@ -21,7 +21,7 @@ class ViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        btnRippleEffect.setRippleEffect(rippleEffectAnimationDuration: 0.3, initialOpacity: 0.5, rippleEffectColor: .black, rippleEffectPercent: 0.45, initalRippleEffectPercent: 0.3)
+        btnRippleEffect.setRippleEffect(rippleEffectAnimationDuration: 0.3, initialOpacity: 0.5, rippleEffectColor: .black, rippleEffectPercent: 0.45, initialRippleEffectPercent: 0.3)
         // Do any additional setup after loading the view, typically from a nib.
     }
 

SSSpinnerButton.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "SSSpinnerButton"
-  s.version      = "3.2.0"
+  s.version      = "3.2.1"
   s.summary      = "SSSpinnerButton is an elegant button with a different spinner animations."
 
   #s.description  = "SSSpinnerButton is an elegant button with a different spinner animations."

SSSpinnerButton/Info.plist

@@ -26,7 +26,10 @@
 	<false/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 </dict>
 </plist>

SSSpinnerButton/SpinerShapes/SpinnerAnimationDelegate/SpinnerAnimationDelegate.swift

@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 
 /// 
-protocol SSSpinnerAnimationDelegate {
+protocol SSSpinnerAnimationDelegate: AnyObject {
 
     /// setup spinner layer
     ///

SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSBallRotateChase.swift

@@ -76,7 +76,7 @@ class SSBallRotateChase: SSSpinnerAnimationDelegate {
         positionAnimation.repeatCount = HUGE
         positionAnimation.path = UIBezierPath(arcCenter: CGPoint(x: x, y: y), radius: size.width / 2, startAngle: CGFloat(3 * Double.pi * 0.5), endAngle: CGFloat(3 * Double.pi * 0.5 + 2 * Double.pi), clockwise: true).cgPath
 
-        // Aniamtion
+        // Animation
         let animation = CAAnimationGroup()
         animation.animations = [scaleAnimation, positionAnimation]
         animation.timingFunction = timeFunc

SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSBallSpinFadeLoader.swift

@@ -43,16 +43,16 @@ class SSBallSpinFadeLoader: SSSpinnerAnimationDelegate {
         scaleAnimation.duration = duration
 
         // Opacity animation
-        let opacityAnimaton = CAKeyframeAnimation(keyPath: "opacity")
+        let opacityAnimation = CAKeyframeAnimation(keyPath: "opacity")
 
-        opacityAnimaton.keyTimes = [0, 0.5, 1]
-        opacityAnimaton.values = [1, 0.3, 1]
-        opacityAnimaton.duration = duration
+        opacityAnimation.keyTimes = [0, 0.5, 1]
+        opacityAnimation.values = [1, 0.3, 1]
+        opacityAnimation.duration = duration
 
         // Animation
         let animation = CAAnimationGroup()
 
-        animation.animations = [scaleAnimation, opacityAnimaton]
+        animation.animations = [scaleAnimation, opacityAnimation]
         animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
         animation.duration = duration
         animation.repeatCount = HUGE

SSSpinnerButton/SpinnerButton/SSSpinnerButton.swift

@@ -21,18 +21,18 @@ open class SSSpinnerButton: UIButton {
     internal var storedNormalTitle: String?
     internal var storedSelectedTitle: String?
     internal var storedDisableTitle: String?
-    internal var storedHighlitedTitle: String?
+    internal var storedHighlightedTitle: String?
 
     public var rippleEffectAnimationDuration = 0.0
     public var initialOpacity = 0.0
     public var rippleEffectColor = UIColor.white
     public var rippleEffectPercent = CGFloat(0.0)
-    public var initalRippleEffectPercent: CGFloat = CGFloat(0.0)
+    public var initialRippleEffectPercent: CGFloat = CGFloat(0.0)
 
     internal var storedAttributedNormalTitle: NSAttributedString?
     internal var storedAttributedSelectedTitle: NSAttributedString?
     internal var storedAttributedDisableTitle: NSAttributedString?
-    internal var storedAttributedHighlitedTitle: NSAttributedString?
+    internal var storedAttributedHighlightedTitle: NSAttributedString?
 
     internal var storedBackgroundNormalImage: UIImage?
     internal var storedBackgroundSelectedImage: UIImage?
@@ -49,20 +49,17 @@ open class SSSpinnerButton: UIButton {
     fileprivate var isAnimating: Bool = false
 
     fileprivate var spinnerType: SpinnerType = Config.spinnerType
-    
-    fileprivate var storedWidth: CGFloat?
-    fileprivate var storedHeight: CGFloat?
-    
+
     /// Sets the button corner radius
-    @IBInspectable var cornrRadius: CGFloat = 0 {
+    @IBInspectable var cornerRadius: CGFloat = 0 {
         willSet {
             layer.cornerRadius = newValue
         }
     }
     @IBInspectable var setRippleEffect: Bool = false {
         didSet {
             if setRippleEffect {
-                self.setRippleEffect(rippleEffectAnimationDuration: 0.3, initialOpacity: 0.5, rippleEffectColor: rippleEffectColor, rippleEffectPercent: 0.45, initalRippleEffectPercent: 0.3)
+                self.setRippleEffect(rippleEffectAnimationDuration: 0.3, initialOpacity: 0.5, rippleEffectColor: rippleEffectColor, rippleEffectPercent: 0.45, initialRippleEffectPercent: 0.3)
             }
         }
     }
@@ -143,7 +140,7 @@ open class SSSpinnerButton: UIButton {
     }
 
     /// Sets the button attributed title for its normal state
-    public var attributedHighlitedTitle: NSAttributedString? {
+    public var attributedHighlightedTitle: NSAttributedString? {
         get {
             return self.attributedTitle(for: .highlighted)
         } set {
@@ -179,12 +176,12 @@ open class SSSpinnerButton: UIButton {
 
 public extension SSSpinnerButton {
 
-    func setRippleEffect(rippleEffectAnimationDuration: Double, initialOpacity: Double,rippleEffectColor: UIColor,rippleEffectPercent: CGFloat,initalRippleEffectPercent: CGFloat) {
+    func setRippleEffect(rippleEffectAnimationDuration: Double, initialOpacity: Double,rippleEffectColor: UIColor,rippleEffectPercent: CGFloat,initialRippleEffectPercent: CGFloat) {
         self.rippleEffectAnimationDuration = rippleEffectAnimationDuration
         self.initialOpacity = initialOpacity
         self.rippleEffectColor = rippleEffectColor
         self.rippleEffectPercent = rippleEffectPercent
-        self.initalRippleEffectPercent = initalRippleEffectPercent
+        self.initialRippleEffectPercent = initialRippleEffectPercent
     }
 }
 
@@ -199,7 +196,7 @@ public extension SSSpinnerButton{
         shapeLayer = CAShapeLayer()
         // let center = CGPoint(x: bounds.width/CGFloat(Constants.TWO), y: bounds.height/CGFloat(Constants.TWO))
         let diagnolLength = sqrt(bounds.width*bounds.width + bounds.height*bounds.height)
-        let path = UIBezierPath(arcCenter: touch.location(in: self), radius: 0.5*diagnolLength*initalRippleEffectPercent, startAngle: CGFloat(0), endAngle: (CGFloat(Double(360) * .pi) / CGFloat(180)), clockwise: true)
+        let path = UIBezierPath(arcCenter: touch.location(in: self), radius: 0.5*diagnolLength*initialRippleEffectPercent, startAngle: CGFloat(0), endAngle: (CGFloat(Double(360) * .pi) / CGFloat(180)), clockwise: true)
         shapeLayer.path = path.cgPath
         shapeLayer.opacity = Float(initialOpacity)
         shapeLayer.fillColor = rippleEffectColor.cgColor
@@ -209,7 +206,7 @@ public extension SSSpinnerButton{
         layer.addSublayer(shapeLayer)
         let circleEnlargeAnimation = CABasicAnimation(keyPath: "transform.scale")
         circleEnlargeAnimation.fromValue = 1
-        circleEnlargeAnimation.toValue = rippleEffectPercent/initalRippleEffectPercent
+        circleEnlargeAnimation.toValue = rippleEffectPercent/initialRippleEffectPercent
         circleEnlargeAnimation.duration = Double(rippleEffectAnimationDuration) * 0.7
         circleEnlargeAnimation.fillMode = CAMediaTimingFillMode.forwards
         circleEnlargeAnimation.isRemovedOnCompletion = false
@@ -240,18 +237,18 @@ private extension SSSpinnerButton {
     func setUp() {
 
         self.removeAnimationLayer()
-        if self.cornrRadius == 0 {
-            self.cornrRadius = self.layer.cornerRadius
+        if self.cornerRadius == 0 {
+            self.cornerRadius = self.layer.cornerRadius
         }
         if layer.sublayers != nil {
 
             for item in layer.sublayers! where item is CAGradientLayer {
 
-                item.cornerRadius = self.cornrRadius
+                item.cornerRadius = self.cornerRadius
                 item.masksToBounds = true
             }
         }
-        self.layer.cornerRadius = self.cornrRadius
+        self.layer.cornerRadius = self.cornerRadius
         self.layer.masksToBounds = true
 
         if self.image(for: .normal) != nil && self.normalTitle != nil {
@@ -285,8 +282,8 @@ public extension SSSpinnerButton {
     ///   - spinnerSize: size of spinner layer
     ///   - complete: complation block (call after animation start)
     func startAnimate(spinnerType: SpinnerType = Config.spinnerType, spinnercolor: UIColor = Config.spinnerColor, spinnerSize: UInt? = nil, complete: (() -> Void)?) {
-        if self.cornrRadius == 0 {
-            self.cornrRadius = self.layer.cornerRadius
+        if self.cornerRadius == 0 {
+            self.cornerRadius = self.layer.cornerRadius
         }
 
         self.removeAnimationLayer()
@@ -368,7 +365,7 @@ private extension SSSpinnerButton {
         storedDisableTitle = disabledTitle
         disabledTitle = nil
 
-        storedHighlitedTitle = highlightedTitle
+        storedHighlightedTitle = highlightedTitle
         highlightedTitle = nil
 
         storedAttributedNormalTitle = attributedNormalTitle
@@ -380,8 +377,8 @@ private extension SSSpinnerButton {
         storedAttributedDisableTitle = attributedDisableTitle
         attributedDisableTitle = nil
 
-        storedAttributedHighlitedTitle = attributedHighlitedTitle
-        attributedHighlitedTitle = nil
+        storedAttributedHighlightedTitle = attributedHighlightedTitle
+        attributedHighlightedTitle = nil
 
 
         storedBackgroundNormalImage = self.backgroundImage(for: .normal)
@@ -395,28 +392,25 @@ private extension SSSpinnerButton {
         storedHighlightedImage = self.image(for: .highlighted)
 
         storedBackgroundColor = self.backgroundColor
-        storedWidth = frame.width
-        storedHeight = frame.height
-        
         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 = CAMediaTimingFillMode.both
-        animaton.isRemovedOnCompletion = false
+        let animation = CABasicAnimation(keyPath: "bounds.size.width")
+        animation.fromValue = bounds.width
+        animation.toValue =  bounds.height
+        animation.duration = animationDuration
+        animation.fillMode = CAMediaTimingFillMode.both
+        animation.isRemovedOnCompletion = false
         if layer.sublayers != nil {
 
             for item in layer.sublayers! where item is CAGradientLayer {
-                item.add(animaton, forKey: animaton.keyPath)
+                item.add(animation, forKey: animation.keyPath)
             }
         }
-        layer.add(animaton, forKey: animaton.keyPath)
+        layer.add(animation, forKey: animation.keyPath)
         self.perform(#selector(startSpinner), with: nil, afterDelay: animationDuration)
 
         DispatchQueue.main.asyncAfter(deadline: .now() + animationDuration, execute: {
@@ -480,7 +474,7 @@ private extension SSSpinnerButton {
         self.setTitle(self.storedNormalTitle, for: .normal)
         self.setTitle(self.storedSelectedTitle, for: .selected)
         self.setTitle(self.storedDisableTitle, for: .disabled)
-        self.setTitle(self.storedHighlitedTitle, for: .highlighted)
+        self.setTitle(self.storedHighlightedTitle, for: .highlighted)
 
         if self.storedAttributedNormalTitle != nil {
             self.setAttributedTitle(self.storedAttributedNormalTitle, for: .normal)
@@ -494,8 +488,8 @@ private extension SSSpinnerButton {
             self.setAttributedTitle(self.storedAttributedDisableTitle, for: .disabled)
         }
 
-        if self.storedAttributedHighlitedTitle != nil {
-            self.setAttributedTitle(self.storedAttributedHighlitedTitle, for: .highlighted)
+        if self.storedAttributedHighlightedTitle != nil {
+            self.setAttributedTitle(self.storedAttributedHighlightedTitle, for: .highlighted)
         }
 
         self.setBackgroundImage(self.storedBackgroundNormalImage, for: .normal)
@@ -509,8 +503,6 @@ private extension SSSpinnerButton {
         self.isUserInteractionEnabled = true
 
         let animation = CABasicAnimation(keyPath: "bounds.size.width")
-        animation.fromValue = storedHeight
-        animation.toValue = storedWidth
         animation.duration = self.animationDuration
         animation.fillMode = CAMediaTimingFillMode.forwards
         animation.isRemovedOnCompletion = false
@@ -520,11 +512,11 @@ private extension SSSpinnerButton {
 
             for item in self.layer.sublayers! where item is CAGradientLayer {
                 item.add(animation, forKey: animation.keyPath)
-                item.cornerRadius = self.cornrRadius
+                item.cornerRadius = self.cornerRadius
             }
         }
         self.isAnimating = false
-        self.layer.cornerRadius = self.cornrRadius
+        self.layer.cornerRadius = self.cornerRadius
         if complete != nil {
             complete!()
             }