v1.6.0 add API +constantOfPlusButtonCenterYOffsetForTabBarHeight:

ChenYilong · ChenYilong · commit d1f8cc89f517 · 2016-07-12T11:37:50.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.5.6"
+  s.version      = "1.6.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
@@ -42,6 +42,7 @@
 		9A1559D71CB6D56500CAB1AF /* CYLSameCityViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CYLSameCityViewController.m; sourceTree = "<group>"; };
 		9A1559E21CB6EB1F00CAB1AF /* CYLPlusButtonSubclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CYLPlusButtonSubclass.h; sourceTree = "<group>"; };
 		9A1559E31CB6EB1F00CAB1AF /* CYLPlusButtonSubclass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CYLPlusButtonSubclass.m; sourceTree = "<group>"; };
+		9A5B29111D3475BC009E1BEE /* CYLConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CYLConstants.h; sourceTree = "<group>"; };
 		9AE667111C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+CYLTabBarControllerExtention.h"; sourceTree = "<group>"; };
 		9AE667121C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+CYLTabBarControllerExtention.m"; sourceTree = "<group>"; };
 		9AE942741BDC91B800354519 /* CYLTabBarController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CYLTabBarController.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -201,6 +202,7 @@
 				9AE942F41BDC937F00354519 /* CYLPlusButton.m */,
 				9AE667111C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.h */,
 				9AE667121C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.m */,
+				9A5B29111D3475BC009E1BEE /* CYLConstants.h */,
 			);
 			path = CYLTabBarController;
 			sourceTree = "<group>";
diff --git a/CYLTabBarController/CYLConstants.h b/CYLTabBarController/CYLConstants.h
@@ -0,0 +1,10 @@
+//
+//  CYLTabBarController.h
+//  CYLTabBarController
+//
+//  Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
+//  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
+//
+
+#define CYL_DEPRECATED(explain) __attribute__((deprecated(explain)))
+
diff --git a/CYLTabBarController/CYLPlusButton.h b/CYLTabBarController/CYLPlusButton.h
@@ -7,6 +7,8 @@
 //
 
 @import UIKit;
+#import "CYLConstants.h"
+@class CYLPlusButton;
 
 @protocol CYLPlusButtonSubclassing
 
@@ -15,31 +17,46 @@
 @optional
 
 /*!
- 用来自定义加号按钮的位置，如果不实现默认居中。
- @attention 以下两种情况下，必须实现该协议方法，否则 CYLTabBarController 会抛出 exception 来进行提示：
-            1. 添加了 PlusButton 且 TabBarItem 的个数是奇数。
-            2. 实现了 `+plusChildViewController`。
- @return 用来自定义加号按钮在 TabBar 中的位置。
+ * 用来自定义加号按钮的位置，如果不实现默认居中。
+ * @attention 以下两种情况下，必须实现该协议方法，否则 CYLTabBarController 会抛出 exception 来进行提示：
+                 1. 添加了 PlusButton 且 TabBarItem 的个数是奇数。
+                 2. 实现了 `+plusChildViewController`。
+ * @return 用来自定义加号按钮在 TabBar 中的位置。
  *
  */
 + (NSUInteger)indexOfPlusButtonInTabBar;
 
 /*!
- 该方法是为了调整自定义按钮中心点Y轴方向的位置，建议在按钮超出了 tabbar 的边界时实现该方法。
- 
- @return 返回值是自定义按钮中心点Y轴方向的坐标除以 tabbar 的高度，如果不实现，会自动进行比对，预设一个较为合适的位置，如果实现了该方法，预设的逻辑将失效。值如果是0.5，表示button居中，小于0.5表示button偏上，大于0.5则表示button偏下。
+ * 该方法是为了调整 PlusButton 中心点Y轴方向的位置，建议在按钮超出了 tabbar 的边界时实现该方法。
+ * @attention 如果不实现该方法，内部会自动进行比对，预设一个较为合适的位置，如果实现了该方法，预设的逻辑将失效。
+ * @return 返回值是自定义按钮中心点Y轴方向的坐标除以 tabbar 的高度，
+           内部实现时，会使用该返回值来设置 PlusButton 的 centerY 坐标，公式如下：
+              `PlusButtonCenterY = multiplierOfTabBarHeight * taBarHeight + constantOfPlusButtonCenterYOffset;`
+           也就是说：如果 constantOfPlusButtonCenterYOffset 为0，同时 multiplierOfTabBarHeight 的值是0.5，表示 PlusButton 居中，小于0.5表示 PlusButton 偏上，大于0.5则表示偏下。
  *
  */
