Update README and fix no more data issue

Author: LeoMobileDeveloper

Demo/Demo/ConfigHeaderFooterController.swift

@@ -23,7 +23,7 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
         header.setText("Refreshing...", mode: .refreshing)
         header.setText("Failed", mode: .refreshFailure)
         header.tintColor = UIColor.orange
-        
+        header.imageRenderingWithTintColor = true
         header.durationWhenHide = 0.4
         self.tableView.configRefreshHeader(with: header) { [weak self] in
             delay(1.5, closure: {
@@ -39,11 +39,15 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
         footer.setText("Tap to load more", mode: .tapToRefresh)
         footer.textLabel.textColor  = UIColor.orange
         footer.refreshMode = .tap
-        self.tableView.configRefreshFooter(with: footer) { [weak self] in
+        self.tableView.configRefreshFooter(with: footer) {
             delay(1.5, closure: {
-                self?.models.append(random100())
-                self?.tableView.reloadData()
-                self?.tableView.switchRefreshFooter(to: .normal)
+                self.models.append(random100())
+                self.tableView.reloadData()
+                if self.models.count > 12{
+                    self.tableView.switchRefreshFooter(to: .removed)
+                }else{
+                    self.tableView.switchRefreshFooter(to: .normal)
+                }
             })
         }
     }

Demo/Demo/DefaultTableViewController.swift

@@ -21,22 +21,24 @@ fileprivate func < <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
 }
 
 class DefaultTableViewController:UITableViewController{
+    let originalModes = [1,2,3,4,5,6,7,8,9,10]
     var models = [1,2,3,4,5,6,7,8,9,10]
     override func viewDidLoad() {
         super.viewDidLoad()
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
         self.tableView.configRefreshHeader(with: DefaultRefreshHeader.header()) {
             delay(1.5, closure: {
-                self.models = self.models.map({_ in random100()})
+                self.models = self.originalModes.map({_ in random100()})
                 self.tableView.reloadData()
                 self.tableView.switchRefreshHeader(to: .normal(.success, 0.5))
+                self.tableView.switchRefreshFooter(to: .normal)
             })
         }
         self.tableView.configRefreshFooter(with: DefaultRefreshFooter.footer()) {
             delay(1.5, closure: {
                 self.models.append(random100())
                 self.tableView.reloadData()
-                if self.models.count < 15{
+                if self.models.count < 12 {
                     self.tableView.switchRefreshFooter(to: .normal)
                 }else{
                     self.tableView.switchRefreshFooter(to: .noMoreData)

Demo/Demo/ElasticHeaderTableViewController.swift

@@ -13,8 +13,6 @@ import UIKit
 class ElasticHeaderTableViewController:BaseTableViewController{
     override func viewDidLoad() {
         super.viewDidLoad()
-        //Setup
-        //        self.tableView.backgroundColor = UIColor(red: 232.0/255.0, green: 234.0/255.0, blue: 235.0/255.0, alpha: 1.0)
         let elasticHeader = ElasticRefreshHeader()
         self.tableView.configRefreshHeader(with: elasticHeader) { [weak self] in
             delay(1.5, closure: {

README.md

@@ -85,17 +85,17 @@ github "LeoMobileDeveloper/PullToRefreshKit"
 
 
 ```
- self.tableView.setUpHeaderRefresh { [weak self] in
-    delay(1.5, closure: { 
-         self?.tableView.endHeaderRefreshing(.Success)
+self.tableView.configRefreshHeader(with: DefaultRefreshHeader.header()) {
+    delay(2, closure: {
+        self.tableView.switchRefreshHeader(to: .normal(.success, 0.5))
     })
- }
+}
 ```
-Add a delay if you want user to see the result of refresh result
 
-```
-self?.tableView.endHeaderRefreshing(.Success,delay: 0.5)
+If you do not want any delay:
 
+```
+self.tableView.switchRefreshHeader(to: .normal(.none, 0.0))
 ```
 
 <img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/gif1.gif" width="320">
@@ -109,33 +109,46 @@ Support three mode to fire refresh action
 - [x] Scroll and Tap
 
 ```
- self.tableView.setUpFooterRefresh {  [weak self] in
-     delay(1.5, closure: {
-         self?.tableView.endFooterRefreshing()
-     })
- }
+self.tableView.configRefreshFooter(with: DefaultRefreshFooter.footer()) {
+	delay(1.5, closure: {
+	    self.tableView.switchRefreshFooter(to: .normal)
+	})
+};
 ```
 
 <img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/gif2.gif" width="320">
 
+Remove footer:
+
+```
+self.tableView.switchRefreshFooter(to: .removed)
+```
+
+No more Data:
+
+```                  self.tableView.switchRefreshFooter(to: .noMoreData)
+```
 
 ### Pull left to exit
 
 ```
- scrollView.setUpLeftRefresh { [weak self] in
-     self?.navigationController?.popViewControllerAnimated(true)
- }
+  scrollView.configSideRefresh(with: DefaultRefreshLeft.left(), at: .left) {
+            self.navigationController?.popViewController(animated: true)
+        };
 ```
 
 <img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/gif3.gif" width="200">
 
-### Pull right to enter
+### Pull right to Pop
 
 ```
- scrollView.setUpRightRefresh { [weak self] in
-     let nvc = DefaultBannerController()
-     self?.navigationController?.pushViewController(nvc, animated: true)
- }
+let right  = DefaultRefreshRight.right()
+right.setText("👈滑动关闭", mode: .scrollToAction)
+right.setText("松开关闭", mode: .releaseToAction)
+right.textLabel.textColor = UIColor.orange
+scrollView.configSideRefresh(with: right, at: .right) {
+     self.navigationController?.popViewController(animated: true)
+};
 ```
 
 <img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/gif4.gif" width="200">
@@ -145,20 +158,22 @@ Support three mode to fire refresh action
 PullToRefershKit offer `SetUp` operator，for example
 
 ```
-self.tableView.setUpHeaderRefresh { [weak self] in
+let header = DefaultRefreshHeader.header()
+header.setText("Pull to refresh", mode: .pullToRefresh)
+header.setText("Release to refresh", mode: .releaseToRefresh)
+header.setText("Success", mode: .refreshSuccess)
+header.setText("Refreshing...", mode: .refreshing)
+header.setText("Failed", mode: .refreshFailure)
+header.tintColor = UIColor.orange
+header.imageRenderingWithTintColor = true
+header.durationWhenHide = 0.4
+self.tableView.configRefreshHeader(with: header) { [weak self] in
     delay(1.5, closure: {
-        self?.tableView.endHeaderRefreshing(.Success)
+        self?.models = (self?.models.map({_ in random100()}))!
+        self?.tableView.reloadData()
+        self?.tableView.switchRefreshHeader(to: .normal(.success, 0.3))
     })
-}.SetUp { (header) in
-    header.setText("Pull to refresh", mode: .pullToRefresh)
-    header.setText("Release to refresh", mode: .releaseToRefresh)
-    header.setText("Success", mode: .refreshSuccess)
-    header.setText("Refreshing...", mode: .refreshing)
-    header.setText("Failed", mode: .refreshFailure)
-    header.setText("Error", mode: .refreshError)
-    header.textLabel.textColor = UIColor.orangeColor()
-    header.imageView.image = nil
-}
+};
 ```
 
 ### Customize

Source/Classes/Footer.swift

@@ -198,7 +198,7 @@ class RefreshFooterContainer:UIView{
     var attachedScrollView:UIScrollView!
     weak var delegate:RefreshableFooter?
     fileprivate var _state:RefreshFooterState = .idle
-    var state:RefreshFooterState{
+    var state: RefreshFooterState{
         get{
             return _state
         }
@@ -208,13 +208,16 @@ class RefreshFooterContainer:UIView{
             }
             _state =  newValue
             if newValue == .refreshing{
+                self.isUserInteractionEnabled = true
                 DispatchQueue.main.async(execute: {
                     self.delegate?.didBeginRefreshing()
                     self.refreshAction?()
                 })
             }else if newValue == .noMoreData{
+                self.isUserInteractionEnabled = false
                 self.delegate?.didUpdateToNoMoreData()
             }else if newValue == .idle{
+                self.isUserInteractionEnabled = true
                 self.delegate?.didResetToDefault()
             }
         }

Source/Classes/Header.swift

@@ -84,6 +84,13 @@ open class DefaultRefreshHeader: UIView, RefreshableHeader {
     open class func header()->DefaultRefreshHeader{
         return DefaultRefreshHeader(frame: CGRect(x: 0, y: 0, width:UIScreen.main.bounds.size.width , height: 55.0));
     }
+    open var imageRenderingWithTintColor = false{
+        didSet{
+            if imageRenderingWithTintColor{
+                imageView.image = imageView.image?.withRenderingMode(.alwaysTemplate)
+            }
+        }
+    }
     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)
@@ -174,11 +181,17 @@ open class DefaultRefreshHeader: UIView, RefreshableHeader {
             textLabel.text = textDic[.pullToRefresh]
             imageView.image = UIImage(named: "arrow_down", in: Bundle(for: DefaultRefreshHeader.self), compatibleWith: nil)
         }
+        if imageRenderingWithTintColor{
+            imageView.image = imageView.image?.withRenderingMode(.alwaysTemplate)
+        }
     }
     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)
+        if imageRenderingWithTintColor{
+            imageView.image = imageView.image?.withRenderingMode(.alwaysTemplate)
+        }
     }
     open func didBeginRefreshingState() {
         self.isHidden = false
@@ -227,7 +240,6 @@ open class RefreshHeaderContainer:UIView{
                     var oldInset = self.attachedScrollView.contentInset
                     oldInset.top = oldInset.top + self.insetTDelta
                     self.attachedScrollView.contentInset = oldInset
-                    
                     }, completion: { (finished) in
                         self.delegate?.didCompleteEndRefershingAnimation(self.currentResult)
                 })