v1.12.0 avoid rejection by apple because of private API

Author: ChenYilong

.gitignore

@@ -22,3 +22,5 @@ CYLTabBarController.xcodeproj/project.xcworkspace/xcuserdata/chenyilong.xcuserda
 
 
 CYLTabBarController.xcodeproj/xcuserdata/chenyilong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+*.xcuserstate
+*.xcbkptlist

CYLTabBarController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CYLTabBarController"
-  s.version      = "1.11.0"
+  s.version      = "1.12.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"

CYLTabBarController.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		9A1559DE1CB6D56500CAB1AF /* CYLDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1559D51CB6D56500CAB1AF /* CYLDetailsViewController.m */; };
 		9A1559DF1CB6D56500CAB1AF /* CYLSameCityViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1559D71CB6D56500CAB1AF /* CYLSameCityViewController.m */; };
 		9A1559E41CB6EB1F00CAB1AF /* CYLPlusButtonSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1559E31CB6EB1F00CAB1AF /* CYLPlusButtonSubclass.m */; };
+		9A474C0F1EEFCCE200560ED1 /* UIView+CYLTabBarControllerExtention.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A474C0E1EEFCCE200560ED1 /* UIView+CYLTabBarControllerExtention.m */; };
 		9AE667131C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AE667121C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.m */; };
 		9AE942E71BDC933E00354519 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9AE942CB1BDC933E00354519 /* LaunchScreen.xib */; };
 		9AE942E81BDC933E00354519 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9AE942CD1BDC933E00354519 /* Main.storyboard */; };
@@ -42,6 +43,8 @@
 		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>"; };
+		9A474C0D1EEFCCE200560ED1 /* UIView+CYLTabBarControllerExtention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+CYLTabBarControllerExtention.h"; sourceTree = "<group>"; };
+		9A474C0E1EEFCCE200560ED1 /* UIView+CYLTabBarControllerExtention.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+CYLTabBarControllerExtention.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>"; };
@@ -202,6 +205,8 @@
 				9AE942F41BDC937F00354519 /* CYLPlusButton.m */,
 				9AE667111C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.h */,
 				9AE667121C800085001DED12 /* UIViewController+CYLTabBarControllerExtention.m */,
+				9A474C0D1EEFCCE200560ED1 /* UIView+CYLTabBarControllerExtention.h */,
+				9A474C0E1EEFCCE200560ED1 /* UIView+CYLTabBarControllerExtention.m */,
 				9A5B29111D3475BC009E1BEE /* CYLConstants.h */,
 			);
 			path = CYLTabBarController;
@@ -287,6 +292,7 @@
 				9A1559DB1CB6D56500CAB1AF /* CYLHomeViewController.m in Sources */,
 				9AE942F91BDC937F00354519 /* CYLPlusButton.m in Sources */,
 				9A1559C81CB6D4D300CAB1AF /* AppDelegate.m in Sources */,
+				9A474C0F1EEFCCE200560ED1 /* UIView+CYLTabBarControllerExtention.m in Sources */,
 				9A1559DD1CB6D56500CAB1AF /* CYLMineViewController.m in Sources */,
 				9AE942FB1BDC937F00354519 /* CYLTabBarController.m in Sources */,
 				9AE942F11BDC933E00354519 /* main.m in Sources */,

CYLTabBarController.xcodeproj/project.xcworkspace/xcuserdata/chenyilong.xcuserdatad/UserInterfaceState.xcuserstate

@@ -67,8 +67,8 @@
                   symbolName = "-[CYLTabBarController setViewControllers:]"
                   moduleName = "CYLTabBarController"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/chenyilong/Documents/Git/%E7%AC%AC%E4%B8%89%E6%96%B9/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
-                  timestampString = "518268577.264112"
+                  urlString = "file:///Users/chenyilong/Documents/CYL/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
+                  timestampString = "519036622.139226"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "206"
@@ -82,8 +82,8 @@
                   symbolName = "-[CYLTabBarController setViewControllers:]"
                   moduleName = "CYLTabBarController"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/chenyilong/Documents/Git/%E7%AC%AC%E4%B8%89%E6%96%B9/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
-                  timestampString = "518268577.267085"
+                  urlString = "file:///Users/chenyilong/Documents/CYL/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
+                  timestampString = "519036622.140831"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "206"
@@ -157,5 +157,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Example/AppDelegate.m"
+            timestampString = "519035754.744564"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "78"
+            endingLineNumber = "78"
+            landmarkName = "-tabBarController:didSelectControl:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -11,10 +11,10 @@
 @interface CYLTabBar : UITabBar
 
 /*!
- * 让 `SwappableImageView` 垂直居中时，所需要的默认偏移量。
+ * 让 `TabImageView` 垂直居中时，所需要的默认偏移量。
  * @attention 该值将在设置 top 和 bottom 时被同时使用，具体的操作等价于如下行为：
- * `viewController.tabBarItem.imageInsets = UIEdgeInsetsMake(swappableImageViewDefaultOffset, 0, -swappableImageViewDefaultOffset, 0);`
+ * `viewController.tabBarItem.imageInsets = UIEdgeInsetsMake(tabImageViewDefaultOffset, 0, -tabImageViewDefaultOffset, 0);`
  */
