v1.2.1 fix typo

ChenYilong · ChenYilong · commit e273c21a3143 · 2016-02-27T02:40:37.000+08:00
diff --git a/CYLTabBarController.podspec b/CYLTabBarController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CYLTabBarController"
-  s.version      = "1.2.0"
+  s.version      = "1.2.1"
   s.summary      = "Highly customizable tabBar and tabBarController for iOS"
   s.description  = "CYLTabBarController is iPad and iPhone compatible. Supports landscape and portrait orientations and can be used inside UINavigationController."
   s.homepage     = "https://github.com/ChenYilong/CYLTabBarController"
diff --git a/CYLTabBarController/CYLPlusButton.h b/CYLTabBarController/CYLPlusButton.h
@@ -34,7 +34,7 @@
 
 @class CYLTabBar;
 
-extern UIButton<CYLPlusButtonSubclassing> *CYLExternPushlishButton;
+extern UIButton<CYLPlusButtonSubclassing> *CYLExternPlusButton;
 
 @interface CYLPlusButton : UIButton
 
diff --git a/CYLTabBarController/CYLPlusButton.m b/CYLTabBarController/CYLPlusButton.m
@@ -9,7 +9,7 @@
 #import "CYLPlusButton.h"
 #import "CYLTabBarController.h"
 
-UIButton<CYLPlusButtonSubclassing> *CYLExternPushlishButton = nil;
+UIButton<CYLPlusButtonSubclassing> *CYLExternPlusButton = nil;
 
 @implementation CYLPlusButton
 
@@ -19,7 +19,7 @@ @implementation CYLPlusButton
 + (void)registerSubclass {
     if ([self conformsToProtocol:@protocol(CYLPlusButtonSubclassing)]) {
         Class<CYLPlusButtonSubclassing> class = self;
-        CYLExternPushlishButton = [class plusButton];
+        CYLExternPlusButton = [class plusButton];
     }
 }
 
