Make footer,left,right customable

LeoMobileDeveloper · LeoMobileDeveloper · commit 538d56982927 · 2016-07-14T10:32:19.000+08:00
diff --git a/PullToRefreshKit.xcodeproj/project.pbxproj b/PullToRefreshKit.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		52261F0B1D36730F00161ADF /* DefaultCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52261F0A1D36730F00161ADF /* DefaultCollectionViewController.swift */; };
-		52261F0D1D36832600161ADF /* ConfigDefaultHeaderFooterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52261F0C1D36832600161ADF /* ConfigDefaultHeaderFooterController.swift */; };
+		52261F0D1D36832600161ADF /* ConfigHeaderFooterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52261F0C1D36832600161ADF /* ConfigHeaderFooterController.swift */; };
 		52261F101D36878A00161ADF /* banner1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 52261F0E1D36878A00161ADF /* banner1.jpg */; };
 		52261F111D36878A00161ADF /* banner2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 52261F0F1D36878A00161ADF /* banner2.jpg */; };
 		52261F131D36879C00161ADF /* DefaultBannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52261F121D36879C00161ADF /* DefaultBannerController.swift */; };
@@ -27,6 +27,7 @@
 		52BB292E1D364C6D0091F36B /* RowModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BB292D1D364C6D0091F36B /* RowModel.swift */; };
 		52BB29321D364E490091F36B /* DefaultTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BB29311D364E490091F36B /* DefaultTableViewController.swift */; };
 		52BB29341D3655B90091F36B /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BB29331D3655B90091F36B /* Util.swift */; };
+		52C0E4881D3726EB00618231 /* ConfigBannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52C0E4871D3726EB00618231 /* ConfigBannerController.swift */; };
 		52E8FB401D336E26000D0BF1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E8FB3F1D336E26000D0BF1 /* AppDelegate.swift */; };
 		52E8FB421D336E26000D0BF1 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E8FB411D336E26000D0BF1 /* MainViewController.swift */; };
 		52E8FB451D336E26000D0BF1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52E8FB431D336E26000D0BF1 /* Main.storyboard */; };
@@ -36,7 +37,7 @@
 
 /* Begin PBXFileReference section */
 		52261F0A1D36730F00161ADF /* DefaultCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultCollectionViewController.swift; sourceTree = "<group>"; };
-		52261F0C1D36832600161ADF /* ConfigDefaultHeaderFooterController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigDefaultHeaderFooterController.swift; sourceTree = "<group>"; };
+		52261F0C1D36832600161ADF /* ConfigHeaderFooterController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigHeaderFooterController.swift; sourceTree = "<group>"; };
 		52261F0E1D36878A00161ADF /* banner1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = banner1.jpg; sourceTree = "<group>"; };
 		52261F0F1D36878A00161ADF /* banner2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = banner2.jpg; sourceTree = "<group>"; };
 		52261F121D36879C00161ADF /* DefaultBannerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultBannerController.swift; sourceTree = "<group>"; };
@@ -56,6 +57,7 @@
 		52BB292D1D364C6D0091F36B /* RowModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RowModel.swift; sourceTree = "<group>"; };
 		52BB29311D364E490091F36B /* DefaultTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultTableViewController.swift; sourceTree = "<group>"; };
 		52BB29331D3655B90091F36B /* Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
+		52C0E4871D3726EB00618231 /* ConfigBannerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigBannerController.swift; sourceTree = "<group>"; };
 		52E8FB3C1D336E26000D0BF1 /* PullToRefreshKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PullToRefreshKit.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		52E8FB3F1D336E26000D0BF1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		52E8FB411D336E26000D0BF1 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
@@ -117,8 +119,9 @@
 			children = (
 				52BB29311D364E490091F36B /* DefaultTableViewController.swift */,
 				52261F0A1D36730F00161ADF /* DefaultCollectionViewController.swift */,
-				52261F0C1D36832600161ADF /* ConfigDefaultHeaderFooterController.swift */,
 				52261F121D36879C00161ADF /* DefaultBannerController.swift */,
+				52261F0C1D36832600161ADF /* ConfigHeaderFooterController.swift */,
+				52C0E4871D3726EB00618231 /* ConfigBannerController.swift */,
 			);
 			name = Default;
 			sourceTree = "<group>";