-+ (CGFloat)multiplerInCenterY;
++ (CGFloat)multiplierOfTabBarHeight:(CGFloat)tabBarHeight;
 
 /*!
- 实现该方法后，能让 PlusButton 的点击效果与跟点击其他 UITabBarButton 效果一样，跳转到该方法指定的 UIViewController 。
- @attention 必须同时实现 `+indexOfPlusButtonInTabBar` 来指定 PlusButton 的位置。
- @return 指定 PlusButton 点击后跳转的 UIViewController。
+ * 见 `+multiplierOfTabBarHeight:` 注释：
+ * `PlusButtonCenterY = multiplierOfTabBarHeight * taBarHeight + constantOfPlusButtonCenterYOffset;`
+ * 也就是说： constantOfPlusButtonCenterYOffset 大于0会向下偏移，小于0会向上偏移。
+ * @attention 实现了该方法，但没有实现 `+multiplierOfTabBarHeight:` 方法，在这种情况下，会在预设逻辑的基础上进行偏移。
+ */
++ (CGFloat)constantOfPlusButtonCenterYOffsetForTabBarHeight:(CGFloat)tabBarHeight;
+
+/*!
+ * 实现该方法后，能让 PlusButton 的点击效果与跟点击其他 UITabBarButton 效果一样，跳转到该方法指定的 UIViewController 。
+ * @attention 必须同时实现 `+indexOfPlusButtonInTabBar` 来指定 PlusButton 的位置。
+ * @return 指定 PlusButton 点击后跳转的 UIViewController。
  *
  */
 + (UIViewController *)plusChildViewController;
 
+#pragma mark - Deprecated API
+
++ (CGFloat)multiplerInCenterY CYL_DEPRECATED("Deprecated in 1.6.0. Use `+multiplierOfTabBarHeight:` instead.");
+
 @end
 
 @class CYLTabBar;
@@ -49,8 +66,16 @@ FOUNDATION_EXTERN UIViewController *CYLPlusChildViewController;
 
 @interface CYLPlusButton : UIButton
 
-+ (void)registerSubclass;
++ (void)registerPlusButton;
 
 - (void)plusChildViewControllerButtonClicked:(UIButton<CYLPlusButtonSubclassing> *)sender;
 
 @end
+
+#pragma mark - Deprecated API
+
+@interface CYLPlusButton (CYLDeprecated)
+
++ (void)registerSubclass CYL_DEPRECATED("Deprecated in 1.6.0. Use `+[CYLPlusButton registerPlusButton]` instead.");
+
+@end
diff --git a/CYLTabBarController/CYLPlusButton.m b/CYLTabBarController/CYLPlusButton.m
@@ -18,7 +18,7 @@ @implementation CYLPlusButton
 #pragma mark -
 #pragma mark - public Methods
 
