Skip to content

Commit 59ec3c0

Browse files
wangrui460wangrui460
committed
update normal's controllers name
1 parent 42b532b commit 59ec3c0

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎WRNavigationBar_swift/WRNavigationBar_swift.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
1A0DF7901EA7176500191349 /* WRNavigationBar_swiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DF78F1EA7176500191349 /* WRNavigationBar_swiftTests.swift */; };
1515
1A0DF7B31EA7372800191349 /* NormalListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DF7B21EA7372800191349 /* NormalListController.swift */; };
1616
1A0DF7B51EA7380600191349 /* SixthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DF7B41EA7380600191349 /* SixthViewController.swift */; };
17-
1A0DF7B71EA7471B00191349 /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DF7B61EA7471B00191349 /* FirstViewController.swift */; };
17+
1A0DF7B71EA7471B00191349 /* MineInfoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DF7B61EA7471B00191349 /* MineInfoController.swift */; };
1818
1A0DF7B91EA7521C00191349 /* BaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DF7B81EA7521C00191349 /* BaseNavigationController.swift */; };
1919
1A0DF7BE1EA7545900191349 /* WRNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DF7BD1EA7545900191349 /* WRNavigationBar.swift */; };
2020
1A869EDD1ECAA0C1006D96F8 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A869EDC1ECAA0C1006D96F8 /* BaseViewController.swift */; };
@@ -24,8 +24,8 @@
2424
1A966E8D1EE048F60045FCB8 /* AntForestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A966E8C1EE048F60045FCB8 /* AntForestController.swift */; };
2525
1AB702661EA9A43C006DBA79 /* SecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB702651EA9A43C006DBA79 /* SecondViewController.swift */; };
2626
1AB702681EA9A9BC006DBA79 /* ThirdViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB702671EA9A9BC006DBA79 /* ThirdViewController.swift */; };
27-
1AB7026A1EA9AC7A006DBA79 /* FourthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB702691EA9AC7A006DBA79 /* FourthViewController.swift */; };
28-
1AB7026C1EA9B753006DBA79 /* FifthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7026B1EA9B753006DBA79 /* FifthViewController.swift */; };
27+
1AB7026A1EA9AC7A006DBA79 /* QQAppController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB702691EA9AC7A006DBA79 /* QQAppController.swift */; };
28+
1AB7026C1EA9B753006DBA79 /* QQZoneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7026B1EA9B753006DBA79 /* QQZoneController.swift */; };
2929
1AD0140A1EDBFB4500A6893C /* ZhiHuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD014091EDBFB4500A6893C /* ZhiHuController.swift */; };
3030
1AD0140F1EDBFEAC00A6893C /* WRCycleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD0140C1EDBFEAC00A6893C /* WRCycleCell.swift */; };
3131
1AD014101EDBFEAC00A6893C /* WRCycleScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD0140D1EDBFEAC00A6893C /* WRCycleScrollView.swift */; };
@@ -56,7 +56,7 @@
5656
1A0DF7911EA7176500191349 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5757
1A0DF7B21EA7372800191349 /* NormalListController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NormalListController.swift; sourceTree = "<group>"; };
5858
1A0DF7B41EA7380600191349 /* SixthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SixthViewController.swift; sourceTree = "<group>"; };
59-
1A0DF7B61EA7471B00191349 /* FirstViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstViewController.swift; sourceTree = "<group>"; };
59+
1A0DF7B61EA7471B00191349 /* MineInfoController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MineInfoController.swift; sourceTree = "<group>"; };
6060
1A0DF7B81EA7521C00191349 /* BaseNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BaseNavigationController.swift; path = Demos/BaseNavigationController.swift; sourceTree = "<group>"; };
6161
1A0DF7BD1EA7545900191349 /* WRNavigationBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WRNavigationBar.swift; sourceTree = "<group>"; };
6262
1A869EDC1ECAA0C1006D96F8 /* BaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
@@ -66,8 +66,8 @@
6666
1A966E8C1EE048F60045FCB8 /* AntForestController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AntForestController.swift; sourceTree = "<group>"; };
6767
1AB702651EA9A43C006DBA79 /* SecondViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecondViewController.swift; sourceTree = "<group>"; };
6868
1AB702671EA9A9BC006DBA79 /* ThirdViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThirdViewController.swift; sourceTree = "<group>"; };
69-
1AB702691EA9AC7A006DBA79 /* FourthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FourthViewController.swift; sourceTree = "<group>"; };
70-
1AB7026B1EA9B753006DBA79 /* FifthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FifthViewController.swift; sourceTree = "<group>"; };
69+
1AB702691EA9AC7A006DBA79 /* QQAppController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QQAppController.swift; sourceTree = "<group>"; };
70+
1AB7026B1EA9B753006DBA79 /* QQZoneController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QQZoneController.swift; sourceTree = "<group>"; };
7171
1AD014091EDBFB4500A6893C /* ZhiHuController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZhiHuController.swift; sourceTree = "<group>"; };
7272
1AD0140C1EDBFEAC00A6893C /* WRCycleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WRCycleCell.swift; sourceTree = "<group>"; };
7373
1AD0140D1EDBFEAC00A6893C /* WRCycleScrollView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WRCycleScrollView.swift; sourceTree = "<group>"; };
@@ -156,9 +156,9 @@
156156
isa = PBXGroup;
157157
children = (
158158
1A0DF7B21EA7372800191349 /* NormalListController.swift */,
159-
1A0DF7B61EA7471B00191349 /* FirstViewController.swift */,
160-
1AB702691EA9AC7A006DBA79 /* FourthViewController.swift */,
161-
1AB7026B1EA9B753006DBA79 /* FifthViewController.swift */,
159+
1A0DF7B61EA7471B00191349 /* MineInfoController.swift */,
160+
1AB702691EA9AC7A006DBA79 /* QQAppController.swift */,
161+
1AB7026B1EA9B753006DBA79 /* QQZoneController.swift */,
162162
1AD014091EDBFB4500A6893C /* ZhiHuController.swift */,
163163
1AD014121EDC091F00A6893C /* QQMineController.swift */,
164164
1A966E8C1EE048F60045FCB8 /* AntForestController.swift */,
@@ -376,7 +376,7 @@
376376
files = (
377377
1A869EDF1ECAA36B006D96F8 /* CustomNavBarController.swift in Sources */,
378378
1AD014131EDC091F00A6893C /* QQMineController.swift in Sources */,
379-
1AB7026C1EA9B753006DBA79 /* FifthViewController.swift in Sources */,
379+
1AB7026C1EA9B753006DBA79 /* QQZoneController.swift in Sources */,
380380
1A96559E1ED6B8C600A89E30 /* MoveListController.swift in Sources */,
381381
1AD014111EDBFEAC00A6893C /* WRProxy.swift in Sources */,
382382
1A0DF7BE1EA7545900191349 /* WRNavigationBar.swift in Sources */,
@@ -386,14 +386,14 @@
386386
1A0DF7B31EA7372800191349 /* NormalListController.swift in Sources */,
387387
1AD014101EDBFEAC00A6893C /* WRCycleScrollView.swift in Sources */,
388388
1A0DF7B51EA7380600191349 /* SixthViewController.swift in Sources */,
389-
1AB7026A1EA9AC7A006DBA79 /* FourthViewController.swift in Sources */,
389+
1AB7026A1EA9AC7A006DBA79 /* QQAppController.swift in Sources */,
390390
1A0DF77B1EA7176500191349 /* AppDelegate.swift in Sources */,
391391
1A966E8D1EE048F60045FCB8 /* AntForestController.swift in Sources */,
392392
1A96559C1ED6B64F00A89E30 /* CustomListController.swift in Sources */,
393393
1AB702661EA9A43C006DBA79 /* SecondViewController.swift in Sources */,
394394
1A0DF7B91EA7521C00191349 /* BaseNavigationController.swift in Sources */,
395395
1AB702681EA9A9BC006DBA79 /* ThirdViewController.swift in Sources */,
396-
1A0DF7B71EA7471B00191349 /* FirstViewController.swift in Sources */,
396+
1A0DF7B71EA7471B00191349 /* MineInfoController.swift in Sources */,
397397
);
398398
runOnlyForDeploymentPostprocessing = 0;
399399
};

‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/FirstViewController.swift renamed to ‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/MineInfoController.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// FirstViewController.swift
2+
// MineInfoController.swift
33
// WRNavigationBar_swift
44
//
55
// Created by wangrui on 2017/4/19.
@@ -11,7 +11,7 @@ import UIKit
1111
private let IMAGE_HEIGHT:CGFloat = 260
1212
private let NAVBAR_COLORCHANGE_POINT:CGFloat = IMAGE_HEIGHT - CGFloat(kNavBarBottom * 2)
1313

14-
class FirstViewController: UIViewController
14+
class MineInfoController: UIViewController
1515
{
1616
lazy var tableView:UITableView = {
1717
let table:UITableView = UITableView(frame: CGRect.init(x: 0, y: 0, width: kScreenWidth, height: self.view.bounds.height), style: .plain)
@@ -61,7 +61,7 @@ class FirstViewController: UIViewController
6161

6262

6363
// MARK: - 滑动改变导航栏透明度、标题颜色、左右按钮颜色、状态栏颜色
64-
extension FirstViewController
64+
extension MineInfoController
6565
{
6666
func scrollViewDidScroll(_ scrollView: UIScrollView)
6767
{
@@ -85,7 +85,7 @@ extension FirstViewController
8585
}
8686

8787

88-
extension FirstViewController:UITableViewDelegate,UITableViewDataSource
88+
extension MineInfoController:UITableViewDelegate,UITableViewDataSource
8989
{
9090
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
9191
return 15

‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/NormalListController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ extension NormalListController: UITableViewDelegate, UITableViewDataSource
6969
tableView.deselectRow(at: indexPath, animated: true)
7070
switch indexPath.row {
7171
case 0:
72-
navigationController?.pushViewController(FirstViewController(), animated: true)
72+
navigationController?.pushViewController(MineInfoController(), animated: true)
7373
case 1:
74-
navigationController?.pushViewController(FourthViewController(), animated: true)
74+
navigationController?.pushViewController(QQAppController(), animated: true)
7575
case 2:
76-
navigationController?.pushViewController(FifthViewController(), animated: true)
76+
navigationController?.pushViewController(QQZoneController(), animated: true)
7777
case 3:
7878
navigationController?.pushViewController(ZhiHuController(), animated: true)
7979
case 4:

‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/FourthViewController.swift renamed to ‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/QQAppController.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// FourthViewController.swift
2+
// QQAppController.swift
33
// WRNavigationBar_swift
44
//
55
// Created by wangrui on 2017/4/21.
@@ -13,7 +13,7 @@ private let IMAGE_HEIGHT:CGFloat = 260
1313
private let SCROLL_DOWN_LIMIT:CGFloat = 100
1414
private let LIMIT_OFFSET_Y:CGFloat = -(IMAGE_HEIGHT + SCROLL_DOWN_LIMIT)
1515

16-
class FourthViewController: UIViewController
16+
class QQAppController: UIViewController
1717
{
1818
lazy var tableView:UITableView = {
1919
let table:UITableView = UITableView(frame: CGRect.init(x: 0, y: 0, width: kScreenWidth, height: self.view.bounds.height), style: .plain)
@@ -48,7 +48,7 @@ class FourthViewController: UIViewController
4848
}
4949

5050
// MARK: - viewWillAppear .. ScrollViewDidScroll
51-
extension FourthViewController
51+
extension QQAppController
5252
{
5353
func scrollViewDidScroll(_ scrollView: UIScrollView)
5454
{
@@ -102,7 +102,7 @@ extension FourthViewController
102102
}
103103

104104

105-
extension FourthViewController: UITableViewDelegate,UITableViewDataSource
105+
extension QQAppController: UITableViewDelegate,UITableViewDataSource
106106
{
107107
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
108108
return 15

‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/FifthViewController.swift renamed to ‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/QQZoneController.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// FifthViewController.swift
2+
// QQZoneController.swift
33
// WRNavigationBar_swift
44
//
55
// Created by wangrui on 2017/4/21.
@@ -13,7 +13,7 @@ private let IMAGE_HEIGHT:CGFloat = 260
1313
private let SCROLL_DOWN_LIMIT:CGFloat = 100
1414
private let LIMIT_OFFSET_Y:CGFloat = -(IMAGE_HEIGHT + SCROLL_DOWN_LIMIT)
1515

16-
class FifthViewController: UIViewController
16+
class QQZoneController: UIViewController
1717
{
1818
lazy var tableView:UITableView = {
1919
let table:UITableView = UITableView(frame: CGRect.init(x: 0, y: 0, width: kScreenWidth, height: self.view.bounds.height), style: .plain)
@@ -49,7 +49,7 @@ class FifthViewController: UIViewController
4949

5050

5151
// MARK: - viewWillAppear .. ScrollViewDidScroll
52-
extension FifthViewController
52+
extension QQZoneController
5353
{
5454
func scrollViewDidScroll(_ scrollView: UIScrollView)
5555
{
@@ -91,7 +91,7 @@ extension FifthViewController
9191
}
9292

9393

94-
extension FifthViewController: UITableViewDelegate,UITableViewDataSource
94+
extension QQZoneController: UITableViewDelegate,UITableViewDataSource
9595
{
9696
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
9797
return 15

0 commit comments

Comments
 (0)