Update Demo Code to New APi

Author: LeoMobileDeveloper

Demo/Demo/ConfigBannerController.swift

@@ -16,21 +16,21 @@ class ConfigBannerController: UIViewController {
         self.navigationItem.title = "Banners"
         self.automaticallyAdjustsScrollViewInsets = false
         setUpViews()
+        let left = DefaultRefreshLeft.left()
+        left.setText("👉滑动关闭", mode: .scrollToAction)
+        left.setText("松开关闭", mode: .releaseToAction)
+        left.textLabel.textColor = UIColor.orange
+        scrollView.configSideRefresh(with: left, at: .left) {
+            self.navigationController?.popViewController(animated: true)
+        };
 
-        _ = scrollView.setUpLeftRefresh { [weak self] in
-            _ = self?.navigationController?.popViewController(animated: true)
-        }.SetUp { (left) in
-            left.setText("👉滑动关闭", mode: RefreshKitLeftRightText.scrollToAction)
-            left.setText("松开关闭", mode: RefreshKitLeftRightText.releaseToAction)
-            left.textLabel.textColor = UIColor.orange
-        }
-        _ = scrollView.setUpRightRefresh { [weak self] in
-            _ = self?.navigationController?.popViewController(animated: true)
-        }.SetUp { (right) in
-            right.setText("👈滑动关闭", mode: RefreshKitLeftRightText.scrollToAction)
-            right.setText("松开关闭", mode: RefreshKitLeftRightText.releaseToAction)
-            right.textLabel.textColor = UIColor.orange
-        }
+        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)
+        };
     }
 
     func setUpViews(){
@@ -50,13 +50,12 @@ class ConfigBannerController: UIViewController {
 
         scrollView.isPagingEnabled = true
         scrollView.contentSize = CGSize(width: screenWidth * 2, height: scrollheight)
-        let desLabel = UILabel().SetUp { (label) in
-            label.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 40)
-            label.font = UIFont.systemFont(ofSize: 14)
-            label.center  = CGPoint(x: scrollView.center.x, y: scrollView.center.y - scrollView.frame.width/2 - 20)
-            label.text = "向左或向右滑动Banner"
-            label.textAlignment = .center
-        }
-        view.addSubview(desLabel)
+        let label = UILabel()
+        label.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 40)
+        label.font = UIFont.systemFont(ofSize: 14)
+        label.center  = CGPoint(x: scrollView.center.x, y: scrollView.center.y - scrollView.frame.width/2 - 20)
+        label.text = "向左或向右滑动Banner"
+        label.textAlignment = .center
+        view.addSubview(label)
     }
 }

Demo/Demo/ConfigHeaderFooterController.swift

@@ -16,36 +16,35 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
 
         //Header
-        _ = 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.durationWhenHide = 0.4
+        self.tableView.configRefreshHeader(with: header) { [weak self] in
             delay(1.5, closure: {
                 self?.models = (self?.models.map({_ in random100()}))!
                 self?.tableView.reloadData()
-                self?.tableView.endHeaderRefreshing(.success,delay: 0.3)
+                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.textLabel.textColor = UIColor.orange
-            header.durationWhenHide = 0.4
-        }
-        //Footer
-        
-        _ = self.tableView.setUpFooterRefresh {  [weak self] in
+        };
+        let footer = DefaultRefreshFooter.footer()
+        footer.setText("Pull up to refresh", mode: .pullToRefresh)
+        footer.setText("No data any more", mode: .noMoreData)
+        footer.setText("Refreshing...", mode: .refreshing)
+        footer.setText("Tap to load more", mode: .tapToRefresh)
+        footer.textLabel.textColor  = UIColor.orange
+        footer.refreshMode = .tap
+        self.tableView.configRefreshFooter(with: footer) { [weak self] in
             delay(1.5, closure: {
                 self?.models.append(random100())
                 self?.tableView.reloadData()
-                self?.tableView.endFooterRefreshing()
+                self?.tableView.switchRefreshFooter(to: .normal)
             })
-        }.SetUp { (footer) in
-            footer.setText("Pull up to refresh", mode: RefreshKitFooterText.pullToRefresh)
-            footer.setText("No data any more", mode: RefreshKitFooterText.noMoreData)
-            footer.setText("Refreshing...", mode: RefreshKitFooterText.refreshing)
-            footer.setText("Tap to load more", mode: RefreshKitFooterText.tapToRefresh)
-            footer.textLabel.textColor  = UIColor.orange
-            footer.refreshMode = .tap
         }
     }
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

Demo/Demo/CurveMaskTableViewController.swift

@@ -14,13 +14,12 @@ class CurveMaskTableViewController:BaseTableViewController{
         super.viewDidLoad()
         //Setup
         let curveHeader = CurveRefreshHeader(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 0))
-        _ = self.tableView.setUpHeaderRefresh(curveHeader) { [weak self] in
+        self.tableView.configRefreshHeader(with: curveHeader) { [weak self] in
             delay(1.5, closure: {
                 self?.models = (self?.models.map({_ in random100()}))!
                 self?.tableView.reloadData()
-                self?.tableView.endHeaderRefreshing(delay: 0.5)
+                self?.tableView.switchRefreshHeader(to: .normal(.none, 0.5))
             })
-        }
-        //        self.tableView.beginHeaderRefreshing()
+        };
     }
 }

