Rename Protocol function

LeoMobileDeveloper · LeoMobileDeveloper · commit 4210eca7d35d · 2017-11-13T18:53:56.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,16 @@
+## v0.8.2
+
+### Add
+
+- Add `heightForHeader` and `heightForFooter` in Protocols
+- Do not need to set frame height when set up header&footer&left&right
+
+### Updated
+
+- Rename `didBeginEndRefershingAnimation` to `didBeginHideRefershingAnimation`
+- Rename `didCompleteEndRefershingAnimation` to `didCompleteHideRefershingAnimation`
+- Rename `durationWhenEndRefreshing` to `durationOfHideAnimation`
+
+## Fixd
+
+- Fix footer frame issue
diff --git a/Demo/Demo/ConfigHeaderFooterController.swift b/Demo/Demo/ConfigHeaderFooterController.swift
@@ -14,7 +14,7 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
-        
+
         //Header
         let header = DefaultRefreshHeader.header()
         header.setText("Pull to refresh", mode: .pullToRefresh)
@@ -43,7 +43,7 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
             delay(1.5, closure: {
                 self.models.append(random100())
                 self.tableView.reloadData()
-                if self.models.count > 12{
+                if self.models.count > 18{
                     self.tableView.switchRefreshFooter(to: .removed)
                 }else{
                     self.tableView.switchRefreshFooter(to: .normal)
diff --git a/Demo/Demo/DefaultCollectionViewController.swift b/Demo/Demo/DefaultCollectionViewController.swift
@@ -12,17 +12,23 @@ import PullToRefreshKit
 
 class DefaultCollectionViewController:UIViewController,UICollectionViewDataSource{
     var collectionView:UICollectionView!
+    var count = 9
     override func viewDidLoad() {
         self.view.backgroundColor = UIColor.white
         self.setUpCollectionView()
-        self.collectionView.configRefreshHeader(with: DefaultRefreshHeader.header()) {
+        self.collectionView.configRefreshHeader(with: DefaultRefreshHeader.header()) { [weak self] in
             delay(1.0, closure: {
-                self.collectionView.switchRefreshHeader(to: .normal(.success, 0.5));
+                self?.collectionView.switchRefreshHeader(to: .normal(.success, 0.5));
             });
         }
-        self.collectionView.configRefreshFooter(with: DefaultRefreshFooter.footer()) {
+        self.collectionView.configRefreshFooter(with: DefaultRefreshFooter.footer()) { [weak self] in
             delay(1.0, closure: {
-                self.collectionView.switchRefreshFooter(to: .normal)
+                guard let sf = self else{
+                    return
+                }
+                sf.count = sf.count + 3
+                sf.collectionView.reloadData()
+                sf.collectionView.switchRefreshFooter(to: .normal)
             });
         };
 
@@ -31,15 +37,16 @@ class DefaultCollectionViewController:UIViewController,UICollectionViewDataSourc
         let flowLayout = UICollectionViewFlowLayout()
         flowLayout.scrollDirection = UICollectionViewScrollDirection.vertical
         flowLayout.itemSize = CGSize(width: 100, height: 100)
-        self.collectionView = UICollectionView(frame: self.view.bounds, collectionViewLayout: flowLayout)
+        let frame = CGRect(x: 0, y: 0, width: view.frame.size.width, height: 300)
+        self.collectionView = UICollectionView(frame:frame, collectionViewLayout: flowLayout)
         self.collectionView?.backgroundColor = UIColor.white
         self.collectionView?.dataSource = self
         self.view.addSubview(self.collectionView!)
         
         self.collectionView?.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "cell")
     }
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 21
+        return self.count
     }
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell", for: indexPath)
diff --git a/Demo/Demo/DefaultTableViewController.swift b/Demo/Demo/DefaultTableViewController.swift
@@ -21,8 +21,8 @@ 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]
+    let originalModes = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]
+    var models = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]
     override func viewDidLoad() {
         super.viewDidLoad()
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
@@ -38,7 +38,7 @@ class DefaultTableViewController:UITableViewController{
             delay(1.5, closure: {
                 self.models.append(random100())
                 self.tableView.reloadData()
-                if self.models.count < 12 {
+                if self.models.count < 18 {
                     self.tableView.switchRefreshFooter(to: .normal)
                 }else{
                     self.tableView.switchRefreshFooter(to: .noMoreData)
diff --git a/Demo/Demo/DianpingRefreshHeader.swift b/Demo/Demo/DianpingRefreshHeader.swift
@@ -49,9 +49,9 @@ class DianpingRefreshHeader:UIView,RefreshableHeader{
         imageView.startAnimating()
     }
     //刷新结束，将要隐藏header
-    func didBeginEndRefershingAnimation(_ result:RefreshResult){}
+    func didBeginHideAnimation(_ result:RefreshResult){}
     //刷新结束，完全隐藏header
-    func didCompleteEndRefershingAnimation(_ result:RefreshResult){
+    func didCompleteHideAnimation(_ result:RefreshResult){
         imageView.animationImages = nil
         imageView.stopAnimating()
         imageView.isHidden = true
diff --git a/Demo/Demo/QQVideoRefreshHeader.swift b/Demo/Demo/QQVideoRefreshHeader.swift
@@ -48,9 +48,9 @@ class QQVideoRefreshHeader:UIView,RefreshableHeader{
         imageView.startAnimating()
     }
     //刷新结束，将要隐藏header
-    func didBeginEndRefershingAnimation(_ result:RefreshResult){}
+    func didBeginHideAnimation(_ result:RefreshResult){}
     //刷新结束，完全隐藏header
-    func didCompleteEndRefershingAnimation(_ result:RefreshResult){
+    func didCompleteHideAnimation(_ result:RefreshResult){
         imageView.animationImages = nil
         imageView.stopAnimating()
         imageView.image = UIImage(named: "loading15")
diff --git a/Demo/Demo/TaoBaoRefreshHeader.swift b/Demo/Demo/TaoBaoRefreshHeader.swift
@@ -111,14 +111,14 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
         textLabel.text = "刷新中..."
     }
     
-    func didBeginEndRefershingAnimation(_ result:RefreshResult){
+    func didBeginHideAnimation(_ result:RefreshResult){
         transitionWithOutAnimation {
             self.circleLayer.strokeEnd = 0.05
         };
         self.circleLayer.removeAllAnimations()
     }
     
-    func didCompleteEndRefershingAnimation(_ result:RefreshResult){
+    func didCompleteHideAnimation(_ result:RefreshResult){
         transitionWithOutAnimation { 
             self.circleLayer.strokeEnd = 0.05
         };
diff --git a/Demo/Demo/YahooWeatherRefreshHeader.swift b/Demo/Demo/YahooWeatherRefreshHeader.swift
@@ -79,11 +79,11 @@ class YahooWeatherRefreshHeader: UIView,RefreshableHeader{
         startTransitionAnimation()
     }
     //刷新结束，将要隐藏header
-    func didBeginEndRefershingAnimation(_ result:RefreshResult){
+    func didBeginHideAnimation(_ result:RefreshResult){
         
     }
     //刷新结束，完全隐藏header
-    func didCompleteEndRefershingAnimation(_ result:RefreshResult){
+    func didCompleteHideAnimation(_ result:RefreshResult){
         imageView.stopAnimating()
         imageView.animationImages = nil
         imageView.image = UIImage(named: "sun_000000")
diff --git a/Demo/Demo/YoukuRefreshHeader.swift b/Demo/Demo/YoukuRefreshHeader.swift
@@ -76,14 +76,14 @@ class YoukuRefreshHeader:UIView,RefreshableHeader{
         self.rotatingImageView.layer.add(rotateAnimation, forKey: "rotate")
     }
     //刷新结束，将要隐藏header
-    func didBeginEndRefershingAnimation(_ result:RefreshResult){
+    func didBeginHideAnimation(_ result:RefreshResult){
         self.rotatingImageView.isHidden = true
         self.iconImageView.isHidden = false
         self.iconImageView.layer.removeAllAnimations()
         self.iconImageView.layer.transform = CATransform3DIdentity
         self.iconImageView.image = UIImage(named: "youku_down")
     }
     //刷新结束，完全隐藏header
-    func didCompleteEndRefershingAnimation(_ result:RefreshResult){
+    func didCompleteHideAnimation(_ result:RefreshResult){
     }
 }
diff --git a/PullToRefreshKit.podspec b/PullToRefreshKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'PullToRefreshKit'
-  s.version          = '0.8.0'
+  s.version          = '0.8.2'
   s.summary          = 'A refresh library written with pure Swift 4'
   s.description      = <<-DESC
 This is a pull to refresh library written by pure Swift 4. Using it you can add pull to refresh,pull to load more,pull left/right to view details within one line. Besides,it is quite easy to write a custom refresh view when using this lib.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 )](https://developer.apple.com/swift)
  [![License](http://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat
 )](http://mit-license.org)
-[![Build Status](https://travis-ci.org/LeoMobileDeveloper/PullToRefreshKit.svg?branch=master)](https://travis-ci.org/LeoMobileDeveloper/PullToRefreshKit)
+
 
 **The example project contains some hot App refresh example.**
 
@@ -22,25 +22,24 @@
 <th>Taobao</th>
 <th>YouKu</th>
 <th>QQ Video</th>
-<th>QQ</th>
+
 
 </tr>
 <tr>
 <td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/taobao.gif" width="300"/></td>
 <td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/youku.gif" width="300"/></td>
 <td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/qqvideo.gif" width="300"/></td>
-<td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/qq.gif" width="300"/></td>
 
 </tr>
 <tr>
 <tr>
-<th>Curve</th>
 <th>Yahoo Weather</th>
 <th>Dian Ping</th>
+<th>QQ</th>
 </tr>
-<td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/curve.gif" width="300"/></td>
 <td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/yahoo.gif" width="300"/></td>
 <td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/dianping.gif" width="300"/></td>
+<td><img src="https://raw.github.com/LeoMobileDeveloper/PullToRefreshKit/master/Screenshot/qq.gif" width="300"/></td>
 </tr>
 <tr>
 </table>
@@ -187,18 +186,21 @@ You just need to write a `UIView` sub class,and make it conforms to these protoc
 
 For exmaple,to create a custom header
 
-```
+``` 
+    //Height of the refresh header
+    func heightForHeader()->CGFloat
+    
     //Distance from top when in refreshing state
     func heightForRefreshingState()->CGFloat
    
     //Will enter refreshing state,change view state to refreshing in this function
     func didBeginrefreshingState()
 
     //The refreshing task is end.Refresh header will hide.Tell user the refreshing result here.
-    func didBeginEndRefershingAnimation(result:RefreshResult)
+    func didBeginHideAnimation(result:RefreshResult)
     
-    //Refresh header is hidden,reset all to inital state  here
-    func didCompleteEndRefershingAnimation(result:RefreshResult)
+    //Refresh header is hidden,reset all to inital state here
+    func didCompleteHideAnimation(result:RefreshResult)
     
     //Distance to drag to fire refresh action ,default is heightForRefreshingState
     optional func heightForFireRefreshing()->CGFloat
@@ -207,7 +209,7 @@ For exmaple,to create a custom header
     optional func percentUpdateDuringScrolling(percent:CGFloat)
     
     //Duration of header hide animation
-    optional func durationWhenEndRefreshing()->Double
+    optional func durationOfHideAnimation()->Double
     
 ```
 
diff --git a/Source/Classes/Availability.swift b/Source/Classes/Availability.swift
@@ -40,7 +40,7 @@ public extension UIScrollView{
         oldContain?.removeFromSuperview()
         let containFrame = CGRect(x: 0, y: -self.frame.height, width: self.frame.width, height: self.frame.height)
         let containComponent = RefreshHeaderContainer(frame: containFrame)
-        if let endDuration = header.durationWhenEndRefreshing?(){
+        if let endDuration = header.durationOfHideAnimation?(){
             containComponent.durationOfEndRefreshing = endDuration
         }
         containComponent.tag = PullToRefreshKitConst.headerTag
diff --git a/Source/Classes/ElasticRefreshHeader.swift b/Source/Classes/ElasticRefreshHeader.swift
@@ -14,14 +14,11 @@ open class ElasticRefreshHeader: UIView,RefreshableHeader {
     open let textLabel:UILabel = UILabel(frame: CGRect(x: 0,y: 0,width: 120,height: 40))
     open let imageView:UIImageView = UIImageView(frame: CGRect.zero)
     fileprivate var textDic = [RefreshKitHeaderText:String]()
-    fileprivate let totalHegiht:CGFloat = 80.0
     override init(frame: CGRect) {
         control = ElasticRefreshControl(frame: frame)
-        let adjustFrame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: totalHegiht)
-        super.init(frame: adjustFrame)
+        super.init(frame: frame)
         self.autoresizingMask = .flexibleWidth
         self.backgroundColor = UIColor.white
-        imageView.sizeToFit()
         imageView.frame = CGRect(x: 0, y: 0, width: 16, height: 16)
         textLabel.font = UIFont.systemFont(ofSize: 12)
         textLabel.textAlignment = .center
@@ -31,7 +28,7 @@ open class ElasticRefreshHeader: UIView,RefreshableHeader {
         addSubview(imageView)
         textDic[.refreshSuccess] = PullToRefreshKitHeaderString.refreshSuccess
         textDic[.refreshFailure] = PullToRefreshKitHeaderString.refreshFailure
-        textLabel.text = textDic[.pullToRefresh]
+        textLabel.text = nil
     }
     
     open func setText(_ text:String,mode:RefreshKitHeaderText){
@@ -45,8 +42,9 @@ open class ElasticRefreshHeader: UIView,RefreshableHeader {
     open override func layoutSubviews() {
         super.layoutSubviews()
         control.frame = self.bounds
-        imageView.center = CGPoint(x: frame.width/2 - 40 - 40, y: totalHegiht * 0.75)
-        textLabel.center = CGPoint(x: frame.size.width/2, y: totalHegiht * 0.75);
+        textLabel.sizeToFit()
+        textLabel.center = CGPoint(x: frame.size.width / 2.0 , y: self.frame.size.height * 0.75);
+        imageView.center = CGPoint(x: textLabel.frame.origin.x - imageView.frame.size.width - 8.0, y: self.frame.size.height * 0.75)
     }
     
     open override func willMove(toSuperview newSuperview: UIView?) {
@@ -59,11 +57,15 @@ open class ElasticRefreshHeader: UIView,RefreshableHeader {
     // MARK: - Refreshable Header -
     
     open func heightForHeader() -> CGFloat {
-        return totalHegiht
+        return 80.0
+    }
+    
+    public func heightForFireRefreshing() -> CGFloat {
+        return 80.0
     }
     
     open func heightForRefreshingState() -> CGFloat {
-        return totalHegiht/2.0
+        return 80.0/2.0
     }
     
     open func percentUpdateDuringScrolling(_ percent:CGFloat){
@@ -81,7 +83,7 @@ open class ElasticRefreshHeader: UIView,RefreshableHeader {
         self.control.animating = true
     }
     
-    open func didBeginEndRefershingAnimation(_ result:RefreshResult) {
+    open func didBeginHideAnimation(_ result:RefreshResult) {
         switch result {
         case .success:
             self.control.isHidden = true
@@ -102,13 +104,13 @@ open class ElasticRefreshHeader: UIView,RefreshableHeader {
             textLabel.text = textDic[.pullToRefresh]
             imageView.image = nil
         }
+        setNeedsLayout()
     }
     
-    open func didCompleteEndRefershingAnimation(_ result:RefreshResult) {
+    open func didCompleteHideAnimation(_ result:RefreshResult) {
         self.control.isHidden = false
         self.imageView.isHidden = true
         self.textLabel.isHidden = true
-        
     }
 
 }
diff --git a/Source/Classes/Header.swift b/Source/Classes/Header.swift
diff --git a/Source/Classes/Left.swift b/Source/Classes/Left.swift
diff --git a/Source/Classes/PullToRefresh.swift b/Source/Classes/PullToRefresh.swift
diff --git a/Source/Classes/Right.swift b/Source/Classes/Right.swift

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,11 @@ class YahooWeatherRefreshHeader: UIView,RefreshableHeader{`
`79`	`79`	`startTransitionAnimation()`
`80`	`80`	`}`
`81`	`81`	`//刷新结束，将要隐藏header`
`82`		`- func didBeginEndRefershingAnimation(_ result:RefreshResult){`
	`82`	`+ func didBeginHideAnimation(_ result:RefreshResult){`
`83`	`83`
`84`	`84`	`}`
`85`	`85`	`//刷新结束，完全隐藏header`
`86`		`- func didCompleteEndRefershingAnimation(_ result:RefreshResult){`
	`86`	`+ func didCompleteHideAnimation(_ result:RefreshResult){`
`87`	`87`	`imageView.stopAnimating()`
`88`	`88`	`imageView.animationImages = nil`
`89`	`89`	`imageView.image = UIImage(named: "sun_000000")`
Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,14 @@ class YoukuRefreshHeader:UIView,RefreshableHeader{`
`76`	`76`	`self.rotatingImageView.layer.add(rotateAnimation, forKey: "rotate")`
`77`	`77`	`}`
`78`	`78`	`//刷新结束，将要隐藏header`
`79`		`- func didBeginEndRefershingAnimation(_ result:RefreshResult){`
	`79`	`+ func didBeginHideAnimation(_ result:RefreshResult){`
`80`	`80`	`self.rotatingImageView.isHidden = true`
`81`	`81`	`self.iconImageView.isHidden = false`
`82`	`82`	`self.iconImageView.layer.removeAllAnimations()`
`83`	`83`	`self.iconImageView.layer.transform = CATransform3DIdentity`
`84`	`84`	`self.iconImageView.image = UIImage(named: "youku_down")`
`85`	`85`	`}`
`86`	`86`	`//刷新结束，完全隐藏header`
`87`		`- func didCompleteEndRefershingAnimation(_ result:RefreshResult){`
	`87`	`+ func didCompleteHideAnimation(_ result:RefreshResult){`
`88`	`88`	`}`
`89`	`89`	`}`