-@property (nonatomic, assign, readonly) CGFloat swappableImageViewDefaultOffset;
+@property (nonatomic, assign, readonly) CGFloat tabImageViewDefaultOffset;
 
 @end

CYLTabBarController/CYLTabBar.h

@@ -73,7 +73,7 @@ - (void)layoutSubviews {
     self.tabBarItemWidth = CYLTabBarItemWidth;
     NSArray *sortedSubviews = [self sortedSubviews];
     self.tabBarButtonArray = [self tabBarButtonFromTabBarSubviews:sortedSubviews];
-    [self setupSwappableImageViewDefaultOffset:self.tabBarButtonArray[0]];
+    [self setupTabImageViewDefaultOffset:self.tabBarButtonArray[0]];
     if (!CYLExternPlusButton) {
         return;
     }
@@ -131,11 +131,11 @@ - (void)setTabBarItemWidth:(CGFloat )tabBarItemWidth {
     }
 }
 
-- (void)setSwappableImageViewDefaultOffset:(CGFloat)swappableImageViewDefaultOffset {
-    if (swappableImageViewDefaultOffset != 0.f) {
-        [self willChangeValueForKey:@"swappableImageViewDefaultOffset"];
-        _swappableImageViewDefaultOffset = swappableImageViewDefaultOffset;
-        [self didChangeValueForKey:@"swappableImageViewDefaultOffset"];
+- (void)setTabImageViewDefaultOffset:(CGFloat)tabImageViewDefaultOffset {
+    if (tabImageViewDefaultOffset != 0.f) {
+        [self willChangeValueForKey:@"tabImageViewDefaultOffset"];
+        _tabImageViewDefaultOffset = tabImageViewDefaultOffset;
+        [self didChangeValueForKey:@"tabImageViewDefaultOffset"];
     }
 }
 
@@ -210,8 +210,7 @@ - (NSArray *)sortedSubviews {
 - (NSArray *)tabBarButtonFromTabBarSubviews:(NSArray *)tabBarSubviews {
     NSMutableArray *tabBarButtonMutableArray = [NSMutableArray arrayWithCapacity:tabBarSubviews.count - 1];
     [tabBarSubviews enumerateObjectsUsingBlock:^(UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        NSString *button = [NSString stringWithFormat:@"UIT%@arB%@", @"abB", @"utton"];
-        if ([obj isKindOfClass:NSClassFromString(button)]) {
+        if ([obj cyl_isTabButton]) {
             [tabBarButtonMutableArray addObject:obj];
         }
     }];
@@ -221,28 +220,26 @@ - (NSArray *)tabBarButtonFromTabBarSubviews:(NSArray *)tabBarSubviews {
     return [tabBarButtonMutableArray copy];
 }
 
-- (void)setupSwappableImageViewDefaultOffset:(UIView *)tabBarButton {
+- (void)setupTabImageViewDefaultOffset:(UIView *)tabBarButton {
     __block BOOL shouldCustomizeImageView = YES;
-    __block CGFloat swappableImageViewHeight = 0.f;
-    __block CGFloat swappableImageViewDefaultOffset = 0.f;
+    __block CGFloat tabImageViewHeight = 0.f;
+    __block CGFloat tabImageViewDefaultOffset = 0.f;
     CGFloat tabBarHeight = self.frame.size.height;
     [tabBarButton.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        NSString *label = [NSString stringWithFormat:@"UITa%@ut%@", @"bBarB", @"tonLabel"];
-        if ([obj isKindOfClass:NSClassFromString(label)]) {
+        if ([obj cyl_isTabLabel]) {
             shouldCustomizeImageView = NO;
         }
-        swappableImageViewHeight = obj.frame.size.height;
-        NSString *imageView = [NSString stringWithFormat:@"UITabB%@pp%@", @"arSwa", @"ableImageView"];
-        BOOL isSwappableImageView = [obj isKindOfClass:NSClassFromString(imageView)];
-        if (isSwappableImageView) {
-            swappableImageViewDefaultOffset = (tabBarHeight - swappableImageViewHeight) * 0.5 * 0.5;
+        tabImageViewHeight = obj.frame.size.height;
+        BOOL isTabImageView = [obj cyl_isTabImageView];
+        if (isTabImageView) {
+            tabImageViewDefaultOffset = (tabBarHeight - tabImageViewHeight) * 0.5 * 0.5;
         }
-        if (isSwappableImageView && swappableImageViewDefaultOffset == 0.f) {
+        if (isTabImageView && tabImageViewDefaultOffset == 0.f) {
             shouldCustomizeImageView = NO;
         }
     }];
     if (shouldCustomizeImageView) {
-        self.swappableImageViewDefaultOffset = swappableImageViewDefaultOffset;
+        self.tabImageViewDefaultOffset = tabImageViewDefaultOffset;
     }
 }
 

CYLTabBarController/CYLTabBar.m

@@ -8,6 +8,7 @@
 
 #import "CYLPlusButton.h"
 #import "UIViewController+CYLTabBarControllerExtention.h"
+#import "UIView+CYLTabBarControllerExtention.h"
 
 FOUNDATION_EXTERN NSString *const CYLTabBarItemTitle;
 FOUNDATION_EXTERN NSString *const CYLTabBarItemImage;
@@ -22,7 +23,6 @@ FOUNDATION_EXTERN CGFloat CYLTabBarItemWidth;
 /*!
  * @param tabBarController The tab bar controller containing viewController.
  * @param control Selected UIControl in TabBar.
- * @attention If PlusButton also add an action, then this delegate method will not be invoked when the PlusButton is selected.
  */
 - (void)tabBarController:(UITabBarController *)tabBarController didSelectControl:(UIControl *)control;
 

CYLTabBarController/CYLTabBarController.h

@@ -19,11 +19,11 @@
 NSUInteger CYLPlusButtonIndex = 0;
 CGFloat CYLTabBarItemWidth = 0.0f;
 NSString *const CYLTabBarItemWidthDidChangeNotification = @"CYLTabBarItemWidthDidChangeNotification";
-static void * const CYLSwappableImageViewDefaultOffsetContext = (void*)&CYLSwappableImageViewDefaultOffsetContext;
+static void * const CYLTabImageViewDefaultOffsetContext = (void*)&CYLTabImageViewDefaultOffsetContext;
 
 @interface CYLTabBarController () <UITabBarControllerDelegate>
 
-@property (nonatomic, assign, getter=isObservingSwappableImageViewDefaultOffset) BOOL observingSwappableImageViewDefaultOffset;
+@property (nonatomic, assign, getter=isObservingTabImageViewDefaultOffset) BOOL observingTabImageViewDefaultOffset;
 
 @end
 @implementation CYLTabBarController
@@ -38,9 +38,9 @@ - (void)viewDidLoad {
     // 处理tabBar，使用自定义 tabBar 添加 发布按钮
     [self setUpTabBar];
     // KVO注册监听
-    if (!self.isObservingSwappableImageViewDefaultOffset) {
-        [self.tabBar addObserver:self forKeyPath:@"swappableImageViewDefaultOffset" options:NSKeyValueObservingOptionNew context:CYLSwappableImageViewDefaultOffsetContext];
-        self.observingSwappableImageViewDefaultOffset = YES;
+    if (!self.isObservingTabImageViewDefaultOffset) {
+        [self.tabBar addObserver:self forKeyPath:@"tabImageViewDefaultOffset" options:NSKeyValueObservingOptionNew context:CYLTabImageViewDefaultOffsetContext];
+        self.observingTabImageViewDefaultOffset = YES;
     }
 
 }
@@ -86,8 +86,8 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 
 - (void)dealloc {
     // KVO反注册
-    if (self.isObservingSwappableImageViewDefaultOffset) {
-        [self.tabBar removeObserver:self forKeyPath:@"swappableImageViewDefaultOffset"];
+    if (self.isObservingTabImageViewDefaultOffset) {
+        [self.tabBar removeObserver:self forKeyPath:@"tabImageViewDefaultOffset"];
     }
 }
 
@@ -287,23 +287,23 @@ - (BOOL)shouldCustomizeTitlePositionAdjustment {
 
 // KVO监听执行
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-    if(context != CYLSwappableImageViewDefaultOffsetContext) {
+    if(context != CYLTabImageViewDefaultOffsetContext) {
         [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
         return;
     }
-    if(context == CYLSwappableImageViewDefaultOffsetContext) {
-        CGFloat swappableImageViewDefaultOffset = [change[NSKeyValueChangeNewKey] floatValue];
-        [self offsetTabBarSwappableImageViewToFit:swappableImageViewDefaultOffset];
+    if(context == CYLTabImageViewDefaultOffsetContext) {
+        CGFloat tabImageViewDefaultOffset = [change[NSKeyValueChangeNewKey] floatValue];
+        [self offsetTabBarTabImageViewToFit:tabImageViewDefaultOffset];
     }
 }
 
-- (void)offsetTabBarSwappableImageViewToFit:(CGFloat)swappableImageViewDefaultOffset {
+- (void)offsetTabBarTabImageViewToFit:(CGFloat)tabImageViewDefaultOffset {
     if (self.shouldCustomizeImageInsets) {
         return;
     }
     NSArray<UITabBarItem *> *tabBarItems = [self cyl_tabBarController].tabBar.items;
     [tabBarItems enumerateObjectsUsingBlock:^(UITabBarItem * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        UIEdgeInsets imageInset = UIEdgeInsetsMake(swappableImageViewDefaultOffset, 0, -swappableImageViewDefaultOffset, 0);
+        UIEdgeInsets imageInset = UIEdgeInsetsMake(tabImageViewDefaultOffset, 0, -tabImageViewDefaultOffset, 0);
         obj.imageInsets = imageInset;
         if (!self.shouldCustomizeTitlePositionAdjustment) {
             obj.titlePositionAdjustment = UIOffsetMake(0, MAXFLOAT);

CYLTabBarController/CYLTabBarController.m

@@ -0,0 +1,18 @@
+//
+//  CYLTabBarController.m
+//  CYLTabBarController
+//
+//  v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
+//  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UIView (CYLTabBarControllerExtention)
+
+- (BOOL)cyl_isPlusButton;
+- (BOOL)cyl_isTabButton;
+- (BOOL)cyl_isTabImageView;
+- (BOOL)cyl_isTabLabel;
+
+@end

CYLTabBarController/UIView+CYLTabBarControllerExtention.h

@@ -0,0 +1,50 @@
+//
+//  CYLTabBarController.m
+//  CYLTabBarController
+//
+//  v1.10.0 Created by 微博@iOS程序犭袁 ( http://weibo.com/luohanchenyilong/ ) on 10/20/15.
+//  Copyright © 2015 https://github.com/ChenYilong . All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "UIView+CYLTabBarControllerExtention.h"
+#import "CYLPlusButton.h"
+
+@implementation UIView (CYLTabBarControllerExtention)
+
+- (BOOL)cyl_isPlusButton {
+    return [self isKindOfClass:[CYLExternPlusButton class]];
+}
+
+- (BOOL)cyl_isTabButton {
+    BOOL isKindOfButton = [self cyl_isKindOfClass:[UIControl class]];
+    return isKindOfButton;
+}
+
+- (BOOL)cyl_isTabImageView {
+    BOOL isKindOfImageView = [self cyl_isKindOfClass:[UIImageView class]];
+    return isKindOfImageView;
+}
+
+- (BOOL)cyl_isTabLabel {
+    BOOL isKindOfLabel = [self cyl_isKindOfClass:[UILabel class]];
+    return isKindOfLabel;
+}
+
+- (BOOL)cyl_isKindOfClass:(Class)class {
+    BOOL isKindOfClass = [self isKindOfClass:class];
+    BOOL isClass = [self isMemberOfClass:class];
+    BOOL isTabBarClass = [self cyl_isTabBarClass];
+    return isKindOfClass && !isClass && isTabBarClass;
+}
+
+- (BOOL)cyl_isTabBarClass {
+    NSString *classString = NSStringFromClass([self class]);
+    NSString *tabBarClassString = [NSString stringWithFormat:@"U%@a%@ar", @"IT" , @"bB"];
+    if ([classString rangeOfString:tabBarClassString].location == NSNotFound) {
+        return NO;
+    }
+    return YES;
+}
+
+@end

CYLTabBarController/UIView+CYLTabBarControllerExtention.m

@@ -75,16 +75,13 @@ - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectView
 
 - (void)tabBarController:(UITabBarController *)tabBarController didSelectControl:(UIControl *)control {
     UIView *animationView;
-    NSString *button = [NSString stringWithFormat:@"UIT%@arB%@", @"abB", @"utton"];
-    // 如果 PlusButton 也添加了点击事件，那么点击 PlusButton 后不会触发该代理方法。
-    if ([control isKindOfClass:[CYLExternPlusButton class]]) {
+    // 即使 PlusButton 也添加了点击事件，点击 PlusButton 后也会触发该代理方法。
+    if ([control cyl_isPlusButton]) {
         UIButton *button = CYLExternPlusButton;
         animationView = button.imageView;
-        
-    } else if ([control isKindOfClass:NSClassFromString(button)]) {
-        NSString *imageView = [NSString stringWithFormat:@"UITabB%@pp%@", @"arSwa", @"ableImageView"];
+    } else if ([control cyl_isTabButton]) {
         for (UIView *subView in control.subviews) {
-            if ([subView isKindOfClass:NSClassFromString(imageView)]) {
+            if ([subView cyl_isTabImageView]) {
                 animationView = subView;
             }
         }