Merge pull request #19 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.2"
+  s.version      = "2.0.0"
   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

@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5189267820C96E9F0016E3A0 /* SSFailMark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5189267720C96E9F0016E3A0 /* SSFailMark.swift */; };
 		519A451320C6A15D00BD9352 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 51AAA5DC20C64ED3000F4BCD /* Main.storyboard */; };
+		519BCB68219A946600F50E26 /* SSFailMark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519BCB67219A946600F50E26 /* SSFailMark.swift */; };
 		51AAA5D920C64ED3000F4BCD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51AAA5D820C64ED3000F4BCD /* AppDelegate.swift */; };
 		51AAA5DB20C64ED3000F4BCD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51AAA5DA20C64ED3000F4BCD /* ViewController.swift */; };
 		51AAA5E020C64ED3000F4BCD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 51AAA5DF20C64ED3000F4BCD /* Assets.xcassets */; };
@@ -30,7 +30,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		5189267720C96E9F0016E3A0 /* SSFailMark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SSFailMark.swift; path = SSSpinnerButton/SSSpinnerButton/SpinerShapes/SSFailMark.swift; sourceTree = SOURCE_ROOT; };
+		519BCB67219A946600F50E26 /* SSFailMark.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSFailMark.swift; sourceTree = "<group>"; };
 		51AAA5D520C64ED3000F4BCD /* SSSpinnerButton.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SSSpinnerButton.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		51AAA5D820C64ED3000F4BCD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		51AAA5DA20C64ED3000F4BCD /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -129,12 +129,12 @@
 		51AAA5F020C64EF0000F4BCD /* SpinnerShapeWithAnimation */ = {
 			isa = PBXGroup;
 			children = (
+				519BCB67219A946600F50E26 /* SSFailMark.swift */,
 				51AAA5F120C64EF0000F4BCD /* SSBallRotateChase.swift */,
 				51AAA5F220C64EF0000F4BCD /* SSBallSpinFadeLoader.swift */,
 				51AAA5F320C64EF0000F4BCD /* SSCircleStrokeSpin.swift */,
 				51AAA5F420C64EF0000F4BCD /* SSLineSpinFadeLoader.swift */,
 				51AAA5F520C64EF0000F4BCD /* SSSpinnerBallClipRotate.swift */,
-				5189267720C96E9F0016E3A0 /* SSFailMark.swift */,
 				730FA84E2136AD4800F6116F /* SSSuccessMark.swift */,
 				737852F82137B12B005A1EA6 /* SSErrorMark.swift */,
 			);
@@ -177,11 +177,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Simform Solutions";
 				TargetAttributes = {
 					51AAA5D420C64ED3000F4BCD = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -248,12 +249,12 @@
 				51AAA5D920C64ED3000F4BCD /* AppDelegate.swift in Sources */,
 				51AAA5FB20C64EF0000F4BCD /* spinnerShape.swift in Sources */,
 				51AAA60220C64EF0000F4BCD /* SSSpinnerButton.swift in Sources */,
+				519BCB68219A946600F50E26 /* SSFailMark.swift in Sources */,
 				51AAA5FE20C64EF0000F4BCD /* SSCircleStrokeSpin.swift in Sources */,
 				51AAA5FD20C64EF0000F4BCD /* SSBallSpinFadeLoader.swift in Sources */,
 				51AAA60120C64EF0000F4BCD /* SpinnerTypes.swift in Sources */,
 				737852FB2137C745005A1EA6 /* Extensions.swift in Sources */,
 				51AAA5FF20C64EF0000F4BCD /* SSLineSpinFadeLoader.swift in Sources */,
-				5189267820C96E9F0016E3A0 /* SSFailMark.swift in Sources */,
 				51AAA5F920C64EF0000F4BCD /* SpinnerAnimationDelegate.swift in Sources */,
 				51AAA60020C64EF0000F4BCD /* SSSpinnerBallClipRotate.swift in Sources */,
 			);
@@ -295,13 +296,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -352,13 +355,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -399,7 +404,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.simform.SSSpinnerButton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -415,7 +420,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.simform.SSSpinnerButton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -434,13 +439,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -488,7 +495,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.simform.SSSpinnerButton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Analyze;

SSSpinnerButton/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSBallSpinFadeLoader.swift

@@ -53,7 +53,7 @@ class SSBallSpinFadeLoader: SSSpinnerAnimationDelegate {
         let animation = CAAnimationGroup()
 
         animation.animations = [scaleAnimation, opacityAnimaton]
-        animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
+        animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
         animation.duration = duration
         animation.repeatCount = HUGE
         animation.isRemovedOnCompletion = false

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSCircleStrokeSpin.swift

@@ -34,7 +34,7 @@ class SSCircleStrokeSpin: SSSpinnerAnimationDelegate {
 
         let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation")
         rotationAnimation.byValue = Float.pi * 2
-        rotationAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
+        rotationAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
 
         let strokeEndAnimation = CABasicAnimation(keyPath: "strokeEnd")
         strokeEndAnimation.duration = strokeEndDuration
@@ -54,7 +54,7 @@ class SSCircleStrokeSpin: SSSpinnerAnimationDelegate {
         groupAnimation.duration = strokeStartDuration + beginTime
         groupAnimation.repeatCount = .infinity
         groupAnimation.isRemovedOnCompletion = false
-        groupAnimation.fillMode = kCAFillModeForwards
+        groupAnimation.fillMode = CAMediaTimingFillMode.forwards
 
         let circle = SpinnerShape.stroke.layerWith(size: CGSize(width: sizeValue, height: sizeValue), color: color)
         let frame = CGRect(

…nnerButton/SpinerShapes/SSFailMark.swift …innerShapeWithAnimation/SSFailMark.swiftSSSpinnerButton/SSSpinnerButton/SpinerShapes/SSFailMark.swift renamed to SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSFailMark.swift SSSpinnerButton/SSSpinnerButton/SpinerShapes/SSFailMark.swift renamed to SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSFailMark.swift

@@ -32,7 +32,7 @@ class SSLineSpinFadeLoader: SSSpinnerAnimationDelegate {
         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]
-        let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+        let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
 
         // Animation
         let animation = CAKeyframeAnimation(keyPath: "opacity")

SSSpinnerButton/SSSpinnerButton/SpinerShapes/SpinnerShapeWithAnimation/SSLineSpinFadeLoader.swift

@@ -55,6 +55,7 @@ open class SSSpinnerButton: UIButton {
 
     var spinnerSize: UInt?
     /// Sets the button title for its normal state
+    
     public var normalTitle: String? {
         get {
             return self.title(for: .normal)
@@ -131,16 +132,6 @@ open class SSSpinnerButton: UIButton {
         }
     }
 
-    /// Sets the button title color.
-    public var titleColor: UIColor? {
-        get {
-            return self.titleColor
-        }
-        set {
-            self.setTitleColor(newValue, for: .normal)
-        }
-    }
-    
     // MARK: - Initializers
     public required init(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)!
@@ -334,7 +325,7 @@ private extension SSSpinnerButton {
         animaton.fromValue = bounds.width
         animaton.toValue =  bounds.height
         animaton.duration = animationDuration
-        animaton.fillMode = kCAFillModeBoth
+        animaton.fillMode = CAMediaTimingFillMode.both
         animaton.isRemovedOnCompletion = false
         if layer.sublayers != nil {
 
@@ -433,7 +424,7 @@ private extension SSSpinnerButton {
         animation.fromValue = self.frame.height
         animation.toValue = self.frame.width
         animation.duration = self.animationDuration
-        animation.fillMode = kCAFillModeForwards
+        animation.fillMode = CAMediaTimingFillMode.forwards
         animation.isRemovedOnCompletion = false
 
         self.layer.add(animation, forKey: animation.keyPath)