v1.6.0 support add red point on iPhoneX

Author: ChenYilong

CYLTabBarController/CYLConstants.h

@@ -11,9 +11,11 @@
 
 #define CYL_DEPRECATED(explain) __attribute__((deprecated(explain)))
 #define CYL_IS_IPHONE (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
-#define CYL_IS_IPHONE_X (CYL_IS_IPHONE && [[UIScreen mainScreen] bounds].size.height == 812.0f)
-#define CYL_IS_IOS_11  ([[[UIDevice currentDevice] systemVersion] floatValue] >= 11.f)
 
+//[[UIScreen mainScreen] bounds].size.height == 812.0f
+//[[UIScreen mainScreen] bounds].size.width
+#define CYL_IS_IOS_11  ([[[UIDevice currentDevice] systemVersion] floatValue] >= 11.f)
+#define CYL_IS_IPHONE_X (CYL_IS_IOS_11 && CYL_IS_IPHONE && (MIN([UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height) == 375 && MAX([UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height) == 812))
 #endif /* CYLConstants_h */
 
 

CYLTabBarController/CYLPlusButton.h

@@ -32,15 +32,15 @@
  * @attention 如果不实现该方法，内部会自动进行比对，预设一个较为合适的位置，如果实现了该方法，预设的逻辑将失效。
  * @return 返回值是自定义按钮中心点Y轴方向的坐标除以 tabbar 的高度，
            内部实现时，会使用该返回值来设置 PlusButton 的 centerY 坐标，公式如下：
-              `PlusButtonCenterY = multiplierOfTabBarHeight * taBarHeight + constantOfPlusButtonCenterYOffset;`
+              `PlusButtonCenterY = multiplierOfTabBarHeight * tabBarHeight + constantOfPlusButtonCenterYOffset;`
            也就是说：如果 constantOfPlusButtonCenterYOffset 为0，同时 multiplierOfTabBarHeight 的值是0.5，表示 PlusButton 居中，小于0.5表示 PlusButton 偏上，大于0.5则表示偏下。
  *
  */
 + (CGFloat)multiplierOfTabBarHeight:(CGFloat)tabBarHeight;
 
 /*!
  * 见 `+multiplierOfTabBarHeight:` 注释：
- * `PlusButtonCenterY = multiplierOfTabBarHeight * taBarHeight + constantOfPlusButtonCenterYOffset;`
+ * `PlusButtonCenterY = multiplierOfTabBarHeight * tabBarHeight + constantOfPlusButtonCenterYOffset;`
  * 也就是说： constantOfPlusButtonCenterYOffset 大于0会向下偏移，小于0会向上偏移。
  * @attention 实现了该方法，但没有实现 `+multiplierOfTabBarHeight:` 方法，在这种情况下，会在预设逻辑的基础上进行偏移。
  */

CYLTabBarController/CYLTabBar.m