diff --git a/CYLTabBarController/CYLTabBar.m b/CYLTabBarController/CYLTabBar.m
@@ -36,8 +36,8 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
 }
 
 - (instancetype)sharedInit {
-    if (CYLExternPushlishButton) {
-        self.plusButton = CYLExternPushlishButton;
+    if (CYLExternPlusButton) {
+        self.plusButton = CYLExternPlusButton;
         [self addSubview:(UIButton *)self.plusButton];
     }
     [self setBackgroundImage:[self imageWithColor:[UIColor whiteColor]]];
@@ -46,7 +46,7 @@ - (instancetype)sharedInit {
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    if (!CYLExternPushlishButton) {
+    if (!CYLExternPlusButton) {
         return;
     }
     CGFloat barWidth = self.frame.size.width;
@@ -74,7 +74,7 @@ - (void)layoutSubviews {
     NSUInteger plusButtonIndex;
     if ([[self.plusButton class] respondsToSelector:@selector(indexOfPlusButtonInTabBar)]) {
         if (CYLTabbarItemsCount % 2 == 0) {
-            [NSException raise:@"CYLTabBarController" format:@"If the count of CYLTabbarControllers is not odd,there's no need to realizse `+indexOfPlusButtonInTabBar` in your custom plusButton class.【中文】如果CYLTabbarControllers的个数不是奇数，会自动居中，你无需在你自定义的plusButton中实现`+indexOfPlusButtonInTabBar`，来指定plusButton的位置"];
+            [NSException raise:@"CYLTabBarController" format:@"If the count of CYLTabbarControllers is not odd,there's no need to realizse `+indexOfPlusButtonInTabBar` in your custom plusButton class.【Chinese】如果CYLTabbarControllers的个数不是奇数，会自动居中，你无需在你自定义的plusButton中实现`+indexOfPlusButtonInTabBar`，来指定plusButton的位置"];
         }
         plusButtonIndex = [[self.plusButton class] indexOfPlusButtonInTabBar];
         //仅修改self.plusButton的x,ywh值不变
@@ -85,7 +85,7 @@ - (void)layoutSubviews {
                                            );
     } else {
         if (CYLTabbarItemsCount % 2 != 0) {
-            [NSException raise:@"CYLTabBarController" format:@"If the count of CYLTabbarControllers is odd,you must realizse `+indexOfPlusButtonInTabBar` in your custom plusButton class.【中文】如果CYLTabbarControllers的个数是奇数，你必须在你自定义的plusButton中实现`+indexOfPlusButtonInTabBar`，来指定plusButton的位置"];
+            [NSException raise:@"CYLTabBarController" format:@"If the count of CYLTabbarControllers is odd,you must realizse `+indexOfPlusButtonInTabBar` in your custom plusButton class.【Chinese】如果CYLTabbarControllers的个数是奇数，你必须在你自定义的plusButton中实现`+indexOfPlusButtonInTabBar`，来指定plusButton的位置"];
         }
         plusButtonIndex = CYLTabbarItemsCount / 2.0;
     }
@@ -118,10 +118,8 @@ - (void)layoutSubviews {
     [self bringSubviewToFront:self.plusButton];
 }
 
-/*
- *
- Capturing touches on a subview outside the frame of its superview
- *
+/**
+ *  Capturing touches on a subview outside the frame of its superview
  */
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
     if (!self.clipsToBounds && !self.hidden && self.alpha > 0) {
diff --git a/CYLTabBarController/CYLTabBarController.m b/CYLTabBarController/CYLTabBarController.m
@@ -54,7 +54,7 @@ - (void)setViewControllers:(NSArray *)viewControllers {
         _viewControllers = [viewControllers copy];
         if (_tabBarItemsAttributes) {
             if (_tabBarItemsAttributes.count != _viewControllers.count) {
-                [NSException raise:@"CYLTabBarController" format:@"The count of CYLTabBarControllers is not equal to the count of tabBarItemsAttributes.【中文】设置_tabBarItemsAttributes属性时，请确保元素个数与控制器的个数相同，并在方法`-setViewControllers:`之前设置"];
+                [NSException raise:@"CYLTabBarController" format:@"The count of CYLTabBarControllers is not equal to the count of tabBarItemsAttributes.【Chinese】设置_tabBarItemsAttributes属性时，请确保元素个数与控制器的个数相同，并在方法`-setViewControllers:`之前设置"];
             }
         }
         CYLTabbarItemsCount = [viewControllers count];
@@ -100,7 +100,7 @@ - (void)addOneChildViewController:(UIViewController *)viewController
 }
 
 + (BOOL)havePlusButton {
-    if (CYLExternPushlishButton) {
+    if (CYLExternPlusButton) {
         return YES;
     }
     return NO;
diff --git a/Example/Classes/CYLTabBarControllerConfig.m b/Example/Classes/CYLTabBarControllerConfig.m
@@ -14,7 +14,7 @@ @interface CYLBaseNavigationController : UINavigationController
 @implementation CYLBaseNavigationController
 
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    // fix strange animate when use `-[UIViewController cyl_jumpToOtherTabBarControllerItem:(Class)ClassType performSelector:arguments:returnValue:]` ,like this http://i63.tinypic.com/bg766g.jpg .
+    // fix strange animate when use `-[UIViewController cyl_jumpToOtherTabBarControllerItem:(Class)ClassType performSelector:arguments:returnValue:]` ,like this http://i63.tinypic.com/bg766g.jpg . If you have not used this method delete this line blow.
     [(CYLTabBarController *)self.tabBarController rootWindow].backgroundColor = [UIColor whiteColor];
     if (self.viewControllers.count > 0) {
         viewController.hidesBottomBarWhenPushed = YES;
@@ -63,11 +63,7 @@ - (CYLTabBarController *)tabBarController {
                                                         initWithRootViewController:fourthViewController];
         CYLTabBarController *tabBarController = [[CYLTabBarController alloc] init];
         
-        /*
-         *
-         在`-setViewControllers:`之前设置TabBar的属性，设置TabBarItem的属性，包括 title、Image、selectedImage。
-         *
-         */
+         // 在`-setViewControllers:`之前设置TabBar的属性，设置TabBarItem的属性，包括 title、Image、selectedImage。
         [self setUpTabBarItemsAttributesForController:tabBarController];
         
         [tabBarController setViewControllers:@[
@@ -76,20 +72,16 @@ - (CYLTabBarController *)tabBarController {
                                                thirdNavigationController,
                                                fourthNavigationController
                                                ]];
-        /**
-         *  更多TabBar自定义设置：比如：tabBarItem 的选中和不选中文字和背景图片属性、tabbar 背景图片属性
-         */
+         // 更多TabBar自定义设置：比如：tabBarItem 的选中和不选中文字和背景图片属性、tabbar 背景图片属性
 #warning IF YOU NEED CUSTOMIZE TABBAR APPEARANCE, REMOVE THE COMMENT '//'
 //        [[self class] customizeTabBarAppearance:tabBarController];
         _tabBarController = tabBarController;
     }
     return _tabBarController;
 }
 
-/*
- *
- 在`-setViewControllers:`之前设置TabBar的属性，设置TabBarItem的属性，包括 title、Image、selectedImage。
- *
+/**
+ *  在`-setViewControllers:`之前设置TabBar的属性，设置TabBarItem的属性，包括 title、Image、selectedImage。
  */
 - (void)setUpTabBarItemsAttributesForController:(CYLTabBarController *)tabBarController {
     
@@ -133,7 +125,7 @@ + (void)customizeTabBarAppearance:(CYLTabBarController *)tabBarController {
     // set the text color for unselected state
     // 普通状态下的文字属性
     NSMutableDictionary *normalAttrs = [NSMutableDictionary dictionary];
-    normalAttrs[NSForegroundColorAttributeName] = [UIColor blackColor];
+    normalAttrs[NSForegroundColorAttributeName] = [UIColor grayColor];
     
     // set the text color for selected state
     // 选中状态下的文字属性
diff --git a/Example/Classes/Main/View/CYLPlusButtonSubclass.m b/Example/Classes/Main/View/CYLPlusButtonSubclass.m
@@ -56,7 +56,7 @@ - (void)layoutSubviews {
 }
 
 #pragma mark -
-#pragma mark - Public Methods
+#pragma mark - CYLPlusButtonSubclassing Methods
 
 /*
  *

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#import "CYLPlusButton.h"`
`10`	`10`	`#import "CYLTabBarController.h"`
`11`	`11`
`12`		`-UIButton<CYLPlusButtonSubclassing> *CYLExternPushlishButton = nil;`
	`12`	`+UIButton<CYLPlusButtonSubclassing> *CYLExternPlusButton = nil;`
`13`	`13`
`14`	`14`	`@implementation CYLPlusButton`
`15`	`15`
`@@ -19,7 +19,7 @@ @implementation CYLPlusButton`
`19`	`19`	`+ (void)registerSubclass {`
`20`	`20`	`if ([self conformsToProtocol:@protocol(CYLPlusButtonSubclassing)]) {`
`21`	`21`	`Class<CYLPlusButtonSubclassing> class = self;`
`22`		`- CYLExternPushlishButton = [class plusButton];`
	`22`	`+ CYLExternPlusButton = [class plusButton];`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ - (void)setViewControllers:(NSArray *)viewControllers {`
`54`	`54`	`_viewControllers = [viewControllers copy];`
`55`	`55`	`if (_tabBarItemsAttributes) {`
`56`	`56`	`if (_tabBarItemsAttributes.count != _viewControllers.count) {`
`57`		- [NSException raise:@"CYLTabBarController" format:@"The count of CYLTabBarControllers is not equal to the count of tabBarItemsAttributes.【中文】设置_tabBarItemsAttributes属性时，请确保元素个数与控制器的个数相同，并在方法`-setViewControllers:`之前设置"];
	`57`	+ [NSException raise:@"CYLTabBarController" format:@"The count of CYLTabBarControllers is not equal to the count of tabBarItemsAttributes.【Chinese】设置_tabBarItemsAttributes属性时，请确保元素个数与控制器的个数相同，并在方法`-setViewControllers:`之前设置"];
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`CYLTabbarItemsCount = [viewControllers count];`
`@@ -100,7 +100,7 @@ - (void)addOneChildViewController:(UIViewController *)viewController`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`+ (BOOL)havePlusButton {`
`103`		`- if (CYLExternPushlishButton) {`
	`103`	`+ if (CYLExternPlusButton) {`
`104`	`104`	`return YES;`
`105`	`105`	`}`
`106`	`106`	`return NO;`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ - (void)layoutSubviews {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`#pragma mark -`
`59`		`-#pragma mark - Public Methods`
	`59`	`+#pragma mark - CYLPlusButtonSubclassing Methods`
`60`	`60`
`61`	`61`	`/*`
`62`	`62`	`*`