v1.2.0 add api for allItemsInTabBarCount, Include plusButton if exists.

mengzhe360 · Feb 26, 2016 · c204954 · c204954
1 parent 12926af
commit c204954
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 30 deletions.
diff --git a/CYLTabBarController.podspec b/CYLTabBarController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CYLTabBarController"
-  s.version      = "1.1.1"
+  s.version      = "1.2.0"
   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.xcodeproj/project.pbxproj b/CYLTabBarController.xcodeproj/project.pbxproj
@@ -193,10 +193,10 @@
 		9AE942F21BDC937F00354519 /* CYLTabBarController */ = {
 			isa = PBXGroup;
 			children = (
-				9AE942F51BDC937F00354519 /* CYLTabBar.h */,
-				9AE942F61BDC937F00354519 /* CYLTabBar.m */,
 				9AE942F71BDC937F00354519 /* CYLTabBarController.h */,
 				9AE942F81BDC937F00354519 /* CYLTabBarController.m */,
+				9AE942F51BDC937F00354519 /* CYLTabBar.h */,
+				9AE942F61BDC937F00354519 /* CYLTabBar.m */,
 				9AE942F31BDC937F00354519 /* CYLPlusButton.h */,
 				9AE942F41BDC937F00354519 /* CYLPlusButton.m */,
 				9AE667111C800085001DED12 /* UIViewController+CYLJumpToOtherTabBarControllerItem.h */,

diff --git a/...proj/project.xcworkspace/xcuserdata/chenyilong.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/chenyilong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/CYLTabBarController/CYLPlusButton.h b/CYLTabBarController/CYLPlusButton.h
@@ -5,8 +5,8 @@
 //  Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
 //  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
 //
-@import Foundation;
-#import <UIKit/UIKit.h>
+
+@import UIKit;
 
 @protocol CYLPlusButtonSubclassing
 

diff --git a/CYLTabBarController/CYLPlusButton.m b/CYLTabBarController/CYLPlusButton.m
@@ -11,10 +11,6 @@
 
 UIButton<CYLPlusButtonSubclassing> *CYLExternPushlishButton = nil;
 
-@interface CYLPlusButton ()
-
-@end
-
 @implementation CYLPlusButton
 
 #pragma mark -

diff --git a/CYLTabBarController/CYLTabBar.h b/CYLTabBarController/CYLTabBar.h
@@ -6,9 +6,7 @@
 //  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import "CYLTabBarController.h"
-#import "CYLPlusButton.h"
+@import UIKit;
 
 @interface CYLTabBar : UITabBar
 

diff --git a/CYLTabBarController/CYLTabBar.m b/CYLTabBarController/CYLTabBar.m
@@ -7,6 +7,8 @@
 //
 
 #import "CYLTabBar.h"
+#import "CYLPlusButton.h"
+#import "CYLTabBarController.h"
 
 @interface CYLTabBar ()
 

diff --git a/CYLTabBarController/CYLTabBarController.h b/CYLTabBarController/CYLTabBarController.h
@@ -14,7 +14,7 @@ static NSString * const CYLTabBarItemSelectedImage = @"tabBarItemSelectedImage";
 
 extern NSUInteger CYLTabbarItemsCount;
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface CYLTabBarController : UITabBarController
 
@@ -27,9 +27,18 @@ extern NSUInteger CYLTabbarItemsCount;
  */
 @property (nonatomic, readwrite, copy) IBOutletCollection(NSDictionary) NSArray *tabBarItemsAttributes;
 
+/*!
+ * Judge if there is plus button.
+ */
++ (BOOL)havePlusButton;
+
+/*!
+ * Include plusButton if exists.
+ */
++ (NSUInteger)allItemsInTabBarCount;
+
 - (id<UIApplicationDelegate>)appDelegate;
 - (UIWindow *)rootWindow;
-+ (BOOL)havePlusButton;
 
 @end
 

diff --git a/CYLTabBarController/CYLTabBarController.m b/CYLTabBarController/CYLTabBarController.m
@@ -7,9 +7,10 @@
 //
 
 #import "CYLTabBarController.h"
-
 #import "CYLTabBar.h"
+#import "CYLPlusButton.h"
 #import <objc/runtime.h>
+
 NSUInteger CYLTabbarItemsCount = 0;
 
 @interface UIViewController (CYLTabBarControllerItemInternal)
@@ -98,6 +99,21 @@ - (void)addOneChildViewController:(UIViewController *)viewController
     [self addChildViewController:viewController];
 }
 
++ (BOOL)havePlusButton {
+    if (CYLExternPushlishButton) {
+        return YES;
+    }
+    return NO;
+}
+
++ (NSUInteger)allItemsInTabBarCount {
+    NSUInteger allItemsInTabBar = CYLTabbarItemsCount;
+    if ([CYLTabBarController havePlusButton]) {
+        allItemsInTabBar += 1;
+    }
+    return allItemsInTabBar;
+}
+
 - (id<UIApplicationDelegate>)appDelegate {
     return [UIApplication sharedApplication].delegate;
 }
@@ -118,13 +134,6 @@ - (UIWindow *)rootWindow {
     return result;
 }
 
-+ (BOOL)havePlusButton {
-    if (CYLExternPushlishButton) {
-        return YES;
-    }
-    return NO;
-}
-
 @end
 
 #pragma mark - UIViewController+CYLTabBarControllerItem

diff --git a/CYLTabBarController/UIViewController+CYLJumpToOtherTabBarControllerItem.h b/CYLTabBarController/UIViewController+CYLJumpToOtherTabBarControllerItem.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016年 https://github.com/ChenYilong .All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface UIViewController (CYLJumpToOtherTabBarControllerItem)
 

diff --git a/Example/Classes/CYLTabBarControllerConfig.m b/Example/Classes/CYLTabBarControllerConfig.m
@@ -79,7 +79,8 @@ - (CYLTabBarController *)tabBarController {
         /**
          *  更多TabBar自定义设置：比如：tabBarItem 的选中和不选中文字和背景图片属性、tabbar 背景图片属性
          */
-        //[[self class] customizeTabBarAppearance:tabBarController];
+#warning IF YOU NEED CUSTOMIZE TABBAR APPEARANCE, REMOVE THE COMMENT '//'
+//        [[self class] customizeTabBarAppearance:tabBarController];
         _tabBarController = tabBarController;
     }
     return _tabBarController;
@@ -147,12 +148,8 @@ + (void)customizeTabBarAppearance:(CYLTabBarController *)tabBarController {
 
     // Set the dark color to selected tab (the dimmed background)
     // TabBarItem选中后的背景颜色
-    NSUInteger tabBarItemsCount = tabBarController.viewControllers.count;
-    NSUInteger allItemsInTabBar = tabBarItemsCount;
-    if ([CYLTabBarController havePlusButton]) {
-        allItemsInTabBar = tabBarItemsCount +1;
-    }
-    [[UITabBar appearance] setSelectionIndicatorImage:[self imageFromColor:[UIColor colorWithRed:26 / 255.0 green:163 / 255.0 blue:133 / 255.0 alpha:1] forSize:CGSizeMake([UIScreen mainScreen].bounds.size.width / (CGFloat)allItemsInTabBar, 49) withCornerRadius:0]];
+    NSUInteger allItemsInTabBarCount = [CYLTabBarController allItemsInTabBarCount];
+    [[UITabBar appearance] setSelectionIndicatorImage:[self imageFromColor:[UIColor yellowColor] forSize:CGSizeMake([UIScreen mainScreen].bounds.size.width / allItemsInTabBarCount, 49.f) withCornerRadius:0]];
 
     // set the bar background color
     // 设置背景图片