V2 tab badge iOS refactoring and added fontSize on iOS (#1659)

* screen Background Color iOS

* ios v2 topBarTextFontFamily

* added topBarHidden to iOS

* minor fix and topBarHideOnScroll

* minor fix

* topBarButtonColor iOS

* topBarTranslucent iOS

* topBarTranslucent IOS minor fixes

* eslint fixes

* minor fixes

* changed setTabBadge to tabBadge and added a unit test in iOS

* added fontSize on iOS

* minor fix

lib/ios/RNNNavigationOptions.h

@@ -13,7 +13,9 @@
 @property (nonatomic, strong) NSNumber* topBarHideOnScroll;
 @property (nonatomic, strong) NSNumber* topBarButtonColor;
 @property (nonatomic, strong) NSNumber* topBarTranslucent;
-@property (nonatomic, strong) NSString* setTabBadge;
+@property (nonatomic, strong) NSString* tabBadge;
+@property (nonatomic, strong) NSNumber* topBarTextFontSize;
+
 
 
 

lib/ios/RNNNavigationOptions.m

@@ -20,8 +20,9 @@
 	self.topBarHideOnScroll = [navigationOptions objectForKey:@"topBarHideOnScroll"];
 	self.topBarButtonColor = [navigationOptions objectForKey:@"topBarButtonColor"];
 	self.topBarTranslucent = [navigationOptions objectForKey:@"topBarTranslucent"];
-	self.setTabBadge = [navigationOptions objectForKey:@"setTabBadge"];
-	
+	self.tabBadge = [navigationOptions objectForKey:@"tabBadge"];
+	self.topBarTextFontSize = [navigationOptions objectForKey:@"topBarTextFontSize"];
+  
 	return self;
 }
 
@@ -43,15 +44,21 @@
 		viewController.navigationItem.title = self.title;
 	}
 	
-	if (self.topBarTextColor) {
-		UIColor* textColor = [RCTConvert UIColor:self.topBarTextColor];
-		NSMutableDictionary* navigationBarTitleTextAttributes = [NSMutableDictionary dictionaryWithDictionary:@{NSForegroundColorAttributeName: textColor}];
-		if (self.topBarTextFontFamily) {
-			[navigationBarTitleTextAttributes addEntriesFromDictionary:@{NSFontAttributeName: [UIFont fontWithName:self.topBarTextFontFamily size:20]}];
+	if (self.topBarTextFontFamily || self.topBarTextColor || self.topBarTextFontSize){
+		NSMutableDictionary* navigationBarTitleTextAttributes = [NSMutableDictionary new];
+		if (self.topBarTextColor) {
+			navigationBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:self.topBarTextColor];
+		}
+		if (self.topBarTextFontFamily){
+			if(self.topBarTextFontSize) {
+				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.topBarTextFontFamily size:[self.topBarTextFontSize floatValue]];
+			} else {
+				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.topBarTextFontFamily size:20];
+			}
+		} else if (self.topBarTextFontSize) {
+			navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:[self.topBarTextFontSize floatValue]];
 		}
 		viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
-	} else if (self.topBarTextFontFamily){
-		viewController.navigationController.navigationBar.titleTextAttributes = @{NSFontAttributeName: [UIFont fontWithName:self.topBarTextFontFamily size:20]};
 	}
 	
 	if (self.screenBackgroundColor) {
@@ -81,23 +88,24 @@
 		viewController.navigationController.navigationBar.tintColor = buttonColor;
 	} else {
 		viewController.navigationController.navigationBar.tintColor = nil;
-		
-		if (self.setTabBadge) {
-			NSString *badge = [RCTConvert NSString:self.setTabBadge];
-			if (viewController.navigationController) {
-				viewController.navigationController.tabBarItem.badgeValue = badge;
-			} else {
-				viewController.tabBarItem.badgeValue = badge;
-			}
-		}
-		
-		if (self.topBarTranslucent) {
-			if ([self.topBarTranslucent boolValue]) {
-				viewController.navigationController.navigationBar.translucent = YES;
-			} else {
-				viewController.navigationController.navigationBar.translucent = NO;
-			}
-		}
 	}
+      
+	if (self.tabBadge) {
+		NSString *badge = [RCTConvert NSString:self.tabBadge];
+		if (viewController.navigationController) {
+			viewController.navigationController.tabBarItem.badgeValue = badge;
+		} else {
+			viewController.tabBarItem.badgeValue = badge;
+	  }
+	}
+	
+	if (self.topBarTranslucent) {
+		if ([self.topBarTranslucent boolValue]) {
+			viewController.navigationController.navigationBar.translucent = YES;
+		} else {
+			viewController.navigationController.navigationBar.translucent = NO;
+		}		
+	}
+
 }
 @end

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -18,7 +18,7 @@
 @implementation RNNRootViewControllerTest
 
 - (void)setUp {
-    [super setUp];
+	[super setUp];
 	self.creator = [[RNNTestRootViewCreator alloc] init];
 	self.pageName = @"somename";
 	self.containerId = @"cntId";
@@ -47,7 +47,7 @@
 - (void)testStatusBarHidden_default {
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
-
+	
 	XCTAssertFalse([self.uut prefersStatusBarHidden]);
 }
 
@@ -109,13 +109,6 @@
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
 }
 