@@ -262,7 +265,8 @@
 				52E8FB401D336E26000D0BF1 /* AppDelegate.swift in Sources */,
 				52BB29341D3655B90091F36B /* Util.swift in Sources */,
 				52261F0B1D36730F00161ADF /* DefaultCollectionViewController.swift in Sources */,
-				52261F0D1D36832600161ADF /* ConfigDefaultHeaderFooterController.swift in Sources */,
+				52261F0D1D36832600161ADF /* ConfigHeaderFooterController.swift in Sources */,
+				52C0E4881D3726EB00618231 /* ConfigBannerController.swift in Sources */,
 				52BB291C1D3639500091F36B /* Header.swift in Sources */,
 				52BB29321D364E490091F36B /* DefaultTableViewController.swift in Sources */,
 				52BB292E1D364C6D0091F36B /* RowModel.swift in Sources */,
diff --git a/PullToRefreshKit/ConfigBannerController.swift b/PullToRefreshKit/ConfigBannerController.swift
@@ -0,0 +1,62 @@
+//
+//  ConfigDefaultBannerController.swift
+//  PullToRefreshKit
+//
+//  Created by huangwenchen on 16/7/14.
+//  Copyright © 2016年 Leo. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class ConfigBannerController: UIViewController {
+    let scrollView = UIScrollView()
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.navigationItem.title = "Banners"
+        self.automaticallyAdjustsScrollViewInsets = false
+        setUpViews()
+        
+        scrollView.setUpLeftRefresh { [weak self] in
+            self?.navigationController?.popViewControllerAnimated(true)
+        }.SetUp { (left) in
+            left.setText("👉滑动关闭", mode: RefreshKitLeftRightText.scrollToAction)
+            left.setText("松开关闭", mode: RefreshKitLeftRightText.releaseToAction)
+            left.textLabel.textColor = UIColor.orangeColor()
+        }
+        scrollView.setUpRightRefresh { [weak self] in
+            self?.navigationController?.popViewControllerAnimated(true)
+        }.SetUp { (right) in
+            right.setText("👈滑动关闭", mode: RefreshKitLeftRightText.scrollToAction)
+            right.setText("松开关闭", mode: RefreshKitLeftRightText.releaseToAction)
+            right.textLabel.textColor = UIColor.orangeColor()
+        }
+    }
+    
+    func setUpViews(){
+        view.backgroundColor = UIColor.whiteColor()
+        let screenWidth = UIScreen.mainScreen().bounds.size.width;
+        let scrollheight = screenWidth / 8.0 * 5.0
+        scrollView.frame = CGRectMake(0, 0, screenWidth, scrollheight)
+        scrollView.center = self.view.center
+        self.view.addSubview(scrollView)
+        let imageView1 = UIImageView(frame:CGRectMake(0, 0, screenWidth, scrollheight))
+        imageView1.image = UIImage(named: "banner1.jpg")
+        scrollView.addSubview(imageView1)
+        
+        let imageView2 = UIImageView(frame:CGRectMake(screenWidth, 0, screenWidth, scrollheight))
+        imageView2.image = UIImage(named: "banner2.jpg")
+        scrollView.addSubview(imageView2)
+        
+        scrollView.pagingEnabled = true
+        scrollView.contentSize = CGSizeMake(screenWidth * 2, scrollheight)
+        let desLabel = UILabel().SetUp { (label) in
+            label.frame = CGRectMake(0, 0, screenWidth, 40)
+            label.font = UIFont.systemFontOfSize(14)
+            label.center  = CGPointMake(scrollView.center.x, scrollView.center.y - CGRectGetWidth(scrollView.frame)/2 - 20)
+            label.text = "向左或者向右滑动Banner"
+            label.textAlignment = .Center
+        }
+        view.addSubview(desLabel)
+    }
+}
diff --git a/PullToRefreshKit/ConfigHeaderFooterController.swift b/PullToRefreshKit/ConfigHeaderFooterController.swift
@@ -25,10 +25,10 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
         }.SetUp { (header) in
             header.setText("Pull to refresh", mode: .pullToRefresh)
             header.setText("Release to refresh", mode: .releaseToRefresh)
-            header.setText("Refresh successfully", mode: .refreshSuccess)
+            header.setText("Success", mode: .refreshSuccess)
             header.setText("Refreshing...", mode: .refreshing)
-            header.setText("Refresh failed", mode: .refreshFailure)
-            header.setText("Refresh error", mode: .refreshError)
+            header.setText("Failed", mode: .refreshFailure)
+            header.setText("Error", mode: .refreshError)
             header.textLabel.textColor = UIColor.orangeColor()
             header.imageView.image = nil
         }