Demo/Demo/DefaultBannerController.swift

@@ -17,13 +17,13 @@ class DefaultBannerController: UIViewController {
         self.navigationItem.title = "Banners"
         self.automaticallyAdjustsScrollViewInsets = false
         setUpViews()
-        _ = scrollView.setUpLeftRefresh { [weak self] in
-            _ = self?.navigationController?.popViewController(animated: true)
-        }
-        _ = scrollView.setUpRightRefresh { [weak self] in
+        scrollView.configSideRefresh(with: DefaultRefreshLeft.left(), at: .left) {
+            self.navigationController?.popViewController(animated: true)
+        };
+        scrollView.configSideRefresh(with: DefaultRefreshRight.right(), at: .right) {
             let nvc = DefaultBannerController()
-            self?.navigationController?.pushViewController(nvc, animated: true)
-        }
+            self.navigationController?.pushViewController(nvc, animated: true)
+        };
     }
 
     func setUpViews(){
@@ -43,13 +43,12 @@ class DefaultBannerController: UIViewController {
 
         scrollView.isPagingEnabled = true
         scrollView.contentSize = CGSize(width: screenWidth * 2, height: scrollheight)
-        let desLabel = UILabel().SetUp { (label) in
-            label.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 40)
-            label.font = UIFont.systemFont(ofSize: 14)
-            label.center  = CGPoint(x: scrollView.center.x, y: scrollView.center.y - scrollView.frame.width/2 - 20)
-            label.text = "Scroll left or right"
-            label.textAlignment = .center
-        }
-        view.addSubview(desLabel)
+        let label = UILabel()
+        label.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 40)
+        label.font = UIFont.systemFont(ofSize: 14)
+        label.center  = CGPoint(x: scrollView.center.x, y: scrollView.center.y - scrollView.frame.width/2 - 20)
+        label.text = "Scroll left or right"
+        label.textAlignment = .center
+        view.addSubview(label)
     }
 }

Demo/Demo/DefaultTableViewController.swift

