Fixes bottomTab.badge - #4167 (#4170)

lib/ios/RNNBasePresenter.m

@@ -29,7 +29,7 @@
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-	
+	[self.bottomTabPresenter mergeOptions:options resolvedOptions:resolvedOptions];
 }
 
 - (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions {

lib/ios/RNNBottomTabPresenter.h

@@ -8,4 +8,6 @@
 
 - (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions;
 
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
+
 @end

lib/ios/RNNBottomTabPresenter.m

@@ -1,5 +1,6 @@
 #import "RNNBottomTabPresenter.h"
 #import "RNNTabBarItemCreator.h"
+#import "UIViewController+RNNOptions.h"
 
 @interface RNNBottomTabPresenter()
 
@@ -24,6 +25,17 @@
 		[options.bottomTab.icon consume];
 		[options.bottomTab.selectedIcon consume];
 	}
+	
+	if (![viewController isKindOfClass:[UITabBarController class]]) {
+		[viewController rnn_setTabBarItemBadge:[options.bottomTab.badge getWithDefaultValue:nil]];
+	}
+}
+
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
+	UIViewController* viewController = self.bindedViewController;
+	if (options.bottomTab.badge.hasValue && ![viewController isKindOfClass:[UITabBarController class]]) {
+		[viewController rnn_setTabBarItemBadge:options.bottomTab.badge.get];
+	}
 }
 
 - (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions {

lib/ios/RNNNavigationController.m

@@ -48,7 +48,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 }
 
 - (UITabBarItem *)tabBarItem {
-	return super.tabBarItem ? super.tabBarItem : self.viewControllers.lastObject.tabBarItem;
+	return self.viewControllers.lastObject.tabBarItem;
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {

lib/ios/RNNSideMenuChildVC.m

@@ -49,7 +49,7 @@
 }
 
 - (UITabBarItem *)tabBarItem {
-	return super.tabBarItem ? super.tabBarItem : self.child.tabBarItem;
+	return self.child.tabBarItem;
 }
 
 - (void)bindChildViewController:(UIViewController<RNNParentProtocol>*)child {

lib/ios/RNNSideMenuController.m

@@ -46,7 +46,7 @@
 }
 
 - (UITabBarItem *)tabBarItem {
-	return super.tabBarItem ? super.tabBarItem : self.center.tabBarItem;
+	return self.center.tabBarItem;
 }
 
 - (void)onChildWillAppear {

lib/ios/RNNTabBarController.m

@@ -53,7 +53,7 @@
 }
 
 - (UITabBarItem *)tabBarItem {
-	return super.tabBarItem ? super.tabBarItem : self.viewControllers.lastObject.tabBarItem;
+	return self.viewControllers.lastObject.tabBarItem;
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {

lib/ios/RNNViewControllerPresenter.m

@@ -23,7 +23,6 @@
 	[viewController rnn_setNavigationItemTitle:[options.topBar.title.text getWithDefaultValue:nil]];
 	[viewController rnn_setTopBarPrefersLargeTitle:[options.topBar.largeTitle.visible getWithDefaultValue:NO]];
 	[viewController rnn_setDrawBehindTabBar:[options.bottomTabs.drawBehind getWithDefaultValue:NO] || ![options.bottomTabs.visible getWithDefaultValue:YES]];
-	[viewController rnn_setTabBarItemBadge:[options.bottomTab.badge getWithDefaultValue:nil]];
 	[viewController rnn_setTabBarItemBadgeColor:[options.bottomTab.badgeColor getWithDefaultValue:nil]];
 	[viewController rnn_setStatusBarBlur:[options.statusBar.blur getWithDefaultValue:NO]];
 	[viewController rnn_setStatusBarStyle:[options.statusBar.style getWithDefaultValue:@"default"] animated:[options.statusBar.animate getWithDefaultValue:YES]];
@@ -83,10 +82,6 @@
 		[viewController rnn_setDrawBehindTabBar:options.bottomTabs.drawBehind.get];
 	}
 	
-	if (options.bottomTab.badge.hasValue) {
-		[viewController rnn_setTabBarItemBadge:options.bottomTab.badge.get];
-	}
-	
 	if (options.bottomTab.badgeColor.hasValue) {
 		[viewController rnn_setTabBarItemBadgeColor:options.bottomTab.badgeColor.get];
 	}

lib/ios/ReactNativeNavigationTests/RNNBottomTabPresenterTest.m

@@ -1,5 +1,7 @@
 #import <XCTest/XCTest.h>
 #import "RNNBottomTabPresenter.h"
+#import <OCMock/OCMock.h>
+#import "UIViewController+RNNOptions.h"
 
 @interface RNNBottomTabPresenterTest : XCTestCase
 
@@ -13,6 +15,32 @@
 
 - (void)setUp {
     [super setUp];
+    self.uut = [[RNNBottomTabPresenter alloc] init];
+    self.bindedViewController = [OCMockObject partialMockForObject:[UIViewController new]];
+    [self.uut bindViewController:self.bindedViewController];
+    self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
+}
+
+- (void)testApplyOptions_shouldSetTabBarItemBadgeWithDefault {
+	[[self.bindedViewController expect] rnn_setTabBarItemBadge:nil];
+	[self.uut applyOptions:self.options];
+	[self.bindedViewController verify];
+}
+
+- (void)testApplyOptions_shouldSetTabBarItemBadgeWithValue {
+	self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
+	[[self.bindedViewController expect] rnn_setTabBarItemBadge:@"badge"];
+	[self.uut applyOptions:self.options];
+	[self.bindedViewController verify];
+}
+
+- (void)testApplyOptions_setTabBarItemBadgeShouldNotCalledOnUITabBarController {
+	self.bindedViewController = [OCMockObject partialMockForObject:[UITabBarController new]];
+	[self.uut bindViewController:self.bindedViewController];
+	self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
+	[[self.bindedViewController reject] rnn_setTabBarItemBadge:@"badge"];
+	[self.uut applyOptions:self.options];
+	[self.bindedViewController verify];
 }
 
 //- (void)test_tabBarTextFontFamily_validFont {