Merge pull request #5 from dymx101/master

Add 'setThemeColor' method to footer & header

Author: LeoMobileDeveloper

PullToRefreshKit/DefaultTableViewController.swift

@@ -24,14 +24,16 @@ class DefaultTableViewController:UITableViewController{
     override func viewDidLoad() {
         super.viewDidLoad()
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
-        _ = self.tableView.setUpHeaderRefresh { [weak self] in
+        let header = self.tableView.setUpHeaderRefresh { [weak self] in
            delay(1.5, closure: { 
                 self?.models = (self?.models.map({_ in random100()}))!
                 self?.tableView.reloadData()
                 self?.tableView.endHeaderRefreshing(.success,delay: 0.5)
            })
         }
-        _ = self.tableView.setUpFooterRefresh {  [weak self] in
+        header.setThemeColor(themeColor: UIColor.red)
+        
+        let footer = self.tableView.setUpFooterRefresh {  [weak self] in
             delay(1.5, closure: {
                 self?.models.append(random100())
                 self?.tableView.reloadData()
@@ -42,6 +44,8 @@ class DefaultTableViewController:UITableViewController{
                 }
             })
         }
+        footer.setThemeColor(themeColor: UIColor.red)
+        
         self.tableView.beginHeaderRefreshing()
     }
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

PullToRefreshKit/MainViewController.swift

@@ -35,12 +35,13 @@ class MainViewController: UITableViewController {
         models.append(section1)
         models.append(section2)
         models.append(section3)
-        _ = self.tableView.setUpHeaderRefresh { [weak self] in
+        let header = self.tableView.setUpHeaderRefresh { [weak self] in
             let delayTime = DispatchTime.now() + Double(Int64(2 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
             DispatchQueue.main.asyncAfter(deadline: delayTime) {
                 self?.tableView.endHeaderRefreshing(.success,delay:0.3)
             }
         }
+        header.setThemeColor(themeColor: UIColor.blue)
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
     }
 

Source/Classes/Footer.swift

@@ -46,7 +46,7 @@ public enum RefreshMode{
     case scrollAndTap
 }
 
-open class DefaultRefreshFooter:UIView,RefreshableFooter{
+open class DefaultRefreshFooter:UIView, RefreshableFooter, Tintable{
     open let spinner:UIActivityIndicatorView = UIActivityIndicatorView(activityIndicatorStyle: .gray)
     open  let textLabel:UILabel = UILabel(frame: CGRect(x: 0,y: 0,width: 140,height: 40)).SetUp {
         $0.font = UIFont.systemFont(ofSize: 14)
@@ -147,6 +147,12 @@ open class DefaultRefreshFooter:UIView,RefreshableFooter{
         }
         self.backgroundColor = UIColor.white
     }
+    
+    // MARK: Tintable
+    func setThemeColor(themeColor: UIColor) {
+        textLabel.textColor = themeColor
+        spinner.color = themeColor
+    }
 }
 
 class RefreshFooterContainer:UIView{

Source/Classes/Header.swift

@@ -31,7 +31,7 @@ public enum RefreshKitHeaderText{
     case refreshing = 2
     case willRefresh = 3
 }
-open class DefaultRefreshHeader:UIView,RefreshableHeader{
+open class DefaultRefreshHeader:UIView,RefreshableHeader, Tintable {
     open let spinner:UIActivityIndicatorView = UIActivityIndicatorView(activityIndicatorStyle: .gray)
     open let textLabel:UILabel = UILabel(frame: CGRect(x: 0,y: 0,width: 140,height: 40))
     open let imageView:UIImageView = UIImageView(frame: CGRect.zero)
@@ -45,6 +45,7 @@ open class DefaultRefreshHeader:UIView,RefreshableHeader{
         let image = UIImage(named: "arrow_down", in: Bundle(for: DefaultRefreshHeader.self), compatibleWith: nil)
         imageView.image = image
         imageView.sizeToFit()
+        imageView.becomeTintable()
         textLabel.font = UIFont.systemFont(ofSize: 14)
         textLabel.textAlignment = .center
         self.isHidden = true
@@ -114,18 +115,27 @@ open class DefaultRefreshHeader:UIView,RefreshableHeader{
             textLabel.text = textDic[.pullToRefresh]
             imageView.image = UIImage(named: "arrow_down", in: Bundle(for: DefaultRefreshHeader.self), compatibleWith: nil)
         }
+        imageView.becomeTintable()
     }
     open func didCompleteEndRefershingAnimation(_ result:RefreshResult) {
         textLabel.text = textDic[.pullToRefresh]
         self.isHidden = true
         imageView.image = UIImage(named: "arrow_down", in: Bundle(for: DefaultRefreshHeader.self), compatibleWith: nil)
+        imageView.becomeTintable()
     }
     open func didBeginRefreshingState() {
         self.isHidden = false
         textLabel.text = textDic[.refreshing]
         spinner.startAnimating()
         imageView.isHidden = true
     }
+    
+    // MARK: Tintable
+    func setThemeColor(themeColor: UIColor) {
+        imageView.tintColor = themeColor
+        textLabel.textColor = themeColor
+        spinner.color = themeColor
+    }
 }
 
 open class RefreshHeaderContainer:UIView{

Source/Classes/Left.swift

@@ -14,7 +14,7 @@ public enum RefreshKitLeftRightText{
     case releaseToAction
 }
 
-open class DefaultRefreshLeft:UIView,RefreshableLeftRight{
+open class DefaultRefreshLeft:UIView, RefreshableLeftRight, Tintable {
     open let imageView:UIImageView = UIImageView()
     open let textLabel:UILabel  = UILabel().SetUp {
         $0.font = UIFont.systemFont(ofSize: 14)
@@ -39,6 +39,7 @@ open class DefaultRefreshLeft:UIView,RefreshableLeftRight{
         imageView.frame = CGRect(x: 0, y: 0,width: 20, height: 20)
         let image = UIImage(named: "arrow_right", in: Bundle(for: DefaultRefreshHeader.self), compatibleWith: nil)
         imageView.image = image
+        imageView.becomeTintable()
         textDic[.scrollToAction] = PullToRefreshKitLeftString.scrollToClose
         textDic[.releaseToAction] = PullToRefreshKitLeftString.releaseToClose
         textLabel.text = textDic[.scrollToAction]
@@ -81,6 +82,12 @@ open class DefaultRefreshLeft:UIView,RefreshableLeftRight{
    open func didCompleteEndRefershingAnimation() {
         textLabel.text = textDic[.scrollToAction]
     }
+    
+    // MARK: Tintable
+    func setThemeColor(themeColor: UIColor) {
+        imageView.tintColor = themeColor
+        textLabel.textColor = themeColor
+    }
 }
 
 class RefreshLeftContainer:UIView{

Source/Classes/Right.swift

@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 
 
-open class DefaultRefreshRight:UIView,RefreshableLeftRight{
+open class DefaultRefreshRight:UIView, RefreshableLeftRight, Tintable {
     open let imageView:UIImageView = UIImageView()
     open  let textLabel:UILabel  = UILabel().SetUp {
         $0.font = UIFont.systemFont(ofSize: 14)
@@ -32,6 +32,7 @@ open class DefaultRefreshRight:UIView,RefreshableLeftRight{
         imageView.frame = CGRect(x: 0, y: 0,width: 20, height: 20)
         let image = UIImage(named: "arrow_left", in: Bundle(for: DefaultRefreshHeader.self), compatibleWith: nil)
         imageView.image = image
+        imageView.becomeTintable()
         textDic[.scrollToAction] = PullToRefreshKitRightString.scrollToViewMore
         textDic[.releaseToAction] = PullToRefreshKitRightString.releaseToViewMore
         textLabel.text = textDic[.scrollToAction]
@@ -75,6 +76,12 @@ open class DefaultRefreshRight:UIView,RefreshableLeftRight{
    open  func didBeginRefreshing() {
 
     }
+    
+    // MARK: Tintable
+    func setThemeColor(themeColor: UIColor) {
+        imageView.tintColor = themeColor
+        textLabel.textColor = themeColor
+    }
 }
 
 class RefreshRightContainer:UIView{

Source/Classes/Utils.swift

@@ -56,3 +56,13 @@ struct PullToRefreshKitRightString{
     static let releaseToViewMore = "滑动浏览更多"
 }
 
+protocol Tintable {
+    func setThemeColor(themeColor: UIColor)
+}
+
+extension UIImageView {
+    func becomeTintable() {
+        image = image?.withRenderingMode(.alwaysTemplate)
+    }
+}
+