@@ -25,29 +25,25 @@ class DefaultTableViewController:UITableViewController{
     override func viewDidLoad() {
         super.viewDidLoad()
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
-        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.configRefreshHeader(with: DefaultRefreshHeader.header()) {
+            delay(1.5, closure: {
+                self.models = self.models.map({_ in random100()})
+                self.tableView.reloadData()
+                self.tableView.switchRefreshHeader(to: .normal(.success, 0.5))
+            })
         }
-        header.setThemeColor(themeColor: UIColor.red)
-        
-        let footer = self.tableView.setUpFooterRefresh {  [weak self] in
+        self.tableView.configRefreshFooter(with: DefaultRefreshFooter.footer()) {
             delay(1.5, closure: {
-                self?.models.append(random100())
-                self?.tableView.reloadData()
-                if self?.models.count < 15{
-                    self?.tableView.endFooterRefreshing()
+                self.models.append(random100())
+                self.tableView.reloadData()
+                if self.models.count < 15{
+                    self.tableView.switchRefreshFooter(to: .normal)
                 }else{
-                    self?.tableView.endFooterRefreshingWithNoMoreData()
+                    self.tableView.switchRefreshFooter(to: .noMoreData)
                 }
             })
-        }
-        footer.setThemeColor(themeColor: UIColor.red)
-        
-        self.tableView.beginHeaderRefreshing()
+        };
+        self.tableView.switchRefreshHeader(to: .refreshing)
     }
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return models.count

Demo/Demo/DefaultWebViewController.swift

@@ -18,21 +18,21 @@ class DefaultWebViewController: UIViewController,UIWebViewDelegate{
         self.webview.autoresizingMask = [.flexibleWidth,.flexibleHeight]
         self.webview.backgroundColor = UIColor.white
         view.addSubview(self.webview)
-        _ = self.webview.scrollView.setUpHeaderRefresh({ [weak self] in
-            if self?.webview.request != nil{
-                self?.webview.reload()
+        self.webview.scrollView.configRefreshHeader(with: DefaultRefreshHeader.header()) {
+            if self.webview.request != nil{
+                self.webview.reload()
             }else{
                 let url = URL(string: "https://www.baidu.com")
                 let request = URLRequest(url: url!)
-                self?.webview.loadRequest(request)
+                self.webview.loadRequest(request)
             }
-        })
+        };
         let url = URL(string: "https://www.baidu.com")
         let request = URLRequest(url: url!)
         self.webview.loadRequest(request)
         self.webview.delegate = self
     }
     func webViewDidFinishLoad(_ webView: UIWebView) {
-        self.webview.scrollView.endHeaderRefreshing(.success,delay: 0.3)
+        self.webview.scrollView.switchRefreshHeader(to: .normal(.success, 0.5))
     }
 }

Demo/Demo/DianpingTableviewController.swift

@@ -15,13 +15,13 @@ class DianpingTableviewController:BaseTableViewController{
         //Setup
         self.tableView.backgroundColor = UIColor(red: 232.0/255.0, green: 234.0/255.0, blue: 235.0/255.0, alpha: 1.0)
         let taobaoHeader = DianpingRefreshHeader(frame: CGRect(x: 0,y: 0,width: self.view.bounds.width,height: 60))
-        _ = self.tableView.setUpHeaderRefresh(taobaoHeader) { [weak self] in
+        self.tableView.configRefreshHeader(with: taobaoHeader) { [weak self] in
             delay(1.5, closure: {
                 self?.models = (self?.models.map({_ in random100()}))!
                 self?.tableView.reloadData()
-                self?.tableView.endHeaderRefreshing()
+                self?.tableView.switchRefreshHeader(to: .normal(.none, 0.0))
             })
-        }
-        self.tableView.beginHeaderRefreshing()
+        };
+        self.tableView.switchRefreshHeader(to: .refreshing)
     }
 }

Demo/Demo/ElasticHeaderTableViewController.swift

@@ -16,13 +16,12 @@ class ElasticHeaderTableViewController:BaseTableViewController{
         //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.setUpHeaderRefresh(elasticHeader) { [weak self] in
+        self.tableView.configRefreshHeader(with: elasticHeader) { [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.switchRefreshHeader(to: .normal(.success, 0.5));
             })
-        }
-        //        self.tableView.beginHeaderRefreshing()
+        };
     }
 }

Demo/Demo/QQVideoTableViewController.swift

@@ -12,14 +12,14 @@ import UIKit
 class QQVideoTableviewController:BaseTableViewController{
     override func viewDidLoad() {
         super.viewDidLoad()
-        let taobaoHeader = QQVideoRefreshHeader(frame: CGRect(x: 0,y: 0,width: self.view.bounds.width,height: 50))
-        _ = self.tableView.setUpHeaderRefresh(taobaoHeader) { [weak self] in
+        let qqHeader = QQVideoRefreshHeader(frame: CGRect(x: 0,y: 0,width: self.view.bounds.width,height: 50))
+        self.tableView.configRefreshHeader(with: qqHeader) { [weak self] in
             delay(1.5, closure: {
                 self?.models = (self?.models.map({_ in random100()}))!
                 self?.tableView.reloadData()
-                self?.tableView.endHeaderRefreshing()
+                self?.tableView.switchRefreshHeader(to: .normal(.none, 0.0))
             })
-        }
-        self.tableView.beginHeaderRefreshing()
+        };
+        self.tableView.switchRefreshHeader(to: .refreshing)
     }
 }

Demo/Demo/TaobaoTableViewController.swift

@@ -12,15 +12,11 @@ class TaobaoTableViewController: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 taobaoHeader = TaoBaoRefreshHeader(frame: CGRect(x: 0,y: 0,width: self.view.bounds.width,height: 100))
-        _ = self.tableView.setUpHeaderRefresh(taobaoHeader) { [weak self] in
-            delay(1.5, closure: {
-                self?.models = (self?.models.map({_ in random100()}))!
-                self?.tableView.reloadData()
-                self?.tableView.endHeaderRefreshing()
-            })
-        }
-//        self.tableView.beginHeaderRefreshing()
+        self.tableView.configRefreshHeader(with: taobaoHeader) {
+            self.models = self.models.map({_ in random100()})
+            self.tableView.reloadData()
+            self.tableView.switchRefreshHeader(to: .normal(.none, 0.0))
+        };
     }
 }