adresses #2762

lib/ios/RNNBottomTabsOptions.h

@@ -3,7 +3,7 @@
 @interface RNNBottomTabsOptions : RNNOptions
 
 @property (nonatomic, strong) NSNumber* visible;
-@property (nonatomic, strong) NSNumber* animateHide;
+@property (nonatomic, strong) NSNumber* animate;
 @property (nonatomic, strong) NSNumber* currentTabIndex;
 @property (nonatomic, strong) NSString* testID;
 @property (nonatomic, strong) NSNumber* drawBehind;
@@ -12,10 +12,8 @@
 @property (nonatomic, strong) NSNumber* translucent;
 @property (nonatomic, strong) NSNumber* hideShadow;
 @property (nonatomic, strong) NSNumber* backgroundColor;
-@property (nonatomic, strong) NSNumber* textColor;
 @property (nonatomic, strong) NSNumber* tabColor;
 @property (nonatomic, strong) NSNumber* selectedTabColor;
-@property (nonatomic, strong) NSNumber* selectedTextColor;
 @property (nonatomic, strong) NSString* fontFamily;
 @property (nonatomic, strong) NSNumber* fontSize;
 

lib/ios/RNNBottomTabsOptions.m

@@ -14,7 +14,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 	}
 	
 	if (self.visible) {
-		[((RNNTabBarController *)viewController.tabBarController) setTabBarHidden:![self.visible boolValue] animated:[self.animateHide boolValue]];
+		[((RNNTabBarController *)viewController.tabBarController) setTabBarHidden:![self.visible boolValue] animated:[self.animate boolValue]];
 	}
 	
 	if (self.testID) {
@@ -41,27 +41,21 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 		viewController.tabBarController.tabBar.clipsToBounds = [self.hideShadow boolValue];
 	}
 	
-	if (self.tabBarTextFont || self.textColor) {
+	if (self.tabBarTextFont) {
 		NSMutableDictionary* tabBarTitleTextAttributes = [NSMutableDictionary new];
-		if (self.textColor) {
-			tabBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:self.textColor];
-		}
-		
-		if (self.tabBarTextFont) {
-			tabBarTitleTextAttributes[NSFontAttributeName] = self.tabBarTextFont;
-		}
+		tabBarTitleTextAttributes[NSFontAttributeName] = self.tabBarTextFont;
 		
 		for (UITabBarItem* item in viewController.tabBarController.tabBar.items) {
 			[item setTitleTextAttributes:tabBarTitleTextAttributes forState:UIControlStateNormal];
 		}
 	}
 	
-	if (self.selectedTextColor){
-		for (UITabBarItem* item in viewController.tabBarController.tabBar.items) {
-			NSMutableDictionary* tabBarTitleTextAttributes = [NSMutableDictionary new];
-			tabBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:self.selectedTextColor];
-			[item setTitleTextAttributes:tabBarTitleTextAttributes forState:UIControlStateSelected];
-		}
+	if (self.tabColor) {
+		viewController.tabBarController.tabBar.unselectedItemTintColor = [RCTConvert UIColor:self.tabColor];
+	}
+	
+	if (self.selectedTabColor) {
+		viewController.tabBarController.tabBar.tintColor = [RCTConvert UIColor:self.selectedTabColor];
 	}
 	
 	[self resetOptions];

lib/ios/RNNTopBarOptions.h

@@ -17,7 +17,7 @@
 @property (nonatomic, strong) NSNumber* textFontSize;
 @property (nonatomic, strong) NSNumber* noBorder;
 @property (nonatomic, strong) NSNumber* blur;
-@property (nonatomic, strong) NSNumber* animateHide;
+@property (nonatomic, strong) NSNumber* animate;
 @property (nonatomic, strong) NSNumber* largeTitle;
 @property (nonatomic, strong) NSString* testID;
 

lib/ios/RNNTopBarOptions.m

@@ -63,7 +63,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 	
 	
 	if (self.visible) {
-		[viewController.navigationController setNavigationBarHidden:![self.visible boolValue] animated:[self.animateHide boolValue]];
+		[viewController.navigationController setNavigationBarHidden:![self.visible boolValue] animated:[self.animate boolValue]];
 	}
 	
 	if (self.hideOnScroll) {

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -619,13 +619,20 @@
 	XCTAssertTrue([self.uut.tabBarController.tabBar.barTintColor isEqual:expectedColor]);
 }
 
--(void)testTabBarTextColor_validColor{
+-(void)testTabBarSelectedColor_validColor{
 	NSNumber* inputColor = @(0xFFFF0000);
-	self.options.bottomTabs.textColor = inputColor;
+	self.options.bottomTabs.tabColor = inputColor;
 	[self.uut embedInTabBarController];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
-	NSDictionary* attributes = [self.uut.tabBarController.tabBar.items.firstObject titleTextAttributesForState:UIControlStateNormal];
-	XCTAssertTrue([attributes[@"NSColor"] isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.tabBarController.tabBar.unselectedItemTintColor isEqual:expectedColor]);
+}
+
+-(void)testTabBarUnselectedColor_validColor{
+	NSNumber* inputColor = @(0xFFFF0000);
+	self.options.bottomTabs.selectedTabColor = inputColor;
+	[self.uut embedInTabBarController];
+	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
+	XCTAssertTrue([self.uut.tabBarController.tabBar.tintColor isEqual:expectedColor]);
 }
 
 -(void)testTabBarTextFontFamily_validFont{
@@ -645,28 +652,22 @@
 	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
 }
 
--(void)testTabBarTextFontSize_withoutTextFontFamily_withTextColor {
+-(void)testTabBarTextFontSize_withoutTextFontFamily {
 	self.options.bottomTabs.fontSize = @(15);
-	self.options.bottomTabs.textColor = @(0xFFFF0000);
 	[self.uut embedInTabBarController];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
-	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	NSDictionary* attributes = [self.uut.tabBarController.tabBar.items.firstObject titleTextAttributesForState:UIControlStateNormal];
 	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
-	XCTAssertTrue([attributes[@"NSColor"] isEqual:expectedColor]);
 }
 
 -(void)testTabBarTextFontSize_withTextFontFamily_withTextColor {
 	NSString* inputFont = @"HelveticaNeue";
 	self.options.bottomTabs.fontSize = @(15);
-	self.options.bottomTabs.textColor = @(0xFFFF0000);
 	self.options.bottomTabs.fontFamily = inputFont;
 	[self.uut embedInTabBarController];
-	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
 	NSDictionary* attributes = [self.uut.tabBarController.tabBar.items.firstObject titleTextAttributesForState:UIControlStateNormal];
 	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
-	XCTAssertTrue([attributes[@"NSColor"] isEqual:expectedColor]);
 }
 
 -(void)testTabBarTextFontSize_withTextFontFamily_withoutTextColor {

playground/src/screens/TextScreen.js

@@ -70,7 +70,9 @@ class TextScreen extends Component {
       bottomTabs: {
         currentTabIndex: 1,
         visible: false,
-        animate: true
+        animate: true,
+        tabColor: 'blue',
+        selectedTabColor: 'red'
       }
     });
   }