-+ (void)registerSubclass {
++ (void)registerPlusButton {
     if (![self conformsToProtocol:@protocol(CYLPlusButtonSubclassing)]) {
         return;
     }
@@ -37,6 +37,13 @@ + (void)registerSubclass {
     }
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++ (void)registerSubclass {
+    [self registerPlusButton];
+}
+#pragma clang diagnostic pop
+
 - (void)plusChildViewControllerButtonClicked:(UIButton<CYLPlusButtonSubclassing> *)sender {
     sender.selected = YES;
     [self cyl_tabBarController].selectedIndex = CYLPlusButtonIndex;
diff --git a/CYLTabBarController/CYLTabBar.m b/CYLTabBarController/CYLTabBar.m
@@ -68,18 +68,19 @@ - (NSArray *)tabBarButtonArray {
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    CGFloat barWidth = self.bounds.size.width;
-    CGFloat barHeight = self.bounds.size.height;
-    CYLTabBarItemWidth = (barWidth - CYLPlusButtonWidth) / CYLTabbarItemsCount;
+    CGFloat taBarWidth = self.bounds.size.width;
+    CGFloat taBarHeight = self.bounds.size.height;
+    CYLTabBarItemWidth = (taBarWidth - CYLPlusButtonWidth) / CYLTabbarItemsCount;
     self.tabBarItemWidth = CYLTabBarItemWidth;
     NSArray *sortedSubviews = [self sortedSubviews];
     self.tabBarButtonArray = [self tabBarButtonFromTabBarSubviews:sortedSubviews];
     [self setupSwappableImageViewDefaultOffset:self.tabBarButtonArray[0]];
     if (!CYLExternPlusButton) {
         return;
     }
-    CGFloat multiplerInCenterY = [self multiplerInCenterY];
-    self.plusButton.center = CGPointMake(barWidth * 0.5, barHeight * multiplerInCenterY);
+    CGFloat multiplierOfTabBarHeight = [self multiplierOfTabBarHeight:taBarHeight];
+    CGFloat constantOfPlusButtonCenterYOffset = [self constantOfPlusButtonCenterYOffsetForTabBarHeight:taBarHeight];
+    self.plusButton.center = CGPointMake(taBarWidth * 0.5, taBarHeight * multiplierOfTabBarHeight + constantOfPlusButtonCenterYOffset);
     NSUInteger plusButtonIndex = [self plusButtonIndex];
     [self.tabBarButtonArray enumerateObjectsUsingBlock:^(UIView * _Nonnull childView, NSUInteger buttonIndex, BOOL * _Nonnull stop) {
         //调整UITabBarItem的位置
@@ -139,22 +140,39 @@ - (void)setSwappableImageViewDefaultOffset:(CGFloat)swappableImageViewDefaultOff
     }
 }
 
-- (CGFloat)multiplerInCenterY {
-    CGFloat multiplerInCenterY;
-    if ([[self.plusButton class] respondsToSelector:@selector(multiplerInCenterY)]) {
-        multiplerInCenterY = [[self.plusButton class] multiplerInCenterY];
-    } else {
+- (CGFloat)multiplierOfTabBarHeight:(CGFloat)taBarHeight {
+    CGFloat multiplierOfTabBarHeight;
+    if ([[self.plusButton class] respondsToSelector:@selector(multiplierOfTabBarHeight:)]) {
+        multiplierOfTabBarHeight = [[self.plusButton class] multiplierOfTabBarHeight:taBarHeight];
+    }
+    
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    else if ([[self.plusButton class] respondsToSelector:@selector(multiplerInCenterY)]) {
+        multiplierOfTabBarHeight = [[self.plusButton class] multiplerInCenterY];
+    }
+#pragma clang diagnostic pop
+    
+    else {
         CGSize sizeOfPlusButton = self.plusButton.frame.size;
         CGFloat heightDifference = sizeOfPlusButton.height - self.bounds.size.height;
         if (heightDifference < 0) {
-            multiplerInCenterY = 0.5;
+            multiplierOfTabBarHeight = 0.5;
         } else {
             CGPoint center = CGPointMake(self.bounds.size.height * 0.5, self.bounds.size.height * 0.5);
             center.y = center.y - heightDifference * 0.5;
-            multiplerInCenterY = center.y / self.bounds.size.height;
+            multiplierOfTabBarHeight = center.y / self.bounds.size.height;
         }
     }
-    return multiplerInCenterY;
+    return multiplierOfTabBarHeight;
+}
+
+- (CGFloat)constantOfPlusButtonCenterYOffsetForTabBarHeight:(CGFloat)taBarHeight {
+    CGFloat constantOfPlusButtonCenterYOffset = 0.f;
+    if ([[self.plusButton class] respondsToSelector:@selector(constantOfPlusButtonCenterYOffsetForTabBarHeight:)]) {
+        constantOfPlusButtonCenterYOffset = [[self.plusButton class] constantOfPlusButtonCenterYOffsetForTabBarHeight:taBarHeight];
+    }
+    return constantOfPlusButtonCenterYOffset;
 }
 
 - (NSUInteger)plusButtonIndex {
diff --git a/CYLTabBarController/CYLTabBarController.h b/CYLTabBarController/CYLTabBarController.h
@@ -8,6 +8,8 @@
 
 @import Foundation;
 @import UIKit;
+
+#import "CYLPlusButton.h"
 #import "UIViewController+CYLTabBarControllerExtention.h"
 
 FOUNDATION_EXTERN NSString *const CYLTabBarItemTitle;
diff --git a/CYLTabBarController/CYLTabBarController.m b/CYLTabBarController/CYLTabBarController.m
@@ -8,7 +8,6 @@
 
 #import "CYLTabBarController.h"
 #import "CYLTabBar.h"
-#import "CYLPlusButton.h"
 #import <objc/runtime.h>
 
 NSString *const CYLTabBarItemTitle = @"CYLTabBarItemTitle";
diff --git a/Example/CYLTabBarControllerConfig.m b/Example/CYLTabBarControllerConfig.m
@@ -86,22 +86,22 @@ - (NSArray *)viewControllers {
 
 - (NSArray *)tabBarItemsAttributesForController {
     NSDictionary *firstTabBarItemsAttributes = @{
-                                                 CYLTabBarItemTitle : @"首页",
+//                                                 CYLTabBarItemTitle : @"首页",
                                                  CYLTabBarItemImage : @"home_normal",
                                                  CYLTabBarItemSelectedImage : @"home_highlight",
                                                  };
     NSDictionary *secondTabBarItemsAttributes = @{
-                                                  CYLTabBarItemTitle : @"同城",
+//                                                  CYLTabBarItemTitle : @"同城",
                                                   CYLTabBarItemImage : @"mycity_normal",
                                                   CYLTabBarItemSelectedImage : @"mycity_highlight",
                                                   };
     NSDictionary *thirdTabBarItemsAttributes = @{
-                                                 CYLTabBarItemTitle : @"消息",
+//                                                 CYLTabBarItemTitle : @"消息",
                                                  CYLTabBarItemImage : @"message_normal",
                                                  CYLTabBarItemSelectedImage : @"message_highlight",
                                                  };
     NSDictionary *fourthTabBarItemsAttributes = @{
-                                                  CYLTabBarItemTitle : @"我的",
+//                                                  CYLTabBarItemTitle : @"我的",
                                                   CYLTabBarItemImage : @"account_normal",
                                                   CYLTabBarItemSelectedImage : @"account_highlight"
                                                   };
@@ -121,7 +121,7 @@ - (void)customizeTabBarAppearance:(CYLTabBarController *)tabBarController {
 #warning CUSTOMIZE YOUR TABBAR APPEARANCE
     // Customize UITabBar height
     // 自定义 TabBar 高度
-    // tabBarController.tabBarHeight = 40.f;
+     tabBarController.tabBarHeight = 40.f;
     
     // set the text color for unselected state
     // 普通状态下的文字属性
@@ -170,7 +170,7 @@ - (void)updateTabBarCustomizationWhenTabBarItemWidthDidUpdate {
         UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
         if ((orientation == UIDeviceOrientationLandscapeLeft) || (orientation == UIDeviceOrientationLandscapeRight)) {
             NSLog(@"Landscape Left or Right !");
-        } else if (orientation == UIDeviceOrientationPortrait){
+        } else if (orientation == UIDeviceOrientationPortrait) {
             NSLog(@"Landscape portrait!");
         }
         [self customizeTabBarSelectionIndicatorImage];
diff --git a/Example/Classes/Module/Home/CYLHomeViewController.m b/Example/Classes/Module/Home/CYLHomeViewController.m
@@ -1,6 +1,6 @@
 //
 //  CYLHomeViewController.m
-//  CYLCustomTabBarDemo
+//  CYLTabBarController
 //
 //  Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
 //  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
diff --git a/Example/Classes/Module/SameCity/CYLSameCityViewController.m b/Example/Classes/Module/SameCity/CYLSameCityViewController.m
@@ -1,6 +1,6 @@
 //
 //  CYLSameCityViewController.m
-//  CYLCustomTabBarDemo
+//  CYLTabBarController
 //
 //  Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
 //  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
diff --git a/Example/Classes/View/CYLPlusButtonSubclass.m b/Example/Classes/View/CYLPlusButtonSubclass.m
@@ -22,7 +22,7 @@ @implementation CYLPlusButtonSubclass
 #pragma mark - Life Cycle
 
 + (void)load {
-    [super registerSubclass];
+    [super registerPlusButton];
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -38,8 +38,10 @@ - (void)layoutSubviews {
     [super layoutSubviews];
     
     // 控件大小,间距大小
+    // 注意：一定要根据项目中的图片去调整下面的0.7和0.9，Demo之所以这么设置，因为demo中的 plusButton 的 icon 不是正方形。
     CGFloat const imageViewEdgeWidth   = self.bounds.size.width * 0.7;
     CGFloat const imageViewEdgeHeight  = imageViewEdgeWidth * 0.9;
+    
     CGFloat const centerOfView    = self.bounds.size.width * 0.5;
     CGFloat const labelLineHeight = self.titleLabel.font.lineHeight;
     CGFloat const verticalMarginT = self.bounds.size.height - labelLineHeight - imageViewEdgeWidth;
@@ -78,6 +80,8 @@ + (id)plusButton {
 
     button.titleLabel.font = [UIFont systemFontOfSize:9.5];
     [button sizeToFit]; // or set frame in this way `button.frame = CGRectMake(0.0, 0.0, 250, 100);`
+//    button.frame = CGRectMake(0.0, 0.0, 250, 100);
+//    button.backgroundColor = [UIColor redColor];
     [button addTarget:button action:@selector(clickPublish) forControlEvents:UIControlEventTouchUpInside];
     return button;
 }
@@ -134,13 +138,18 @@ - (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSIn
 //                                                   initWithRootViewController:plusChildViewController];
 //    return plusChildNavigationController;
 //}
-//
+
+
 //+ (NSUInteger)indexOfPlusButtonInTabBar {
-//    return 2;
+//    return 4;
 //}
 
-+ (CGFloat)multiplerInCenterY {
++ (CGFloat)multiplierOfTabBarHeight:(CGFloat)tabBarHeight {
     return  0.3;
 }
 
++ (CGFloat)constantOfPlusButtonCenterYOffsetForTabBarHeight:(CGFloat)tabBarHeight {
+    return  -10;
+}
+
 @end
diff --git a/README.md b/README.md
