Skip to content

Commit 7095e09

Browse files
committed
update version info
1 parent 5332d08 commit 7095e09

29 files changed

+78
-57
lines changed

.github/issue_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<!--- 每个类的第五行都标记有版本号,请贴出。 -->
66

7-
1. Version:v1.9.0
7+
1. Version:v1.10.0
88
2. Language:Objective-C
99
4. iOS System Version:iOS10
1010
5. Prototype(是否是真机):YES

CYLTabBarController.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "CYLTabBarController"
3-
s.version = "1.9.0"
3+
s.version = "1.10.0"
44
s.summary = "Highly customizable tabBar and tabBarController for iOS"
55
s.description = "CYLTabBarController is iPad and iPhone compatible. Supports landscape and portrait orientations and can be used inside UINavigationController."
66
s.homepage = "https://github.com/ChenYilong/CYLTabBarController"

CYLTabBarController.xcodeproj/xcuserdata/chenyilong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+39-23
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
ignoreCount = "0"
2121
continueAfterRunningActions = "No"
2222
filePath = "Example/CYLTabBarControllerConfig.m"
23-
timestampString = "483515686.144405"
23+
timestampString = "505586344.471096"
2424
startingColumnNumber = "9223372036854775807"
2525
endingColumnNumber = "9223372036854775807"
26-
startingLineNumber = "201"
27-
endingLineNumber = "201"
26+
startingLineNumber = "202"
27+
endingLineNumber = "202"
2828
landmarkName = "+imageWithColor:size:"
29-
landmarkType = "5">
29+
landmarkType = "7">
3030
</BreakpointContent>
3131
</BreakpointProxy>
3232
<BreakpointProxy
@@ -42,7 +42,7 @@
4242
startingLineNumber = "70"
4343
endingLineNumber = "70"
4444
landmarkName = "-supportedInterfaceOrientations"
45-
landmarkType = "5">
45+
landmarkType = "7">
4646
</BreakpointContent>
4747
</BreakpointProxy>
4848
<BreakpointProxy
@@ -58,7 +58,7 @@
5858
startingLineNumber = "173"
5959
endingLineNumber = "173"
6060
landmarkName = "-setViewControllers:"
61-
landmarkType = "5">
61+
landmarkType = "7">
6262
</BreakpointContent>
6363
</BreakpointProxy>
6464
<BreakpointProxy
@@ -74,7 +74,7 @@
7474
startingLineNumber = "171"
7575
endingLineNumber = "171"
7676
landmarkName = "-setViewControllers:"
77-
landmarkType = "5">
77+
landmarkType = "7">
7878
<Locations>
7979
<Location
8080
shouldBeEnabled = "Yes"
@@ -84,7 +84,7 @@
8484
moduleName = "CYLTabBarController"
8585
usesParentBreakpointCondition = "Yes"
8686
urlString = "file:///Users/chenyilong/Documents/Git/%E7%AC%AC%E4%B8%89%E6%96%B9/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
87-
timestampString = "502562510.137321"
87+
timestampString = "505585873.800656"
8888
startingColumnNumber = "9223372036854775807"
8989
endingColumnNumber = "9223372036854775807"
9090
startingLineNumber = "171"
@@ -99,7 +99,7 @@
9999
moduleName = "CYLTabBarController"
100100
usesParentBreakpointCondition = "Yes"
101101
urlString = "file:///Users/chenyilong/Documents/Git/%E7%AC%AC%E4%B8%89%E6%96%B9/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
102-
timestampString = "502562510.137496"
102+
timestampString = "505585873.802394"
103103
startingColumnNumber = "9223372036854775807"
104104
endingColumnNumber = "9223372036854775807"
105105
startingLineNumber = "171"
@@ -122,7 +122,7 @@
122122
startingLineNumber = "63"
123123
endingLineNumber = "63"
124124
landmarkName = "+addSelectViewControllerTarget:"
125-
landmarkType = "5">
125+
landmarkType = "7">
126126
</BreakpointContent>
127127
</BreakpointProxy>
128128
<BreakpointProxy
@@ -138,7 +138,7 @@
138138
startingLineNumber = "62"
139139
endingLineNumber = "62"
140140
landmarkName = "+addSelectViewControllerTarget:"
141-
landmarkType = "5">
141+
landmarkType = "7">
142142
</BreakpointContent>
143143
</BreakpointProxy>
144144
<BreakpointProxy
@@ -148,13 +148,13 @@
148148
ignoreCount = "0"
149149
continueAfterRunningActions = "No"
150150
filePath = "CYLTabBarController/CYLTabBarController.m"
151-
timestampString = "502563326.819524"
151+
timestampString = "505585386.994016"
152152
startingColumnNumber = "9223372036854775807"
153153
endingColumnNumber = "9223372036854775807"
154-
startingLineNumber = "275"
155-
endingLineNumber = "275"
154+
startingLineNumber = "285"
155+
endingLineNumber = "285"
156156
landmarkName = "-updateSelectionStatusIfNeededForTabBarController:shouldSelectViewController:"
157-
landmarkType = "5">
157+
landmarkType = "7">
158158
</BreakpointContent>
159159
</BreakpointProxy>
160160
<BreakpointProxy
@@ -164,13 +164,13 @@
164164
ignoreCount = "0"
165165
continueAfterRunningActions = "No"
166166
filePath = "CYLTabBarController/CYLTabBarController.m"
167-
timestampString = "502563326.819524"
167+
timestampString = "505585386.994016"
168168
startingColumnNumber = "9223372036854775807"
169169
endingColumnNumber = "9223372036854775807"
170-
startingLineNumber = "281"
171-
endingLineNumber = "281"
170+
startingLineNumber = "291"
171+
endingLineNumber = "291"
172172
landmarkName = "-tabBarController:shouldSelectViewController:"
173-
landmarkType = "5">
173+
landmarkType = "7">
174174
</BreakpointContent>
175175
</BreakpointProxy>
176176
<BreakpointProxy
@@ -180,13 +180,29 @@
180180
ignoreCount = "0"
181181
continueAfterRunningActions = "No"
182182
filePath = "CYLTabBarController/CYLTabBarController.m"
183-
timestampString = "502553945.50124"
183+
timestampString = "505585386.994016"
184184
startingColumnNumber = "9223372036854775807"
185185
endingColumnNumber = "9223372036854775807"
186-
startingLineNumber = "272"
187-
endingLineNumber = "272"
186+
startingLineNumber = "282"
187+
endingLineNumber = "282"
188188
landmarkName = "-updateSelectionStatusIfNeededForTabBarController:shouldSelectViewController:"
189-
landmarkType = "5">
189+
landmarkType = "7">
190+
</BreakpointContent>
191+
</BreakpointProxy>
192+
<BreakpointProxy
193+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
194+
<BreakpointContent
195+
shouldBeEnabled = "Yes"
196+
ignoreCount = "0"
197+
continueAfterRunningActions = "No"
198+
filePath = "CYLTabBarController/CYLTabBarController.m"
199+
timestampString = "505585451.639452"
200+
startingColumnNumber = "9223372036854775807"
201+
endingColumnNumber = "9223372036854775807"
202+
startingLineNumber = "232"
203+
endingLineNumber = "232"
204+
landmarkName = "-getImageFromImageInfo:"
205+
landmarkType = "7">
190206
</BreakpointContent>
191207
</BreakpointProxy>
192208
</Breakpoints>