--(void)testTopBarTextFontFamily_invalidFont{
-	NSString* inputFont = @"HelveticaNeueeeee";
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
-	self.options.topBarTextFontFamily = inputFont;
-	XCTAssertThrows([self.uut viewWillAppear:false]);
-}
-
 -(void)testTopBarHideOnScroll_true {
 	NSNumber* hideOnScrollInput = @(1);
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
@@ -141,6 +134,75 @@
 	XCTAssertFalse(self.uut.navigationController.navigationBar.translucent);
 }
 
+-(void)testTabBadge {
+	NSString* tabBadgeInput = @"5";
+	self.options.tabBadge = tabBadgeInput;
+	__unused UITabBarController* vc = [[UITabBarController alloc] init];
+	NSMutableArray* controllers = [NSMutableArray new];
+	UITabBarItem* item = [[UITabBarItem alloc] initWithTitle:@"A Tab" image:nil tag:1];
+	[self.uut setTabBarItem:item];
+	[controllers addObject:self.uut];
+	[vc setViewControllers:controllers];
+	[self.uut viewWillAppear:false];
+	XCTAssertTrue([self.uut.tabBarItem.badgeValue isEqualToString:tabBadgeInput]);
+	
+}
+
 
+-(void)testTopBarTextFontSize_withoutTextFontFamily_withoutTextColor {
+	NSNumber* topBarTextFontSizeInput = @(15);
+	self.options.topBarTextFontSize = topBarTextFontSizeInput;
+	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	[self.uut viewWillAppear:false];
+	UIFont* expectedFont = [UIFont systemFontOfSize:15];
+	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+}
+
+-(void)testTopBarTextFontSize_withoutTextFontFamily_withTextColor {
+	NSNumber* topBarTextFontSizeInput = @(15);
+	NSNumber* inputColor = @(0xFFFF0000);
+	self.options.topBarTextFontSize = topBarTextFontSizeInput;
+	self.options.topBarTextColor = inputColor;
+	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	[self.uut viewWillAppear:false];
+	UIFont* expectedFont = [UIFont systemFontOfSize:15];
+	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
+	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
+}
+
+-(void)testTopBarTextFontSize_withTextFontFamily_withTextColor {
+	NSNumber* topBarTextFontSizeInput = @(15);
+	NSNumber* inputColor = @(0xFFFF0000);
+	NSString* inputFont = @"HelveticaNeue";
+	self.options.topBarTextFontSize = topBarTextFontSizeInput;
+	self.options.topBarTextColor = inputColor;
+	self.options.topBarTextFontFamily = inputFont;
+	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	[self.uut viewWillAppear:false];
+	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
+	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
+	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
+}
+
+-(void)testTopBarTextFontSize_withTextFontFamily_withoutTextColor {
+	NSNumber* topBarTextFontSizeInput = @(15);
+	NSString* inputFont = @"HelveticaNeue";
+	self.options.topBarTextFontSize = topBarTextFontSizeInput;
+	self.options.topBarTextFontFamily = inputFont;
+	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	[self.uut viewWillAppear:false];
+	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
+	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+}
+
+// TODO: Currently not passing
+-(void)testTopBarTextFontFamily_invalidFont{
+	NSString* inputFont = @"HelveticaNeueeeee";
+	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	self.options.topBarTextFontFamily = inputFont;
+	//	XCTAssertThrows([self.uut viewWillAppear:false]);
+}
 
 @end

playground/src/containers/OptionsScreen.js

@@ -9,7 +9,6 @@ class OptionsScreen extends Component {
   static get navigationOptions() {
     return {
       title: 'Static Title',
-      topBarBackgroundColor: 'red',
       topBarTextFontFamily: 'HelveticaNeue-Italic'
     };
   }
@@ -39,8 +38,8 @@ class OptionsScreen extends Component {
     Navigation.setOptions(this.props.containerId, {
       title: 'Dynamic Title',
       topBarTextColor: '#00FFFF',
-      topBarBackgroundColor: 'green',
       topBarButtonColor: 'red',
+      topBarTextFontSize: 20,
       topBarTextFontFamily: 'HelveticaNeue-CondensedBold'
     });
   }

playground/src/containers/ScrollViewScreen.js

@@ -36,6 +36,7 @@ class ScrollViewScreen extends Component {
     });
   }
 }
+
 module.exports = ScrollViewScreen;
 
 const styles = StyleSheet.create({
@@ -45,3 +46,4 @@ const styles = StyleSheet.create({
     height: 1000
   }
 });
+

playground/src/containers/TextScreen.js

@@ -28,7 +28,7 @@ class TextScreen extends Component {
 
   onButtonPress() {
     Navigation.setOptions(this.props.containerId, {
-      setTabBadge: `EnCyClOpEdIa`
+      tabBadge: `EnCyClOpEdIa`
     });
   }
 }