@@ -57,21 +57,12 @@ - (instancetype)sharedInit {
 - (CGSize)sizeThatFits:(CGSize)size {
     CGSize sizeThatFits = [super sizeThatFits:size];
     CGFloat height = [self cyl_tabBarController].tabBarHeight;
-    if (height > 0 && !CYL_IS_IPHONE_X && CYL_IS_IOS_11) {
+    if (height > 0) {
         sizeThatFits.height = [self cyl_tabBarController].tabBarHeight;
     }
     return sizeThatFits;
 }
 
-- (void)setFrame:(CGRect)frame {
-    if (CYL_IS_IPHONE_X) {
-        if (self.superview && CGRectGetMaxY(self.superview.bounds) != CGRectGetMaxY(frame)) {
-            frame.origin.y = CGRectGetHeight(self.superview.bounds) - CGRectGetHeight(frame);
-        }
-    }
-    [super setFrame:frame];
-}
-
 /**
  *  lazy load tabBarButtonArray
  *
@@ -86,19 +77,19 @@ - (NSArray *)tabBarButtonArray {
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    CGFloat taBarWidth = self.bounds.size.width;
-    CGFloat taBarHeight = self.bounds.size.height;
-    CYLTabBarItemWidth = (taBarWidth - CYLPlusButtonWidth) / CYLTabbarItemsCount;
+    CGFloat tabBarWidth = self.bounds.size.width;
+    CGFloat tabBarHeight = self.bounds.size.height;
+    CYLTabBarItemWidth = (tabBarWidth - CYLPlusButtonWidth) / CYLTabbarItemsCount;
     self.tabBarItemWidth = CYLTabBarItemWidth;
     NSArray *sortedSubviews = [self sortedSubviews];
     self.tabBarButtonArray = [self tabBarButtonFromTabBarSubviews:sortedSubviews];
     [self setupTabImageViewDefaultOffset:self.tabBarButtonArray[0]];
     if (!CYLExternPlusButton) {
         return;
     }
-    CGFloat multiplierOfTabBarHeight = [self multiplierOfTabBarHeight:taBarHeight];
-    CGFloat constantOfPlusButtonCenterYOffset = [self constantOfPlusButtonCenterYOffsetForTabBarHeight:taBarHeight];
-    self.plusButton.center = CGPointMake(taBarWidth * 0.5, taBarHeight * multiplierOfTabBarHeight + constantOfPlusButtonCenterYOffset);
+    CGFloat multiplierOfTabBarHeight = [self multiplierOfTabBarHeight:tabBarHeight];
+    CGFloat constantOfPlusButtonCenterYOffset = [self constantOfPlusButtonCenterYOffsetForTabBarHeight:tabBarHeight];
+    self.plusButton.center = CGPointMake(tabBarWidth * 0.5, tabBarHeight * multiplierOfTabBarHeight + constantOfPlusButtonCenterYOffset);
     NSUInteger plusButtonIndex = [self plusButtonIndex];
     [self.tabBarButtonArray enumerateObjectsUsingBlock:^(UIView * _Nonnull childView, NSUInteger buttonIndex, BOOL * _Nonnull stop) {
         //调整UITabBarItem的位置
@@ -134,9 +125,13 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     }
     if(context == CYLTabBarContext) {
         [[NSNotificationCenter defaultCenter] postNotificationName:CYLTabBarItemWidthDidChangeNotification object:self];
+        if (CYL_IS_IPHONE_X && CYL_IS_IOS_11) {
+            [self layoutIfNeeded];
+        }
     }
 }
 
+
 - (void)dealloc {
     // KVO反注册
     [self removeObserver:self forKeyPath:@"tabBarItemWidth"];
@@ -158,10 +153,10 @@ - (void)setTabImageViewDefaultOffset:(CGFloat)tabImageViewDefaultOffset {
     }
 }
 
-- (CGFloat)multiplierOfTabBarHeight:(CGFloat)taBarHeight {
+- (CGFloat)multiplierOfTabBarHeight:(CGFloat)tabBarHeight {
     CGFloat multiplierOfTabBarHeight;
     if ([[self.plusButton class] respondsToSelector:@selector(multiplierOfTabBarHeight:)]) {
-        multiplierOfTabBarHeight = [[self.plusButton class] multiplierOfTabBarHeight:taBarHeight];
+        multiplierOfTabBarHeight = [[self.plusButton class] multiplierOfTabBarHeight:tabBarHeight];
     }
 
 #pragma clang diagnostic push
@@ -185,10 +180,10 @@ - (CGFloat)multiplierOfTabBarHeight:(CGFloat)taBarHeight {
     return multiplierOfTabBarHeight;
 }
 
-- (CGFloat)constantOfPlusButtonCenterYOffsetForTabBarHeight:(CGFloat)taBarHeight {
+- (CGFloat)constantOfPlusButtonCenterYOffsetForTabBarHeight:(CGFloat)tabBarHeight {
     CGFloat constantOfPlusButtonCenterYOffset = 0.f;
     if ([[self.plusButton class] respondsToSelector:@selector(constantOfPlusButtonCenterYOffsetForTabBarHeight:)]) {
-        constantOfPlusButtonCenterYOffset = [[self.plusButton class] constantOfPlusButtonCenterYOffsetForTabBarHeight:taBarHeight];
+        constantOfPlusButtonCenterYOffset = [[self.plusButton class] constantOfPlusButtonCenterYOffsetForTabBarHeight:tabBarHeight];
     }
     return constantOfPlusButtonCenterYOffset;
 }
@@ -257,7 +252,7 @@ - (void)setupTabImageViewDefaultOffset:(UIView *)tabBarButton {
             shouldCustomizeImageView = NO;
         }
     }];
-    if (shouldCustomizeImageView && !CYL_IS_IPHONE_X) {
+    if (shouldCustomizeImageView) {
         self.tabImageViewDefaultOffset = tabImageViewDefaultOffset;
     }
 }
@@ -267,7 +262,6 @@ - (void)setupTabImageViewDefaultOffset:(UIView *)tabBarButton {
  */
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
     //1. 边界情况：不能响应点击事件
-    
     BOOL canNotResponseEvent = self.hidden || (self.alpha <= 0.01f) || (self.userInteractionEnabled == NO);
     if (canNotResponseEvent) {
         return nil;
@@ -301,7 +295,6 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
     }
 
     //3. 最后处理 TabBarItems 凸出的部分、添加到 TabBar 上的自定义视图、点击到 TabBar 上的空白区域
-    
     UIView *result = [super hitTest:point withEvent:event];
     if (result) {
         return result;

CYLTabBarController/CYLTabBarController.m

@@ -35,45 +35,43 @@ @implementation CYLTabBarController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    if (CYL_IS_IPHONE_X) {
+        self.tabBarHeight = 83;
+    }
     // 处理tabBar，使用自定义 tabBar 添加 发布按钮
     [self setUpTabBar];
     // KVO注册监听
     if (!self.isObservingTabImageViewDefaultOffset) {
         [self.tabBar addObserver:self forKeyPath:@"tabImageViewDefaultOffset" options:NSKeyValueObservingOptionNew context:CYLTabImageViewDefaultOffsetContext];
         self.observingTabImageViewDefaultOffset = YES;
     }
-
 }
 
 - (void)setViewDidLayoutSubViewsBlock:(CYLViewDidLayoutSubViewsBlock)viewDidLayoutSubviewsBlock {
     _viewDidLayoutSubviewsBlock = viewDidLayoutSubviewsBlock;
 }
 
-//Fix issue #93
 - (void)viewDidLayoutSubviews {
-    [self.tabBar layoutSubviews];
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        UITabBar *tabBar =  self.tabBar;
-        for (UIControl *control in tabBar.subviews) {
-            if ([control isKindOfClass:[UIControl class]]) {
-                SEL actin = @selector(didSelectControl:);
-                [control addTarget:self action:actin forControlEvents:UIControlEventTouchUpInside];
-            }
+    [self.tabBar layoutSubviews];//Fix issue #93
+    UITabBar *tabBar =  self.tabBar;
+    for (UIControl *control in tabBar.subviews) {
+        if ([control isKindOfClass:[UIControl class]]) {
+            SEL actin = @selector(didSelectControl:);
+            [control addTarget:self action:actin forControlEvents:UIControlEventTouchUpInside];
         }
-        !self.viewDidLayoutSubviewsBlock ?: self.viewDidLayoutSubviewsBlock(self);
-    });
+    }
+    !self.viewDidLayoutSubviewsBlock ?: self.viewDidLayoutSubviewsBlock(self);
 }
 
 - (void)viewWillLayoutSubviews {
-    if (CYL_IS_IOS_11 || !self.tabBarHeight) {
+    if (!(self.tabBarHeight > 0)) {
         return;
     }
     self.tabBar.frame = ({
         CGRect frame = self.tabBar.frame;
         CGFloat tabBarHeight = self.tabBarHeight;
         frame.size.height = tabBarHeight;
-        frame.origin.y = self.view.frame.size.height - tabBarHeight;
+        frame.origin.y = [UIScreen mainScreen].bounds.size.height - tabBarHeight;
         frame;
     });
 }

CYLTabBarController/UIControl+CYLTabBarControllerExtention.m

@@ -22,16 +22,10 @@ - (void)cyl_removeTabBadgePoint {
 }
 
 - (BOOL)cyl_isShowTabBadgePoint {
-    if (CYL_IS_IPHONE_X) {
-        return NO;
-    }
     return !self.cyl_tabBadgePointView.hidden;
 }
 
 - (void)cyl_setShowTabBadgePointIfNeeded:(BOOL)showTabBadgePoint {
-    if (CYL_IS_IPHONE_X) {
-        return;
-    }
     @try {
         [self cyl_setShowTabBadgePoint:showTabBadgePoint];
     } @catch (NSException *exception) {

Example/CYLTabBarControllerConfig.m

@@ -6,16 +6,15 @@
 //  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
 //
 #import "CYLTabBarControllerConfig.h"
+#import <UIKit/UIKit.h>
+
 static CGFloat const CYLTabBarControllerHeight = 40.f;
 
 @interface CYLBaseNavigationController : UINavigationController
 @end
 
 @implementation CYLBaseNavigationController
 
-#define IS_IPHONE (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
-#define IS_IPHONE_X (IS_IPHONE && [[UIScreen mainScreen] bounds].size.height == 812.0f)
-
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
     if (self.viewControllers.count > 0) {
         viewController.hidesBottomBarWhenPushed = YES;
@@ -129,7 +128,7 @@ - (void)customizeTabBarAppearance:(CYLTabBarController *)tabBarController {
 #warning CUSTOMIZE YOUR TABBAR APPEARANCE
     // Customize UITabBar height
     // 自定义 TabBar 高度
-//     tabBarController.tabBarHeight = CYLTabBarControllerHeight;
+    tabBarController.tabBarHeight = CYL_IS_IPHONE_X ? 65 : 40;
 
     // set the text color for unselected state
     // 普通状态下的文字属性