Skip to content
This repository was archived by the owner on Jul 1, 2020. It is now read-only.

Commit 14080fc

Browse files
LeoMobileDeveloperLeoMobileDeveloper
committed
Footer修改为三种模式：点击，上拉，点击和上拉
1 parent c2daded commit 14080fc

14 files changed

Lines changed: 206 additions & 85 deletions

‎PullToRefreshKit.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
52E8FB451D336E26000D0BF1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52E8FB431D336E26000D0BF1 /* Main.storyboard */; };
3535
52E8FB471D336E26000D0BF1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52E8FB461D336E26000D0BF1 /* Assets.xcassets */; };
3636
52E8FB4A1D336E26000D0BF1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52E8FB481D336E26000D0BF1 /* LaunchScreen.storyboard */; };
37+
52F50E2C1D3E374200A9AB83 /* NetEaseFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52F50E2B1D3E374200A9AB83 /* NetEaseFooter.swift */; };
38+
52F50E391D3E3E3800A9AB83 /* PullToRefreshkit.strings in Resources */ = {isa = PBXBuildFile; fileRef = 52F50E3B1D3E3E3800A9AB83 /* PullToRefreshkit.strings */; };
3739
52FA97A41D3882190021D77F /* CustomBaseTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FA97A31D3882190021D77F /* CustomBaseTableViewController.swift */; };
3840
52FA97AB1D3898770021D77F /* DianpingRefreshHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FA97AA1D3898770021D77F /* DianpingRefreshHeader.swift */; };
3941
52FA97AD1D389A640021D77F /* DianpingTableviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FA97AC1D389A640021D77F /* DianpingTableviewController.swift */; };
@@ -69,6 +71,9 @@
6971
52E8FB461D336E26000D0BF1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
7072
52E8FB491D336E26000D0BF1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7173
52E8FB4B1D336E26000D0BF1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
74+
52F50E2B1D3E374200A9AB83 /* NetEaseFooter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetEaseFooter.swift; sourceTree = "<group>"; };
75+
52F50E3A1D3E3E3800A9AB83 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/PullToRefreshkit.strings; sourceTree = "<group>"; };
76+
52F50E3C1D3E3E4400A9AB83 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/PullToRefreshkit.strings"; sourceTree = "<group>"; };
7277
52FA97A31D3882190021D77F /* CustomBaseTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomBaseTableViewController.swift; sourceTree = "<group>"; };
7378
52FA97AA1D3898770021D77F /* DianpingRefreshHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DianpingRefreshHeader.swift; sourceTree = "<group>"; };
7479
52FA97AC1D389A640021D77F /* DianpingTableviewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DianpingTableviewController.swift; sourceTree = "<group>"; };
@@ -98,14 +103,15 @@
98103
name = Examples;
99104
sourceTree = "<group>";
100105
};
101-
52BB29291D364C1C0091F36B /* Images */ = {
106+
52BB29291D364C1C0091F36B /* Resources */ = {
102107
isa = PBXGroup;
103108
children = (
104109
5238C8041D3763CD00B3B4FE /* arrow_down@3x.png */,
105110
5238C8051D3763CD00B3B4FE /* arrow_left@3x.png */,
106111
5238C8061D3763CD00B3B4FE /* arrow_right@3x.png */,
112+
52F50E3B1D3E3E3800A9AB83 /* PullToRefreshkit.strings */,
107113
);
108-
name = Images;
114+
name = Resources;
109115
sourceTree = "<group>";
110116
};
111117
52BB292A1D364C260091F36B /* Classes */ = {
@@ -137,6 +143,7 @@
137143
52BB292C1D364C390091F36B /* Custom */ = {
138144
isa = PBXGroup;
139145
children = (
146+
52F50E2A1D3E371400A9AB83 /* 网易Fooer */,
140147
52FA97A91D3888990021D77F /* dianping */,
141148
52FA97A71D3888660021D77F /* taobao */,
142149
52FA97A31D3882190021D77F /* CustomBaseTableViewController.swift */,
@@ -180,11 +187,19 @@
180187
isa = PBXGroup;
181188
children = (
182189
52BB292A1D364C260091F36B /* Classes */,
183-
52BB29291D364C1C0091F36B /* Images */,
190+
52BB29291D364C1C0091F36B /* Resources */,
184191
);
185192
name = Sources;
186193
sourceTree = "<group>";
187194
};
195+
52F50E2A1D3E371400A9AB83 /* 网易Fooer */ = {
196+
isa = PBXGroup;
197+
children = (
198+
52F50E2B1D3E374200A9AB83 /* NetEaseFooter.swift */,
199+
);
200+
name = "网易Fooer";
201+
sourceTree = "<group>";
202+
};
188203
52FA97A71D3888660021D77F /* taobao */ = {
189204
isa = PBXGroup;
190205
children = (
@@ -245,6 +260,7 @@
245260
knownRegions = (
246261
en,
247262
Base,
263+
"zh-Hans",
248264
);
249265
mainGroup = 52E8FB331D336E26000D0BF1;
250266
productRefGroup = 52E8FB3D1D336E26000D0BF1 /* Products */;
@@ -263,6 +279,7 @@
263279
files = (
264280
5238C8091D3763CD00B3B4FE /* arrow_right@3x.png in Resources */,
265281
52261F111D36878A00161ADF /* banner2.jpg in Resources */,
282+
52F50E391D3E3E3800A9AB83 /* PullToRefreshkit.strings in Resources */,
266283
5238C8071D3763CD00B3B4FE /* arrow_down@3x.png in Resources */,
267284
52261F101D36878A00161ADF /* banner1.jpg in Resources */,
268285
52E8FB4A1D336E26000D0BF1 /* LaunchScreen.storyboard in Resources */,
@@ -282,6 +299,7 @@
282299
5238C8011D3763BA00B3B4FE /* Left.swift in Sources */,
283300
52BB29281D3644D00091F36B /* SectionModel.swift in Sources */,
284301
5238C8021D3763BA00B3B4FE /* PullToRefresh.swift in Sources */,
302+
52F50E2C1D3E374200A9AB83 /* NetEaseFooter.swift in Sources */,
285303
52261F131D36879C00161ADF /* DefaultBannerController.swift in Sources */,
286304
5238C7D31D37427C00B3B4FE /* TaoBaoRefreshHeader.swift in Sources */,
287305
52E8FB421D336E26000D0BF1 /* MainViewController.swift in Sources */,
@@ -323,6 +341,15 @@
323341
name = LaunchScreen.storyboard;
324342
sourceTree = "<group>";
325343
};
344+
52F50E3B1D3E3E3800A9AB83 /* PullToRefreshkit.strings */ = {
345+
isa = PBXVariantGroup;
346+
children = (
347+
52F50E3A1D3E3E3800A9AB83 /* Base */,
348+
52F50E3C1D3E3E4400A9AB83 /* zh-Hans */,
349+
);
350+
name = PullToRefreshkit.strings;
351+
sourceTree = "<group>";
352+
};
326353
/* End PBXVariantGroup section */
327354

328355
/* Begin XCBuildConfiguration section */

‎PullToRefreshKit/Base.lproj/PullToRefreshkit.strings‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
PullToRefreshkit.strings
3+
PullToRefreshKit
4+
5+
Created by huangwenchen on 16/7/19.
6+
Copyright © 2016年 Leo. All rights reserved.
7+
*/
8+
9+
"pullDownToRefresh" = "Pull to refresh";
10+
"releaseToRefresh" = "Release to refresh";
11+
"refreshSuccess" = "Update successfully";
12+
"refreshFailure" = "Update failed";
13+
"refreshError" = "Error occurred";
14+
"refreshing" = "Refreshing...";
15+
16+
"pullUpToRefresh" = "Pull to refresh";
17+
"noMoreData" = "No more data";
18+
"tapToRefresh" = "Tap to load more";
19+
20+
"scrollToClose" = "Scroll to close";
21+
"releaseToClose" = "Release to close";
22+
23+
24+
"scrollToViewMore" = "Scroll to view more";
25+
"releaseToViewMore" = "Release to view more";

‎PullToRefreshKit/ConfigHeaderFooterController.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ class ConfigDefaultHeaderFooterController: UITableViewController {
4141
self?.tableView.endFooterRefreshing()
4242
})
4343
}.SetUp { (footer) in
44-
footer.setText("Pull up to refresh", mode: RefreshKitFooterText.pullToRefresh)
45-
footer.setText("No data any more", mode: RefreshKitFooterText.noMoreData)
46-
footer.setText("Refreshing...", mode: RefreshKitFooterText.refreshing)
47-
footer.setText("Tap to load more", mode: RefreshKitFooterText.tapToRefresh)
44+
footer.setText("Pull up to refresh", mode: RefreshKitFooterText.PullToRefresh)
45+
footer.setText("No data any more", mode: RefreshKitFooterText.NoMoreData)
46+
footer.setText("Refreshing...", mode: RefreshKitFooterText.Refreshing)
47+
footer.setText("Tap to load more", mode: RefreshKitFooterText.TapToRefresh)
4848
footer.textLabel.textColor = UIColor.orangeColor()
49-
footer.needTapToLoadMore = true
49+
footer.refreshMode = .Tap
5050
}
5151
}
5252
override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

‎PullToRefreshKit/MainViewController.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import UIKit
1010
import AudioToolbox
11-
1211
/*
1312
如果你喜欢这个库，一个★就是对我最好的支持，项目地址 https://github.com/LeoMobileDeveloper/PullToRefreshKit
1413
*/
@@ -25,7 +24,7 @@ class MainViewController: UITableViewController {
2524
rowsTargetControlerNames:["ConfigDefaultHeaderFooterController","ConfigBannerController"])
2625
let section2 = SectionModel(rowsCount: 2,
2726
sectionTitle:"自定义",
28-
rowsTitles: ["淘宝下拉刷新","大众点评下拉刷新"],
27+
rowsTitles: ["淘宝","大众点评"],
2928
rowsTargetControlerNames:["TaobaoTableViewController","DianpingTableviewController"])
3029
models.append(section0)
3130
models.append(section1)

‎PullToRefreshKit/NetEaseFooter.swift‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//
2+
// NetEaseFooter.swift
3+
// PullToRefreshKit
4+
//
5+
// Created by huangwenchen on 16/7/19.
6+
// Copyright © 2016年 Leo. All rights reserved.
7+
//
8+
9+
import Foundation
10+
import UIKit
11+
12+
class NetEaseFooter:UIView,RefreshableFooter{
13+
func distanceToRefresh() -> CGFloat {
14+
return 70.0
15+
}
16+
func didBeginRefreshing() {
17+
18+
}
19+
func didUpdateToNoMoreData() {
20+
21+
}
22+
func didEndRefreshing() {
23+
24+
}
25+
func didResetToDefault() {
26+
27+
}
28+
func shouldBeginRefreshingWhenScroll() -> Bool {
29+
return false
30+
}
31+
}

‎PullToRefreshKit/zh-Hans.lproj/LaunchScreen.strings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎PullToRefreshKit/zh-Hans.lproj/Main.strings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
/* Class = "UINavigationItem"; title = "Demo列表"; ObjectID = "Git-wC-dbv"; */
3+
"Git-wC-dbv.title" = "Demo列表";

‎PullToRefreshKit/zh-Hans.lproj/PullToRefreshkit.strings‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
PullToRefreshkit.strings
3+
PullToRefreshKit
4+
5+
Created by huangwenchen on 16/7/19.
6+
Copyright © 2016年 Leo. All rights reserved.
7+
*/
8+
9+
"pullDownToRefresh" = "下拉可以刷新";
10+
"releaseToRefresh" = "松开立即刷新";
11+
"refreshSuccess" = "刷新成功";
12+
"refreshFailure" = "刷新失败";
13+
"refreshError" = "刷新出错";
14+
"refreshing" = "正在刷新数据中...";
15+
16+
"pullUpToRefresh" = "上拉加载更多数据";
17+
"noMoreData" = "数据加载完毕";
18+
"tapToRefresh" = "点击加载更多";
19+
20+
"scrollToClose" = "滑动结束浏览";
21+
"releaseToClose" = "松开结束浏览";
22+
23+
24+
"scrollToViewMore" = "滑动浏览更多";
25+
"releaseToViewMore" = "滑动浏览更多";

‎Source/Classes/Const.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct PullToRefreshKitConst{
3030
}
3131

3232
struct PullToRefreshKitHeaderString{
33-
static let pullToRefresh = "下拉可以刷新"
33+
static let pullDownToRefresh = "下拉可以刷新"
3434
static let releaseToRefresh = "松开立即刷新"
3535
static let refreshSuccess = "刷新成功"
3636
static let refreshError = "刷新出错"
@@ -39,20 +39,20 @@ struct PullToRefreshKitHeaderString{
3939
}
4040

4141
struct PullToRefreshKitFooterString{
42-
static let pullToRefresh = "上拉加载更多数据"
42+
static let pullUpToRefresh = "上拉加载更多数据"
4343
static let refreshing = "正在加载中..."
4444
static let noMoreData = "数据加载完毕"
45-
static let tapToRefresh = "数据加载完毕"
46-
45+
static let tapToRefresh = "点击加载更多"
46+
static let scrollAndTapToRefresh = "上拉或者点击加载更多"
4747
}
4848

4949
struct PullToRefreshKitLeftString{
50-
static let scrollToAction = "滑动结束浏览"
51-
static let releaseToAction = "松开结束浏览"
50+
static let scrollToClose = "滑动结束浏览"
51+
static let releaseToClose = "松开结束浏览"
5252
}
5353

5454
struct PullToRefreshKitRightString{
55-
static let scrollToAction = "滑动浏览更多"
56-
static let releaseToAction = "松开浏览更多"
55+
static let scrollToViewMore = "滑动浏览更多"
56+
static let releaseToViewMore = "滑动浏览更多"
5757
}
5858

0 commit comments

Comments
 (0)