Merge pull request #2 from RomanPodymov/master

A small refactoring

Author: firmach

ACSlider/Classes/ACSlider.swift

@@ -37,8 +37,8 @@ public final class ACSlider: UIControl {
     }()
 
 
-    private let minTrackView: UIView = ACSlider.prepareTrackView()
-    private let maxTrackView: UIView = ACSlider.prepareTrackView()
+    private let minTrackView = ACSlider.prepareTrackView()
+    private let maxTrackView = ACSlider.prepareTrackView()
 
     private static func prepareTrackView() -> UIView {
         let view = UIView(frame: .zero)

ACSlider/Classes/ThumbView.swift

@@ -25,22 +25,22 @@ final class ThumbView: UIView {
 
     // MARK: -
 
-    private var valueLabel: UILabel = {
+    private let valueLabel: UILabel = {
         let label = UILabel(frame: .zero)
         label.textAlignment = .center
         label.text = "00"
 
         return label
     }()
 
-    private var titleLabel: UILabel = {
+    private let titleLabel: UILabel = {
         let label = UILabel(frame: .zero)
         label.textAlignment = .center
 
         return label
     }()
 
-    private var thumbView: UIView = {
+    private let thumbView: UIView = {
         return CircleView(frame: .zero)
     }()
 
@@ -71,10 +71,7 @@ final class ThumbView: UIView {
         addSubview(thumbView)
 
         configureLayout()
-        
-        valueLabel.textColor = tintColor
-        titleLabel.textColor = tintColor
-        thumbView.tintColor = tintColor
+        configureTintColor()
 
         thumbView.transform = CGAffineTransform(scaleX: 0,
                                                 y: 0)
@@ -100,7 +97,10 @@ final class ThumbView: UIView {
 
     override func tintColorDidChange() {
         super.tintColorDidChange()
-        
+        configureTintColor()
+    }
+    
+    private func configureTintColor() {
         valueLabel.textColor = tintColor
         titleLabel.textColor = tintColor
         thumbView.tintColor = tintColor
@@ -111,21 +111,25 @@ final class ThumbView: UIView {
 
     func animateTrackingBegin() {
         UIView.animateEasy {
-            self.valueLabel.transform = CGAffineTransform(translationX: 0, y: -50)
-            self.thumbView.transform = CGAffineTransform.identity
-            self.thumbView.alpha = 1
+            self.animateTracking(valueLabelTransform: CGAffineTransform(translationX: 0, y: -50),
+                                 thumbViewTransform: .identity,
+                                 thumbViewAlpha: 1)
         }
     }
 
     func animateTrackingEnd() {
         UIView.animateEasy {
-            self.valueLabel.transform = CGAffineTransform.identity
-            self.thumbView.transform = CGAffineTransform(scaleX: 0,
-                                                         y: 0)
-            self.thumbView.alpha = 0
+            self.animateTracking(valueLabelTransform: .identity,
+                                 thumbViewTransform: CGAffineTransform(scaleX: 0, y: 0),
+                                 thumbViewAlpha: 0)
         }
     }
 
+    private func animateTracking(valueLabelTransform: CGAffineTransform, thumbViewTransform: CGAffineTransform, thumbViewAlpha: CGFloat) {
+        self.valueLabel.transform = valueLabelTransform
+        self.thumbView.transform = thumbViewTransform
+        self.thumbView.alpha = thumbViewAlpha
+    }
 }
 
 

Example/ACSlider.xcodeproj/project.pbxproj

@@ -211,7 +211,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-ACSlider_Example/Pods-ACSlider_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-ACSlider_Example/Pods-ACSlider_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/ACSlider/ACSlider.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -220,7 +220,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ACSlider_Example/Pods-ACSlider_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ACSlider_Example/Pods-ACSlider_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - ACSlider (1.0.0)
+  - ACSlider (1.0.2)
 
 DEPENDENCIES:
   - ACSlider (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ACSlider: bbc8641182c97c7ae40dead275183dec880079f1
+  ACSlider: dfc421d970c21c2546f1cfb3b2d6fa241bca1c43
 
 PODFILE CHECKSUM: 9369b59a92972a0bcc86321dd5a8a2e36da80f40
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0