CYLTabBarController/CYLConstants.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLTabBarController.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

CYLTabBarController/CYLPlusButton.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLPlusButton.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

@@ -88,4 +88,4 @@ FOUNDATION_EXTERN UIViewController *CYLPlusChildViewController;
8888

8989
+ (void)registerSubclass CYL_DEPRECATED("Deprecated in 1.6.0. Use `+[CYLPlusButton registerPlusButton]` instead.");
9090

91-
@end
91+
@end

CYLTabBarController/CYLPlusButton.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLPlusButton.m
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

CYLTabBarController/CYLTabBar.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLTabBar.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

CYLTabBarController/CYLTabBar.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLTabBar.m
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

@@ -279,4 +279,4 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
279279
return nil;
280280
}
281281

282-
@end
282+
@end

CYLTabBarController/CYLTabBarController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLTabBarController.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

CYLTabBarController/UIViewController+CYLTabBarControllerExtention.h

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// UIViewController+CYLTabBarControllerExtention.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 16/2/26.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 16/2/26.
66
// Copyright © 2016年 https://github.com/ChenYilong .All rights reserved.
77
//
88

@@ -40,14 +40,19 @@ typedef void (^CYLPushOrPopCallback)(NSArray<__kindof UIViewController *> *viewC
4040
* Pop 到当前 `NavigationController` 的栈底,并改变 `TabBarController` 的 `selectedViewController` 属性,并将被选择的控制器作为返回值返回。
4141
@param classType 需要选择的控制器所属的类。
4242
@return 最终被选择的控制器。
43-
@attention 注意:方法中的参数和返回值都是 `UIViewController` 的子类,但并非 `UINavigationController` 的子类。
43+
@attention 注意:
44+
- 方法中的参数和返回值都是 `UIViewController` 的子类,但并非 `UINavigationController` 的子类。
45+
- 如果 TabBarViewController 的 viewControllers 中包含多个相同的 `classType` 类型,会返回最左端的一个。
46+
4447
*/
4548
- (UIViewController *)cyl_popSelectTabBarChildViewControllerForClassType:(Class)classType;
4649

4750
/*!
4851
* Pop 到当前 `NavigationController` 的栈底,并改变 `TabBarController` 的 `selectedViewController` 属性,并将被选择的控制器在 `Block` 回调中返回。
4952
@param classType 需要选择的控制器所属的类。
50-
@attention 注意:方法中的参数和返回值都是 `UIViewController` 的子类,但并非 `UINavigationController` 的子类。
53+
@attention 注意:
54+
- 方法中的参数和返回值都是 `UIViewController` 的子类,但并非 `UINavigationController` 的子类。
55+
- 如果 TabBarViewController 的 viewControllers 中包含多个相同的 `classType` 类型,会返回最左端的一个。
5156
*/
5257
- (void)cyl_popSelectTabBarChildViewControllerForClassType:(Class)classType
5358
completion:(CYLPopSelectTabBarChildViewControllerCompletion)completion;
@@ -74,8 +79,8 @@ typedef void (^CYLPushOrPopCallback)(NSArray<__kindof UIViewController *> *viewC
7479
callback:(CYLPushOrPopCallback)callback;
7580

7681
/*!
77-
* 如果正要 Push 的页面与当前栈顶的页面类型相同则取消 Push
78-
* 这样做防止主界面卡顿时,导致一个 ViewController 被 Push 多次
82+
* 如果正要 Push 的页面与当前栈顶的页面类型相同则取消 Push
83+
* 这样做防止主界面卡顿时,导致一个 ViewController 被 Push 多次
7984
*/
8085
- (void)cyl_pushViewController:(UIViewController *)viewController animated:(BOOL)animated;
8186

CYLTabBarController/UIViewController+CYLTabBarControllerExtention.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// UIViewController+CYLTabBarControllerExtention.m
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 16/2/26.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 16/2/26.
66
// Copyright © 2016年 https://github.com/ChenYilong .All rights reserved.
77
//
88

@@ -165,4 +165,4 @@ - (NSInteger)cyl_indexForClassType:(Class)classType inViewControllers:(NSArray *
165165
return atIndex;
166166
}
167167

168-
@end
168+
@end

CYLTabBarControllerTests/CYLTabBarControllerTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLTabBarControllerTests.m
33
// CYLTabBarControllerTests
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 15/10/25.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 15/10/25.
66
// Copyright (c) 2015年 https://github.com/ChenYilong .All rights reserved.
77
//
88

Example/AppDelegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// AppDelegate.h
33
// CYLTabBarControllerDemo
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/AppDelegate.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// AppDelegate.m
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/CYLTabBarControllerConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLTabBarControllerConfig.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 15/11/3.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 15/11/3.
66
// Copyright © 2015年 https://github.com/ChenYilong .All rights reserved.
77
//
88

Example/Classes/Module/Home/CYLHomeViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLHomeViewController.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/Classes/Module/Home/CYLHomeViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLHomeViewController.m
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/Classes/Module/Message/CYLMessageViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLMessageViewController.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/Classes/Module/Message/CYLMessageViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLMessageViewController.m
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/Classes/Module/Mine/CYLMineViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLMineViewController.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/Classes/Module/Mine/CYLMineViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLMineViewController.m
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
5+
// v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
66
// Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
77
//
88

Example/Classes/Module/SameCity/CYLDetailsViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// CYLDetailsViewController.h
33
// CYLTabBarController
44
//
5-
// v1.9.0 Created by Robert Dimitrov on 11/8/14.
5+
// v1.10.0 Created by Robert Dimitrov on 11/8/14.
66
// Copyright (c) 2014 Robert Dimitrov. All rights reserved.
77
//
88

0 commit comments

Comments
 (0)