Merge pull request #8 from ChiliLabs/feature/currentPageTintColor

add currentPageTintColor property

CHIPageControl.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'CHIPageControl'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = 'CHIPageControl is a set of cool animated page controls written in Swift to replace boring UIPageControl.'
 
   s.ios.deployment_target = '8.0'

CHIPageControl/CHIPageControlAji.swift

@@ -43,7 +43,6 @@ open class CHIPageControlAji: CHIBasePageControl {
     }
 
     override func updateNumberOfPages(_ count: Int) {
-        inactive.forEach() { $0.removeFromSuperlayer() }
         inactive = [CHILayer]()
         inactive = (0..<count).map {_ in
             let layer = CHILayer()
@@ -65,7 +64,7 @@ open class CHIPageControlAji: CHIBasePageControl {
         var frame = CGRect(x: x, y: y, width: self.diameter, height: self.diameter)
 
         active.cornerRadius = self.radius
-        active.backgroundColor = self.tintColor.cgColor
+        active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor
         active.frame = frame
 
         inactive.forEach() { layer in

CHIPageControl/CHIPageControlAleppo.swift

@@ -33,13 +33,7 @@ open class CHIPageControlAleppo: CHIBasePageControl {
 
     fileprivate var inactive = [CHILayer]()
 
-    fileprivate lazy var active: CHILayer = { [unowned self] in
-        let layer = CHILayer()
-        layer.backgroundColor = self.tintColor.cgColor
-        layer.cornerRadius = self.radius
-        self.layer.addSublayer(layer)
-        return layer
-    }()
+    fileprivate var active: CHILayer = CHILayer()
 
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
@@ -50,13 +44,14 @@ open class CHIPageControlAleppo: CHIBasePageControl {
     }
 
     override func updateNumberOfPages(_ count: Int) {
-        inactive.forEach() { $0.removeFromSuperlayer() }
         inactive = [CHILayer]()
         inactive = (0..<count).map {_ in
             let layer = CHILayer()
             self.layer.addSublayer(layer)
             return layer
         }
+        self.layer.addSublayer(active)
+
         setNeedsLayout()
         self.invalidateIntrinsicContentSize()
     }
@@ -86,7 +81,7 @@ open class CHIPageControlAleppo: CHIBasePageControl {
         var frame = CGRect(x: x, y: y, width: self.diameter, height: self.diameter)
 
         active.cornerRadius = self.radius
-        active.backgroundColor = self.tintColor.cgColor
+        active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor
         active.frame = frame
 
         inactive.forEach() { layer in

CHIPageControl/CHIPageControlChimayo.swift

@@ -32,7 +32,6 @@ open class CHIPageControlChimayo: CHIBasePageControl {
         return radius * 2
     }
 
-    fileprivate var active = CHILayer()
     fileprivate var inactive = [CHILayer]()
 
     required public init?(coder aDecoder: NSCoder) {
@@ -49,7 +48,6 @@ open class CHIPageControlChimayo: CHIBasePageControl {
     }
 
     override func updateNumberOfPages(_ count: Int) {
-        inactive.forEach() { $0.removeFromSuperlayer() }
         inactive = [CHILayer]()
         inactive = (0..<count).map {_ in
             let layer = CHILayer()

CHIPageControl/CHIPageControlFresno.swift

@@ -46,7 +46,6 @@ open class CHIPageControlFresno: CHIBasePageControl {
     }
 
     override func updateNumberOfPages(_ count: Int) {
-        elements.forEach() { $0.removeFromSuperlayer() }
         elements = [CHILayer]()
         elements = (0..<count).map {_ in
             let layer = CHILayer()
@@ -78,7 +77,7 @@ open class CHIPageControlFresno: CHIBasePageControl {
         }
 
         if let active = elements.first {
-            active.backgroundColor = self.tintColor.cgColor
+            active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor
             active.borderWidth = 0
         }
 

CHIPageControl/CHIPageControlJalapeno.swift

@@ -35,11 +35,7 @@ open class CHIPageControlJalapeno: CHIBasePageControl {
 
     fileprivate var inactive = [CHILayer]()
 
-    fileprivate lazy var active: CHILayer = { [unowned self] in
-        let layer = CHILayer()
-        layer.fillColor = self.tintColor.cgColor
-        return layer
-    }()
+    fileprivate var active: CHILayer = CHILayer()
 
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
@@ -50,7 +46,6 @@ open class CHIPageControlJalapeno: CHIBasePageControl {
     }
 
     override func updateNumberOfPages(_ count: Int) {
-        inactive.forEach() { $0.removeFromSuperlayer() }
         inactive = [CHILayer]()
         inactive = (0..<count).map {_ in
             let layer = CHILayer()
@@ -59,7 +54,6 @@ open class CHIPageControlJalapeno: CHIBasePageControl {
         }
 
         self.layer.addSublayer(active)
-
         setNeedsLayout()
         self.invalidateIntrinsicContentSize()
     }
@@ -143,7 +137,7 @@ open class CHIPageControlJalapeno: CHIBasePageControl {
             layer.frame = frame
             frame.origin.x += self.diameter + self.padding
         }
-        self.active.fillColor = self.tintColor.cgColor
+        self.active.fillColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor
         update(for: progress)
     }
 

CHIPageControl/CHIPageControlJaloro.swift

@@ -27,15 +27,6 @@ import UIKit
 
 open class CHIPageControlJaloro: CHIBasePageControl {
 
-    override open var tintColor: UIColor! {
-        didSet{
-            active.backgroundColor = tintColor.cgColor
-            inactive.forEach() {
-                $0.backgroundColor = tintColor.withAlphaComponent(0.5).cgColor
-            }
-        }
-    }
-
     @IBInspectable open var elementWidth: CGFloat = 20 {
         didSet {
             setNeedsLayout()
@@ -60,7 +51,6 @@ open class CHIPageControlJaloro: CHIBasePageControl {
     }
 
     override func updateNumberOfPages(_ count: Int) {
-        inactive.forEach() { $0.removeFromSuperlayer() }
         inactive = [CHILayer]()
         inactive = (0..<count).map {_ in
             let layer = CHILayer()
@@ -83,7 +73,7 @@ open class CHIPageControlJaloro: CHIBasePageControl {
         var frame = CGRect(x: x, y: y, width: self.elementWidth, height: self.elementHeight)
 
         active.cornerRadius = self.radius
-        active.backgroundColor = self.tintColor?.cgColor
+        active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor
         active.frame = frame
 
         inactive.forEach() { layer in

CHIPageControl/CHIPageControlPaprika.swift

@@ -79,7 +79,8 @@ open class CHIPageControlPaprika: CHIBasePageControl {
         }
 
         if let active = elements.first {
-            active.backgroundColor = self.tintColor.cgColor
+            active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor
+            active.borderWidth = 0
         }
 
         min = elements.first?.frame

CHIPageControl/CHIPageControlPuya.swift

@@ -46,7 +46,6 @@ open class CHIPageControlPuya: CHIBasePageControl {
     }
 
     override func updateNumberOfPages(_ count: Int) {
-        elements.forEach() { $0.removeFromSuperlayer() }
         elements = [CHILayer]()
         elements = (0..<count).map {_ in
             let layer = CHILayer()
@@ -78,7 +77,7 @@ open class CHIPageControlPuya: CHIBasePageControl {
         }
 
         if let active = elements.first {
-            active.backgroundColor = self.tintColor.cgColor
+            active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor
             active.borderWidth = 0
         }
 
@@ -112,6 +111,7 @@ open class CHIPageControlPuya: CHIBasePageControl {
         let offset = dist * percent
         guard let active = elements.first else { return }
         active.frame.origin.x = min.origin.x + offset
+        active.borderWidth = 0
 
         let index = page + 1
         guard elements.indices.contains(index) else { return }

CHIPageControl/Core/CHIBasePageControl.swift

@@ -83,7 +83,13 @@ import UIKit
             setNeedsLayout()
         }
     }
-
+
+    @IBInspectable open var currentPageTintColor: UIColor? {
+        didSet {
+            setNeedsLayout()
+        }
+    }
+
     internal var moveToProgress: Double?
 
     private var displayLink: CADisplayLink?

Example/Podfile

@@ -5,6 +5,6 @@ target 'Example' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
   use_frameworks!
 
-  pod 'CHIPageControl', :git => 'https://github.com/ChiliLabs/CHIPageControl.git'
+  pod 'CHIPageControl', :path => '../'
 
 end

README.md

@@ -25,13 +25,13 @@ Just add the `CHIPageControl` folder to your project.
 
 use [CocoaPods](https://cocoapods.org) with Podfile:
 ``` ruby
-pod 'CHIPageControl', '~> 0.0.2'
+pod 'CHIPageControl', '~> 0.0.3'
 ```
 ### Carthage
 
 use [Carthage](https://github.com/Carthage/Carthage) with Cartfile
 ```ogdl
-github "ChiliLabs/CHIPageControl" ~> 0.0.2
+github "ChiliLabs/CHIPageControl" ~> 0.0.3
 ```
 
 
@@ -45,6 +45,7 @@ let pageControl = CHIPageControlAji(frame: CGRect(x: 0, y:0, with: 100, height:
 pageControl.numberOfPages = 4
 pageControl.radius = 4
 pageControl.tintColor = .red
+pageControl.currentPageTintColor = .green
 pageControl.padding = 6
 ```
 ### Updating progress