@@ -41,7 +41,10 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
                 self?.tableView.endFooterRefreshing()
             })
         }.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.textLabel.textColor  = UIColor.orangeColor()
         }
     }
     override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
diff --git a/PullToRefreshKit/Const.swift b/PullToRefreshKit/Const.swift
@@ -39,7 +39,7 @@ struct PullToRefreshKitHeaderString{
 }
 
 struct PullToRefreshKitFooterString{
-    static let upToRefresh = "上拉加载更多数据"
+    static let pullToRefresh = "上拉加载更多数据"
     static let refreshing = "正在加载中..."
     static let noMoreData = "数据加载完毕"
 }
diff --git a/PullToRefreshKit/DefaultBannerController.swift b/PullToRefreshKit/DefaultBannerController.swift
@@ -41,5 +41,13 @@ class DefaultBannerController: UIViewController {
         
         scrollView.pagingEnabled = true
         scrollView.contentSize = CGSizeMake(screenWidth * 2, scrollheight)
+        let desLabel = UILabel().SetUp { (label) in
+            label.frame = CGRectMake(0, 0, screenWidth, 40)
+            label.font = UIFont.systemFontOfSize(14)
+            label.center  = CGPointMake(scrollView.center.x, scrollView.center.y - CGRectGetWidth(scrollView.frame)/2 - 20)
+            label.text = "向左或者向右滑动Banner"
+            label.textAlignment = .Center
+        }
+        view.addSubview(desLabel)
     }
 }
diff --git a/PullToRefreshKit/DefaultTableViewController.swift b/PullToRefreshKit/DefaultTableViewController.swift
@@ -10,7 +10,6 @@ import Foundation
 import UIKit
 class DefaultTableViewController:UITableViewController{
     var models = [1,2,3,4,5,6,7,8,9,10]
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.tableView.tableFooterView = UIView(frame: CGRectZero)
@@ -28,6 +27,7 @@ class DefaultTableViewController:UITableViewController{
                 self?.tableView.endFooterRefreshing()
             })
         }
+        self.tableView.beginHeaderRefreshing()
     }
     override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return models.count
diff --git a/PullToRefreshKit/Footer.swift b/PullToRefreshKit/Footer.swift
@@ -9,19 +9,35 @@
 import Foundation
 import UIKit
 
