Merge pull request #15 from simformsolutions/develop

Develop

Author: simform-solutions

SSSpinnerButton.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "SSSpinnerButton"
-  s.version      = "1.1.0"
+  s.version      = "1.1.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.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		5189267820C96E9F0016E3A0 /* SSFailMark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5189267720C96E9F0016E3A0 /* SSFailMark.swift */; };
-		519A451220C6A0FD00BD9352 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 51AAA5E420C64ED3000F4BCD /* Info.plist */; };
 		519A451320C6A15D00BD9352 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 51AAA5DC20C64ED3000F4BCD /* Main.storyboard */; };
 		51AAA5D920C64ED3000F4BCD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51AAA5D820C64ED3000F4BCD /* AppDelegate.swift */; };
 		51AAA5DB20C64ED3000F4BCD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51AAA5DA20C64ED3000F4BCD /* ViewController.swift */; };
@@ -214,7 +213,6 @@
 				519A451320C6A15D00BD9352 /* Main.storyboard in Resources */,
 				51AAA5E320C64ED3000F4BCD /* LaunchScreen.storyboard in Resources */,
 				51AAA5E020C64ED3000F4BCD /* Assets.xcassets in Resources */,
-				519A451220C6A0FD00BD9352 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

SSSpinnerButton.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

SSSpinnerButton/SSSpinnerButton/SpinnerButton/SSSpinnerButton.swift

@@ -27,6 +27,7 @@ public enum CompletionType {
 open class SSSpinnerButton: UIButton {
     // MARK: - Properties
     internal var storedTitle: String?
+    internal var storedAttributedTitle: NSAttributedString?
     internal var storedBackgroundNormalImage: UIImage?
     internal var storedBackgroundSelectedImage: UIImage?
     internal var storedBackgroundDisabledImage: UIImage?
@@ -63,6 +64,16 @@ open class SSSpinnerButton: UIButton {
         }
     }
 
+    
+    /// Sets the button attributed title for its normal state
+    public var attributedTitle: NSAttributedString? {
+        get {
+            return self.attributedTitle(for: .normal)
+        } set {
+            self.setAttributedTitle(newValue, for: .normal)
+        }
+    }
+    
     /// Sets the button title color.
     public var titleColor: UIColor? {
         get {
@@ -224,6 +235,9 @@ private extension SSSpinnerButton {
 
         storedTitle = title
         title = ""
+        
+        storedAttributedTitle = attributedTitle
+        attributedTitle = nil
         storedBackgroundNormalImage = self.backgroundImage(for: .normal)
         storedBackgroundDisabledImage = self.backgroundImage(for: .disabled)
         storedBackgroundSelectedImage = self.backgroundImage(for: .selected)
@@ -299,6 +313,9 @@ private extension SSSpinnerButton {
     func setDefaultDataToButton(complete: (() -> Void)?) {
         self.removeAnimationLayer()
         setTitle(storedTitle, for: .normal)
+        if self.storedAttributedTitle != nil {
+            self.setAttributedTitle(self.storedAttributedTitle, for: .normal)
+        }
         self.setBackgroundImage(self.storedBackgroundNormalImage, for: .normal)
         self.setBackgroundImage(self.storedBackgroundDisabledImage, for: .disabled)
         self.setBackgroundImage(self.storedBackgroundSelectedImage, for: .selected)

SSSpinnerButton/ViewController.swift

@@ -30,6 +30,7 @@ class ViewController: UIViewController {
 
     @IBAction func onSpinnnerButtonClick(_ sender: SSSpinnerButton) {
 
+        
         let arr: [SpinnerType] = [.ballClipRotate, .ballSpinFade, .lineSpinFade, .ballRotateChase, .circleStrokeSpin, .ballClipRotate, .ballSpinFade, .lineSpinFade, .ballRotateChase, .circleStrokeSpin]
 
         // MARK: Start Animating