Merge pull request #8 from ChiliLabs/feature/currentPageTintColor

chili-ios · web-flow · commit 827266f78591 · 2017-03-20T17:16:10.000+02:00
add currentPageTintColor property
diff --git a/CHIPageControl.podspec b/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'
diff --git a/CHIPageControl/CHIPageControlAji.swift b/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
diff --git a/CHIPageControl/CHIPageControlAleppo.swift b/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
diff --git a/CHIPageControl/CHIPageControlChimayo.swift b/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()
diff --git a/CHIPageControl/CHIPageControlFresno.swift b/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
         }
 
diff --git a/CHIPageControl/CHIPageControlJalapeno.swift b/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)
     }
     
diff --git a/CHIPageControl/CHIPageControlJaloro.swift b/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
diff --git a/CHIPageControl/CHIPageControlPaprika.swift b/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
diff --git a/CHIPageControl/CHIPageControlPuya.swift b/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 }
diff --git a/CHIPageControl/Core/CHIBasePageControl.swift b/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?
diff --git a/Example/Podfile b/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
diff --git a/README.md b/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

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ open class CHIPageControlChimayo: CHIBasePageControl {`
`32`	`32`	`return radius * 2`
`33`	`33`	`}`
`34`	`34`
`35`		`- fileprivate var active = CHILayer()`
`36`	`35`	`fileprivate var inactive = [CHILayer]()`
`37`	`36`
`38`	`37`	`required public init?(coder aDecoder: NSCoder) {`
`@@ -49,7 +48,6 @@ open class CHIPageControlChimayo: CHIBasePageControl {`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`override func updateNumberOfPages(_ count: Int) {`
`52`		`- inactive.forEach() { $0.removeFromSuperlayer() }`
`53`	`51`	`inactive = [CHILayer]()`
`54`	`52`	`inactive = (0..<count).map {_ in`
`55`	`53`	`let layer = CHILayer()`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ open class CHIPageControlFresno: CHIBasePageControl {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`override func updateNumberOfPages(_ count: Int) {`
`49`		`- elements.forEach() { $0.removeFromSuperlayer() }`
`50`	`49`	`elements = [CHILayer]()`
`51`	`50`	`elements = (0..<count).map {_ in`
`52`	`51`	`let layer = CHILayer()`
`@@ -78,7 +77,7 @@ open class CHIPageControlFresno: CHIBasePageControl {`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`if let active = elements.first {`
`81`		`- active.backgroundColor = self.tintColor.cgColor`
	`80`	`+ active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor`
`82`	`81`	`active.borderWidth = 0`
`83`	`82`	`}`
`84`	`83`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,7 @@ open class CHIPageControlJalapeno: CHIBasePageControl {`
`35`	`35`
`36`	`36`	`fileprivate var inactive = [CHILayer]()`
`37`	`37`
`38`		`- fileprivate lazy var active: CHILayer = { [unowned self] in`
`39`		`- let layer = CHILayer()`
`40`		`- layer.fillColor = self.tintColor.cgColor`
`41`		`- return layer`
`42`		`- }()`
	`38`	`+ fileprivate var active: CHILayer = CHILayer()`
`43`	`39`
`44`	`40`	`required public init?(coder aDecoder: NSCoder) {`
`45`	`41`	`super.init(coder: aDecoder)`
`@@ -50,7 +46,6 @@ open class CHIPageControlJalapeno: CHIBasePageControl {`
`50`	`46`	`}`
`51`	`47`
`52`	`48`	`override func updateNumberOfPages(_ count: Int) {`
`53`		`- inactive.forEach() { $0.removeFromSuperlayer() }`
`54`	`49`	`inactive = [CHILayer]()`
`55`	`50`	`inactive = (0..<count).map {_ in`
`56`	`51`	`let layer = CHILayer()`
`@@ -59,7 +54,6 @@ open class CHIPageControlJalapeno: CHIBasePageControl {`
`59`	`54`	`}`
`60`	`55`
`61`	`56`	`self.layer.addSublayer(active)`
`62`		`-`
`63`	`57`	`setNeedsLayout()`
`64`	`58`	`self.invalidateIntrinsicContentSize()`
`65`	`59`	`}`
`@@ -143,7 +137,7 @@ open class CHIPageControlJalapeno: CHIBasePageControl {`
`143`	`137`	`layer.frame = frame`
`144`	`138`	`frame.origin.x += self.diameter + self.padding`
`145`	`139`	`}`
`146`		`- self.active.fillColor = self.tintColor.cgColor`
	`140`	`+ self.active.fillColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor`
`147`	`141`	`update(for: progress)`
`148`	`142`	`}`
`149`	`143`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ open class CHIPageControlPaprika: CHIBasePageControl {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if let active = elements.first {`
`82`		`- active.backgroundColor = self.tintColor.cgColor`
	`82`	`+ active.backgroundColor = (self.currentPageTintColor ?? self.tintColor)?.cgColor`
	`83`	`+ active.borderWidth = 0`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`min = elements.first?.frame`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,13 @@ import UIKit`
`83`	`83`	`setNeedsLayout()`
`84`	`84`	`}`
`85`	`85`	`}`
`86`		`-`
	`86`	`+`
	`87`	`+ @IBInspectable open var currentPageTintColor: UIColor? {`
	`88`	`+ didSet {`
	`89`	`+ setNeedsLayout()`
	`90`	`+ }`
	`91`	`+ }`
	`92`	`+`
`87`	`93`	`internal var moveToProgress: Double?`
`88`	`94`
`89`	`95`	`private var displayLink: CADisplayLink?`