+enum RefreshKitFooterText{
+    case pullToRefresh
+    case refreshing
+    case noMoreData
+}
 class DefaultRefreshFooter:UIView,RefreshableFooter{
     let spinner:UIActivityIndicatorView = UIActivityIndicatorView(activityIndicatorStyle: .Gray)
-    let textLabel:UILabel = UILabel(frame: CGRectMake(0,0,100,40)).SetUp {
+    let textLabel:UILabel = UILabel(frame: CGRectMake(0,0,120,40)).SetUp {
         $0.font = UIFont.systemFontOfSize(14)
         $0.textAlignment = .Center
-        $0.text = PullToRefreshKitFooterString.upToRefresh
+    }
+    private var textDic = [RefreshKitFooterText:String]()
+    /**
+     This function can only be called before refreshing
+     */
+    func setText(text:String,mode:RefreshKitFooterText){
+        textDic[mode] = text
+        textLabel.text = textDic[.pullToRefresh]
     }
     override init(frame: CGRect) {
         super.init(frame: frame)
         addSubview(spinner)
         addSubview(textLabel)
         textLabel.center = CGPointMake(frame.size.width/2, frame.size.height/2);
-        spinner.center = CGPointMake(frame.width/2 - 50 - 20, frame.size.height/2)
+        spinner.center = CGPointMake(frame.width/2 - 60 - 20, frame.size.height/2)
+        textDic[.pullToRefresh] = PullToRefreshKitFooterString.pullToRefresh
+        textDic[.refreshing] = PullToRefreshKitFooterString.refreshing
+        textDic[.noMoreData] = PullToRefreshKitFooterString.noMoreData
+        textLabel.text = textDic[.pullToRefresh]
     }
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -31,18 +47,18 @@ class DefaultRefreshFooter:UIView,RefreshableFooter{
         return PullToRefreshKitConst.defaultFooterHeight
     }
     func didBeginRefreshing() {
-        textLabel.text = PullToRefreshKitFooterString.refreshing;
+        textLabel.text = textDic[.refreshing];
         spinner.startAnimating()
     }
     func didEndRefreshing() {
-        textLabel.text = PullToRefreshKitFooterString.upToRefresh
+        textLabel.text = textDic[.pullToRefresh]
         spinner.stopAnimating()
     }
     func didUpdateToNoMoreData(){
-        textLabel.text = PullToRefreshKitFooterString.noMoreData
+        textLabel.text = textDic[.noMoreData]
     }
     func didResetToDefault() {
-        textLabel.text = PullToRefreshKitFooterString.upToRefresh
+        textLabel.text = textDic[.pullToRefresh]
     }
 }
 class RefreshFooterContainer:UIView{
diff --git a/PullToRefreshKit/Header.swift b/PullToRefreshKit/Header.swift
@@ -100,6 +100,7 @@ class DefaultRefreshHeader:UIView,RefreshableHeader{
         self.hidden = true
     }
     func willBeginRefreshing() {
+        self.hidden = false
         textLabel.text = textDic[.refreshing]
         spinner.startAnimating()
         imageView.hidden = true
@@ -124,7 +125,7 @@ class RefreshHeaderContainer:UIView{
     private var currentResult:RefreshResult = .None
     private var _state:RefreshHeaderState = .Idle
     private var insetTDelta:CGFloat = 0.0
-    var state:RefreshHeaderState{
+    private var state:RefreshHeaderState{
         get{
             return _state
         }
diff --git a/PullToRefreshKit/Left.swift b/PullToRefreshKit/Left.swift
@@ -9,14 +9,27 @@
 import Foundation
 import UIKit
 
+enum RefreshKitLeftRightText{
+    case scrollToAction
+    case releaseToAction
+}
 class DefaultRefreshLeft:UIView,RefreshableLeftRight{
     let imageView:UIImageView = UIImageView().SetUp {
         $0.image = UIImage(named: "arrow_right")
     }
     let textLabel:UILabel  = UILabel().SetUp {
         $0.font = UIFont.systemFontOfSize(14)
-        $0.text = PullToRefreshKitLeftString.scrollToAction
     }
+    private var textDic = [RefreshKitLeftRightText:String]()
+    
+    /**
+     You can only call this function before pull
+     */
+    func setText(text:String,mode:RefreshKitLeftRightText){
+        textDic[mode] = text
+        textLabel.text = textDic[.scrollToAction]
+    }
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         addSubview(imageView)
@@ -26,6 +39,9 @@ class DefaultRefreshLeft:UIView,RefreshableLeftRight{
         textLabel.numberOfLines = 0
         imageView.frame = CGRectMake(0, 0,20, 20)
         imageView.center = CGPointMake(40,frame.size.height/2)
+        textDic[.scrollToAction] = PullToRefreshKitLeftString.scrollToAction
+        textDic[.releaseToAction] = PullToRefreshKitLeftString.releaseToAction
+        textLabel.text = textDic[.scrollToAction]
     }
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -43,13 +59,13 @@ class DefaultRefreshLeft:UIView,RefreshableLeftRight{
             UIView.animateWithDuration(0.4, animations: {
                 self.imageView.transform = CGAffineTransformMakeRotation(CGFloat(-M_PI+0.000001))
             })
-            textLabel.text = PullToRefreshKitLeftString.releaseToAction
+            textLabel.text = textDic[.releaseToAction]
         }
         if percent <= 1.0{
             guard CGAffineTransformEqualToTransform(self.imageView.transform, CGAffineTransformMakeRotation(CGFloat(-M_PI+0.000001)))  else{
                 return
             }
-            textLabel.text = PullToRefreshKitLeftString.scrollToAction
+            textLabel.text = textDic[.scrollToAction]
             UIView.animateWithDuration(0.4, animations: {
                 self.imageView.transform = CGAffineTransformIdentity
             })
@@ -59,7 +75,7 @@ class DefaultRefreshLeft:UIView,RefreshableLeftRight{
 
     }
     func didEndRefreshing() {
-        textLabel.text = PullToRefreshKitLeftString.scrollToAction
+        textLabel.text = textDic[.scrollToAction]
     }
 }
 
diff --git a/PullToRefreshKit/MainViewController.swift b/PullToRefreshKit/MainViewController.swift
@@ -19,7 +19,7 @@ class MainViewController: UITableViewController {
         let section1 = SectionModel(rowsCount: 2,
                                     sectionTitle:"属性配置",
                                     rowsTitles: ["配置Header/Footer属性","配置Left/Right属性"],
-                                    rowsTargetControlerNames:["ConfigDefaultHeaderFooterController","DefaultFooterController"])
+                                    rowsTargetControlerNames:["ConfigDefaultHeaderFooterController","ConfigBannerController"])
         let section2 = SectionModel(rowsCount: 4,
                                     sectionTitle:"自定义",
                                     rowsTitles: ["自定义header","自定义Footer","自定义left","自定义Right"],
diff --git a/PullToRefreshKit/PullToRefreshKit.swift b/PullToRefreshKit/PullToRefreshKit.swift
@@ -126,7 +126,7 @@ extension UIScrollView{
 
 //Left
 extension UIScrollView{
-    func setUpLeftRefresh(action:()->()){
+    func setUpLeftRefresh(action:()->())->DefaultRefreshLeft{
         let oldContain = self.viewWithTag(PullToRefreshKitConst.leftTag)
         oldContain?.removeFromSuperview()
         let frame = CGRectMake( -1.0 * PullToRefreshKitConst.defaultLeftWidth,0,PullToRefreshKitConst.defaultLeftWidth, CGRectGetHeight(self.frame))
@@ -139,14 +139,15 @@ extension UIScrollView{
         containComponent.delegate = left
         left.autoresizingMask = [.FlexibleWidth,.FlexibleHeight]
         containComponent.addSubview(left)
+        return left
     }
     func setUpLeftRefresh<T:UIView where T:RefreshableLeftRight>(component:T,action:()->()){
         
     }
 }
 //Right
 extension UIScrollView{
-    func setUpRightRefresh(action:()->()){
+    func setUpRightRefresh(action:()->())->DefaultRefreshRight{
         let oldContain = self.viewWithTag(PullToRefreshKitConst.rightTag)
         oldContain?.removeFromSuperview()
         let frame = CGRectMake(0 ,0 ,PullToRefreshKitConst.defaultLeftWidth ,CGRectGetHeight(self.frame) )
@@ -159,6 +160,7 @@ extension UIScrollView{
         containComponent.delegate = right
         right.autoresizingMask = [.FlexibleWidth,.FlexibleHeight]
         containComponent.addSubview(right)
+        return right
     }
     func setUpRightRefresh<T:UIView where T:RefreshableLeftRight>(component:T,action:()->()){
         
diff --git a/PullToRefreshKit/Right.swift b/PullToRefreshKit/Right.swift

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ struct PullToRefreshKitHeaderString{`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`struct PullToRefreshKitFooterString{`
`42`		`- static let upToRefresh = "上拉加载更多数据"`
	`42`	`+ static let pullToRefresh = "上拉加载更多数据"`
`43`	`43`	`static let refreshing = "正在加载中..."`
`44`	`44`	`static let noMoreData = "数据加载完毕"`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,13 @@ class DefaultBannerController: UIViewController {`
`41`	`41`
`42`	`42`	`scrollView.pagingEnabled = true`
`43`	`43`	`scrollView.contentSize = CGSizeMake(screenWidth * 2, scrollheight)`
	`44`	`+ let desLabel = UILabel().SetUp { (label) in`
	`45`	`+ label.frame = CGRectMake(0, 0, screenWidth, 40)`
	`46`	`+ label.font = UIFont.systemFontOfSize(14)`
	`47`	`+ label.center = CGPointMake(scrollView.center.x, scrollView.center.y - CGRectGetWidth(scrollView.frame)/2 - 20)`
	`48`	`+ label.text = "向左或者向右滑动Banner"`
	`49`	`+ label.textAlignment = .Center`
	`50`	`+ }`
	`51`	`+ view.addSubview(desLabel)`
`44`	`52`	`}`
`45`	`53`	`}`