V2 nested (#2194)

* readme

* WIP

* ios, tests

* refactoring

* test fix

* probabl test fix

README.md

@@ -66,10 +66,10 @@ v2 is written in Test Driven Development. We have a test for every feature inclu
 | showModal              |  ✅        |	✅|
 | dismissModal           |     ✅       |	✅|
 | showOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	WIP @cool04ek |
-| dismissOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	[Contribute](/docs/docs/CONTRIBUTING.md) |
+| dismissOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	WIP @cool04ek |
 | customTransition            |   ✅        |	[Contribute](/docs/docs/CONTRIBUTING.md) |
 | Screen Visibility        | ✅     |✅|
-| async commands (await push)     |  [Contribute](/docs/docs/CONTRIBUTING.md)        |[Contribute](/docs/docs/CONTRIBUTING.md)   |
+| async commands (await push)     |  [Contribute](/docs/docs/CONTRIBUTING.md)        | WIP @cool04ek   |
 
 ### Navigation Options
 

e2e/ScreenStyle.test.js

@@ -48,7 +48,7 @@ describe('screen style', () => {
   it('set Tab Bar badge on a current Tab', async () => {
     await elementByLabel('Switch to tab based app').tap();
     await elementByLabel('Set Tab Badge').tap();
-    await expect(element(by.text('EnCyClOpEdIa'))).toBeVisible();
+    await expect(element(by.text('TeSt'))).toBeVisible();
   });
 
   it('set right buttons', async () => {

lib/android/app/src/main/java/com/reactnativenavigation/parse/DEFAULT_VALUES.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.parse;
+
+
+import android.graphics.Color;
+
+interface DEFAULT_VALUES {
+	String NO_VALUE = "";
+	int NO_INT_VALUE = Integer.MIN_VALUE;
+	float NO_FLOAT_VALUE = Float.MIN_VALUE;
+	int NO_COLOR_VALUE = Color.TRANSPARENT;
+}

lib/android/app/src/main/java/com/reactnativenavigation/parse/NavigationOptions.java

@@ -6,12 +6,7 @@ import android.support.annotation.NonNull;
 
 import org.json.JSONObject;
 
-public class NavigationOptions {
-
-	private static final String NO_VALUE = "";
-	private static final int NO_INT_VALUE = Integer.MIN_VALUE;
-	private static final float NO_FLOAT_VALUE = Float.MIN_VALUE;
-	private static final int NO_COLOR_VALUE = Color.TRANSPARENT;
+public class NavigationOptions implements DEFAULT_VALUES {
 
 	public enum BooleanOptions {
 		True,
@@ -31,42 +26,14 @@ public class NavigationOptions {
 		NavigationOptions result = new NavigationOptions();
 		if (json == null) return result;
 
-		result.title = json.optString("title", NO_VALUE);
-		result.topBarBackgroundColor = json.optInt("topBarBackgroundColor", NO_COLOR_VALUE);
-		result.topBarTextColor = json.optInt("topBarTextColor", NO_INT_VALUE);
-		result.topBarTextFontSize = (float) json.optDouble("topBarTextFontSize", NO_FLOAT_VALUE);
-		result.topBarTextFontFamily = json.optString("topBarTextFontFamily", NO_VALUE);
-		result.topBarHidden = BooleanOptions.parse(json.optString("topBarHidden"));
-		result.animateTopBarHide = BooleanOptions.parse(json.optString("animateTopBarHide"));
+		result.topBarOptions = TopBarOptions.parse(json.optJSONObject("topBar"));
 
 		return result;
 	}
 
-	public String title = "";
-	@ColorInt
-	public int topBarBackgroundColor;
-	@ColorInt
-	public int topBarTextColor;
-	public float topBarTextFontSize;
-	public String topBarTextFontFamily;
-	public BooleanOptions topBarHidden = BooleanOptions.False;
-	public BooleanOptions animateTopBarHide = BooleanOptions.False;
+	public TopBarOptions topBarOptions = new TopBarOptions();
 
 	public void mergeWith(final NavigationOptions other) {
-		if (!NO_VALUE.equals(other.title)) title = other.title;
-		if (other.topBarBackgroundColor != NO_COLOR_VALUE)
-			topBarBackgroundColor = other.topBarBackgroundColor;
-		if (other.topBarTextColor != NO_INT_VALUE)
-			topBarTextColor = other.topBarTextColor;
-		if (other.topBarTextFontSize != NO_FLOAT_VALUE)
-			topBarTextFontSize = other.topBarTextFontSize;
-		if (!NO_VALUE.equals(other.topBarTextFontFamily))
-			topBarTextFontFamily = other.topBarTextFontFamily;
-		if (other.topBarHidden != BooleanOptions.NoValue) {
-			topBarHidden = other.topBarHidden;
-		}
-		if (other.animateTopBarHide != BooleanOptions.NoValue) {
-			animateTopBarHide = other.animateTopBarHide;
-		}
+		topBarOptions.mergeWith(other.topBarOptions);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java

@@ -0,0 +1,52 @@
+package com.reactnativenavigation.parse;
+
+
+import android.support.annotation.ColorInt;
+
+import org.json.JSONObject;
+
+public class TopBarOptions implements DEFAULT_VALUES {
+
+	public static TopBarOptions parse(JSONObject json) {
+		TopBarOptions options = new TopBarOptions();
+		if (json == null) return options;
+
+		options.title = json.optString("title", NO_VALUE);
+		options.backgroundColor = json.optInt("backgroundColor", NO_COLOR_VALUE);
+		options.textColor = json.optInt("textColor", NO_INT_VALUE);
+		options.textFontSize = (float) json.optDouble("textFontSize", NO_FLOAT_VALUE);
+		options.textFontFamily = json.optString("textFontFamily", NO_VALUE);
+		options.hidden = NavigationOptions.BooleanOptions.parse(json.optString("hidden"));
+		options.animateHide = NavigationOptions.BooleanOptions.parse(json.optString("animateHide"));
+
+		return options;
+	}
+
+	public String title = "";
+	@ColorInt
+	public int backgroundColor;
+	@ColorInt
+	public int textColor;
+	public float textFontSize;
+	public String textFontFamily;
+	public NavigationOptions.BooleanOptions hidden = NavigationOptions.BooleanOptions.False;
+	public NavigationOptions.BooleanOptions animateHide = NavigationOptions.BooleanOptions.False;
+
+	void mergeWith(final TopBarOptions other) {
+		if (!NO_VALUE.equals(other.title)) title = other.title;
+		if (other.backgroundColor != NO_COLOR_VALUE)
+			backgroundColor = other.backgroundColor;
+		if (other.textColor != NO_INT_VALUE)
+			textColor = other.textColor;
+		if (other.textFontSize != NO_FLOAT_VALUE)
+			textFontSize = other.textFontSize;
+		if (!NO_VALUE.equals(other.textFontFamily))
+			textFontFamily = other.textFontFamily;
+		if (other.hidden != NavigationOptions.BooleanOptions.NoValue) {
+			hidden = other.hidden;
+		}
+		if (other.animateHide != NavigationOptions.BooleanOptions.NoValue) {
+			animateHide = other.animateHide;
+		}
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.presentation;
 
-import android.util.Log;
 import android.view.View;
 
 import com.reactnativenavigation.anim.StackAnimator;
@@ -21,22 +20,22 @@ public class OptionsPresenter {
 
 	public void applyOptions(NavigationOptions options) {
 		if (controller != null && controller.getTopBar() != null) {
-			controller.getTopBar().setTitle(options.title);
-			controller.getTopBar().setBackgroundColor(options.topBarBackgroundColor);
-			controller.getTopBar().setTitleTextColor(options.topBarTextColor);
-			controller.getTopBar().setTitleFontSize(options.topBarTextFontSize);
+			controller.getTopBar().setTitle(options.topBarOptions.title);
+			controller.getTopBar().setBackgroundColor(options.topBarOptions.backgroundColor);
+			controller.getTopBar().setTitleTextColor(options.topBarOptions.textColor);
+			controller.getTopBar().setTitleFontSize(options.topBarOptions.textFontSize);
 			TypefaceLoader typefaceLoader = new TypefaceLoader();
-			controller.getTopBar().setTitleTypeface(typefaceLoader.getTypeFace(controller.getActivity(), options.topBarTextFontFamily));
+			controller.getTopBar().setTitleTypeface(typefaceLoader.getTypeFace(controller.getActivity(), options.topBarOptions.textFontFamily));
 			applyTopbarHiddenOptions(options);
 		}
 	}
 
 	private void applyTopbarHiddenOptions(NavigationOptions options) {
-		if (options.topBarHidden == NavigationOptions.BooleanOptions.True) {
-			hideTopbar(options.animateTopBarHide);
+		if (options.topBarOptions.hidden == NavigationOptions.BooleanOptions.True) {
+			hideTopbar(options.topBarOptions.animateHide);
 		}
-		if (options.topBarHidden == NavigationOptions.BooleanOptions.False) {
-			showTopbar(options.animateTopBarHide);
+		if (options.topBarOptions.hidden == NavigationOptions.BooleanOptions.False) {
+			showTopbar(options.topBarOptions.animateHide);
 		}
 	}
 

lib/android/app/src/test/java/com/reactnativenavigation/parse/NavigationOptionsTest.java

@@ -18,25 +18,29 @@ public class NavigationOptionsTest extends BaseTest {
 	@Test
 	public void parsesJson() throws Exception {
 		JSONObject json = new JSONObject();
-		json.put("title", "the title");
-		json.put("topBarBackgroundColor", 0xff123456);
-		json.put("topBarTextColor", 0xff123456);
-		json.put("topBarTextFontSize", 18);
-		json.put("topBarTextFontFamily", "HelveticaNeue-CondensedBold");
-		json.put("topBarHidden", true);
+		JSONObject topBarJson = new JSONObject();
+
+		topBarJson.put("title", "the title");
+		topBarJson.put("backgroundColor", 0xff123456);
+		topBarJson.put("textColor", 0xff123456);
+		topBarJson.put("textFontSize", 18);
+		topBarJson.put("textFontFamily", "HelveticaNeue-CondensedBold");
+		topBarJson.put("hidden", true);
+
+		json.put("topBar", topBarJson);
 
 		NavigationOptions result = NavigationOptions.parse(json);
-		assertThat(result.title).isEqualTo("the title");
-		assertThat(result.topBarBackgroundColor).isEqualTo(0xff123456);
-		assertThat(result.topBarTextColor).isEqualTo(0xff123456);
-		assertThat(result.topBarTextFontSize).isEqualTo(18);
-		assertThat(result.topBarTextFontFamily).isEqualTo("HelveticaNeue-CondensedBold");
-		assertThat(result.topBarHidden).isEqualTo(True);
+		assertThat(result.topBarOptions.title).isEqualTo("the title");
+		assertThat(result.topBarOptions.backgroundColor).isEqualTo(0xff123456);
+		assertThat(result.topBarOptions.textColor).isEqualTo(0xff123456);
+		assertThat(result.topBarOptions.textFontSize).isEqualTo(18);
+		assertThat(result.topBarOptions.textFontFamily).isEqualTo("HelveticaNeue-CondensedBold");
+		assertThat(result.topBarOptions.hidden).isEqualTo(True);
 	}
 
 	@Test
 	public void defaultEmptyOptions() throws Exception {
 		NavigationOptions uut = new NavigationOptions();
-		assertThat(uut.title).isEmpty();
+		assertThat(uut.topBarOptions.title).isEmpty();
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -193,13 +193,13 @@ public class NavigatorTest extends BaseTest {
 	public void setOptions_CallsApplyNavigationOptions() {
 		ContainerViewController containerVc = new SimpleContainerViewController(activity, "theId");
 		uut.setRoot(containerVc);
-		assertThat(containerVc.getNavigationOptions().title).isEmpty();
+		assertThat(containerVc.getNavigationOptions().topBarOptions.title).isEmpty();
 
 		NavigationOptions options = new NavigationOptions();
-		options.title = "new title";
+		options.topBarOptions.title = "new title";
 
 		uut.setOptions("theId", options);
-		assertThat(containerVc.getNavigationOptions().title).isEqualTo("new title");
+		assertThat(containerVc.getNavigationOptions().topBarOptions.title).isEqualTo("new title");
 	}
 
 	@Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java

@@ -50,7 +50,7 @@ public class OptionsApplyingTest extends BaseTest {
 	@Test
 	public void initialOptionsAppliedOnAppear() throws Exception {
 		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-		initialNavigationOptions.title = "the title";
+		initialNavigationOptions.topBarOptions.title = "the title";
 		StackController stackController = new StackController(activity, "stackId");
 		stackController.push(uut);
 		assertThat(uut.getTopBar().getTitle()).isEmpty();
@@ -61,11 +61,11 @@ public class OptionsApplyingTest extends BaseTest {
 
 	@Test
 	public void mergeNavigationOptionsUpdatesCurrentOptions() throws Exception {
-		assertThat(uut.getNavigationOptions().title).isEmpty();
+		assertThat(uut.getNavigationOptions().topBarOptions.title).isEmpty();
 		NavigationOptions options = new NavigationOptions();
-		options.title = "new title";
+		options.topBarOptions.title = "new title";
 		uut.mergeNavigationOptions(options);
-		assertThat(uut.getNavigationOptions().title).isEqualTo("new title");
+		assertThat(uut.getNavigationOptions().topBarOptions.title).isEqualTo("new title");
 		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
 	}
 
@@ -75,7 +75,7 @@ public class OptionsApplyingTest extends BaseTest {
 		assertThat(uut.getTopBar().getTitle()).isEmpty();
 
 		NavigationOptions opts = new NavigationOptions();
-		opts.title = "the new title";
+		opts.topBarOptions.title = "the new title";
 		uut.mergeNavigationOptions(opts);
 
 		assertThat(uut.getTopBar().getTitle()).isEqualTo("the new title");
@@ -88,7 +88,7 @@ public class OptionsApplyingTest extends BaseTest {
 		assertThat(((ColorDrawable) uut.getTopBar().getTitleBar().getBackground()).getColor()).isNotEqualTo(Color.RED);
 
 		NavigationOptions opts = new NavigationOptions();
-		opts.topBarBackgroundColor = Color.RED;
+		opts.topBarOptions.backgroundColor = Color.RED;
 		uut.mergeNavigationOptions(opts);
 
 		assertThat(((ColorDrawable) uut.getTopBar().getTitleBar().getBackground()).getColor()).isEqualTo(Color.RED);
@@ -97,13 +97,13 @@ public class OptionsApplyingTest extends BaseTest {
 	@Test
 	public void appliesTopBarTextColor() throws Exception {
 		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-		initialNavigationOptions.title = "the title";
+		initialNavigationOptions.topBarOptions.title = "the title";
 		uut.onViewAppeared();
 		assertThat(uut.getTopBar().getTitleTextView().getCurrentTextColor()).isNotEqualTo(Color.RED);
 
 		NavigationOptions opts = new NavigationOptions();
-		opts.title = "the title";
-		opts.topBarTextColor = Color.RED;
+		opts.topBarOptions.title = "the title";
+		opts.topBarOptions.textColor = Color.RED;
 		uut.mergeNavigationOptions(opts);
 
 		assertThat(uut.getTopBar().getTitleTextView()).isNotEqualTo(null);
@@ -113,13 +113,13 @@ public class OptionsApplyingTest extends BaseTest {
 	@Test
 	public void appliesTopBarTextSize() throws Exception {
 		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-		initialNavigationOptions.title = "the title";
+		initialNavigationOptions.topBarOptions.title = "the title";
 		uut.onViewAppeared();
 		assertThat(uut.getTopBar().getTitleTextView().getTextSize()).isNotEqualTo(18);
 
 		NavigationOptions opts = new NavigationOptions();
-		opts.title = "the title";
-		opts.topBarTextFontSize = 18;
+		opts.topBarOptions.title = "the title";
+		opts.topBarOptions.textFontSize = 18;
 		uut.mergeNavigationOptions(opts);
 
 		assertThat(uut.getTopBar().getTitleTextView()).isNotEqualTo(null);
@@ -129,12 +129,12 @@ public class OptionsApplyingTest extends BaseTest {
 	@Test
 	public void appliesTopBarHidden() throws Exception {
 		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-		initialNavigationOptions.title = "the title";
+		initialNavigationOptions.topBarOptions.title = "the title";
 		uut.onViewAppeared();
 		assertThat(uut.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
 
 		NavigationOptions opts = new NavigationOptions();
-		opts.topBarHidden = NavigationOptions.BooleanOptions.True;
+		opts.topBarOptions.hidden = NavigationOptions.BooleanOptions.True;
 		uut.mergeNavigationOptions(opts);
 
 		assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);

lib/ios/RNNNavigationOptions.h

@@ -1,32 +1,22 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import "RNNTopBarOptions.h"
 
 extern const NSInteger BLUR_STATUS_TAG;
 extern const NSInteger BLUR_TOPBAR_TAG;
 
 @interface RNNNavigationOptions : NSObject
 
-@property (nonatomic, strong) NSNumber* topBarBackgroundColor;
-@property (nonatomic, strong) NSNumber* topBarTextColor;
 @property (nonatomic, strong) NSNumber* statusBarHidden;
-@property (nonatomic, strong) NSString* title;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
-@property (nonatomic, strong) NSString* topBarTextFontFamily;
-@property (nonatomic, strong) NSNumber* topBarHidden;
-@property (nonatomic, strong) NSNumber* topBarHideOnScroll;
-@property (nonatomic, strong) NSNumber* topBarButtonColor;
-@property (nonatomic, strong) NSNumber* topBarTranslucent;
 @property (nonatomic, strong) NSString* tabBadge;
-@property (nonatomic, strong) NSNumber* topBarTextFontSize;
 @property (nonatomic, strong) id orientation;
 @property (nonatomic, strong) NSArray* leftButtons;
 @property (nonatomic, strong) NSArray* rightButtons;
-@property (nonatomic, strong) NSNumber* topBarNoBorder;
 @property (nonatomic, strong) NSNumber* statusBarBlur;
 @property (nonatomic, strong) NSNumber* statusBarHideWithTopBar;
 @property (nonatomic, strong) NSNumber* tabBarHidden;
-@property (nonatomic, strong) NSNumber* topBarBlur;
-@property (nonatomic, strong) NSNumber* animateTopBarHide;
+@property (nonatomic, strong) RNNTopBarOptions* topBar;
 
 
 - (UIInterfaceOrientationMask)supportedOrientations;

lib/ios/RNNNavigationOptions.m

@@ -2,6 +2,7 @@
 #import <React/RCTConvert.h>
 #import "RNNNavigationController.h"
 #import "RNNTabBarController.h"
+#import "RNNTopBarOptions.h"
 
 const NSInteger BLUR_STATUS_TAG = 78264801;
 const NSInteger BLUR_TOPBAR_TAG = 78264802;
@@ -14,89 +15,116 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 
 -(instancetype)initWithDict:(NSDictionary *)navigationOptions {
 	self = [super init];
-	self.topBarBackgroundColor = [navigationOptions objectForKey:@"topBarBackgroundColor"];
 	self.statusBarHidden = [navigationOptions objectForKey:@"statusBarHidden"];
-	self.title = [navigationOptions objectForKey:@"title"];
-	self.topBarTextColor = [navigationOptions objectForKey:@"topBarTextColor"];
 	self.screenBackgroundColor = [navigationOptions objectForKey:@"screenBackgroundColor"];
-	self.topBarTextFontFamily = [navigationOptions objectForKey:@"topBarTextFontFamily"];
-	self.topBarHidden = [navigationOptions objectForKey:@"topBarHidden"];
-	self.topBarHideOnScroll = [navigationOptions objectForKey:@"topBarHideOnScroll"];
-	self.topBarButtonColor = [navigationOptions objectForKey:@"topBarButtonColor"];
-	self.topBarTranslucent = [navigationOptions objectForKey:@"topBarTranslucent"];
 	self.tabBadge = [navigationOptions objectForKey:@"tabBadge"];
-	self.topBarTextFontSize = [navigationOptions objectForKey:@"topBarTextFontSize"];
 	self.orientation = [navigationOptions objectForKey:@"orientation"];
 	self.leftButtons = [navigationOptions objectForKey:@"leftButtons"];
 	self.rightButtons = [navigationOptions objectForKey:@"rightButtons"];
-	self.topBarNoBorder = [navigationOptions objectForKey:@"topBarNoBorder"];
 	self.tabBarHidden = [navigationOptions objectForKey:@"tabBarHidden"];
-	self.topBarBlur = [navigationOptions objectForKey:@"topBarBlur"];
-	self.animateTopBarHide = [navigationOptions objectForKey:@"animateTopBarHide"];
-
+	self.topBar = [[RNNTopBarOptions alloc] initWithDict:[navigationOptions objectForKey:@"topBar"]];
+	
 	return self;
 }
 
 -(void)mergeWith:(NSDictionary *)otherOptions {
 	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
+		if ([key isEqualToString:@"topBar"]) {
+			[self.topBar mergeWith:[otherOptions objectForKey:@"topBar"]];
+		} else {
+			[self setValue:[otherOptions objectForKey:key] forKey:key];
+		}
 	}
 }
 
 -(void)applyOn:(UIViewController*)viewController {
-	if (self.topBarBackgroundColor) {
-		UIColor* backgroundColor = [RCTConvert UIColor:self.topBarBackgroundColor];
-		viewController.navigationController.navigationBar.barTintColor = backgroundColor;
-	} else {
-		viewController.navigationController.navigationBar.barTintColor = nil;
-	}
+	if (self.topBar) {
+		if(self.topBar.backgroundColor) {
+			UIColor* backgroundColor = [RCTConvert UIColor:self.topBar.backgroundColor];
+			viewController.navigationController.navigationBar.barTintColor = backgroundColor;
+		} else {
+			viewController.navigationController.navigationBar.barTintColor = nil;
+		}
+		
+		if (self.topBar.title) {
+			viewController.navigationItem.title = self.topBar.title;
+		}
+		
+		if (self.topBar.textFontFamily || self.topBar.textFontSize || self.topBar.textColor) {
+			NSMutableDictionary* navigationBarTitleTextAttributes = [NSMutableDictionary new];
+			if (self.topBar.textColor) {
+				navigationBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:[self.topBar valueForKey:@"textColor"]];
+			}
+			if (self.topBar.textFontFamily){
+				if(self.topBar.textFontSize) {
+					navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.topBar.textFontFamily size:[self.topBar.textFontSize floatValue]];
+				} else {
+					navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.topBar.textFontFamily size:20];
+				}
+			} else if (self.topBar.textFontSize) {
+				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:[self.topBar.textFontSize floatValue]];
+			}
+			viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
+		}
 
-	if (self.title) {
-		viewController.navigationItem.title = self.title;
-	}
 
-	if (self.topBarTextFontFamily || self.topBarTextColor || self.topBarTextFontSize){
-		NSMutableDictionary* navigationBarTitleTextAttributes = [NSMutableDictionary new];
-		if (self.topBarTextColor) {
-			navigationBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:self.topBarTextColor];
+		if (self.topBar.hidden){
+			[viewController.navigationController setNavigationBarHidden:[self.topBar.hidden boolValue] animated:[self.topBar.animateHide boolValue]];
+		}
+
+		if (self.topBar.hideOnScroll) {
+			viewController.navigationController.hidesBarsOnSwipe = [self.topBar.hideOnScroll boolValue];
+		}
+
+		if (self.topBar.buttonColor) {
+			UIColor* buttonColor = [RCTConvert UIColor:self.topBar.buttonColor];
+			viewController.navigationController.navigationBar.tintColor = buttonColor;
+		} else {
+			viewController.navigationController.navigationBar.tintColor = nil;
 		}
-		if (self.topBarTextFontFamily){
-			if(self.topBarTextFontSize) {
-				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.topBarTextFontFamily size:[self.topBarTextFontSize floatValue]];
+		
+		if ([self.topBar.blur boolValue]) {
+			if (![viewController.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]) {
+				
+				[viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+				viewController.navigationController.navigationBar.shadowImage = [UIImage new];
+				UIVisualEffectView *blur = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
+				CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
+				blur.frame = CGRectMake(0, -1 * statusBarFrame.size.height, viewController.navigationController.navigationBar.frame.size.width, viewController.navigationController.navigationBar.frame.size.height + statusBarFrame.size.height);
+				blur.userInteractionEnabled = NO;
+				blur.tag = BLUR_TOPBAR_TAG;
+				[viewController.navigationController.navigationBar insertSubview:blur atIndex:0];
+				[viewController.navigationController.navigationBar sendSubviewToBack:blur];
+			}
+		} else {
+			UIView *blur = [viewController.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG];
+			if (blur) {
+				[viewController.navigationController.navigationBar setBackgroundImage: nil forBarMetrics:UIBarMetricsDefault];
+				viewController.navigationController.navigationBar.shadowImage = nil;
+				[blur removeFromSuperview];
+			}
+		}
+		
+		if (self.topBar.translucent) {
+			viewController.navigationController.navigationBar.translucent = [self.topBar.translucent boolValue];
+		}
+		
+		if (self.topBar.noBorder) {
+			if ([self.topBar.noBorder boolValue]) {
+				viewController.navigationController.navigationBar
+				.shadowImage = [[UIImage alloc] init];
 			} else {
-				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.topBarTextFontFamily size:20];
+				viewController.navigationController.navigationBar
+				.shadowImage = nil;
 			}
-		} else if (self.topBarTextFontSize) {
-			navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:[self.topBarTextFontSize floatValue]];
 		}
-		viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
 	}
-
+	
 	if (self.screenBackgroundColor) {
 		UIColor* screenColor = [RCTConvert UIColor:self.screenBackgroundColor];
 		viewController.view.backgroundColor = screenColor;
 	}
-
-	if (self.topBarHidden){
-		[viewController.navigationController setNavigationBarHidden:[self.topBarHidden boolValue] animated:[self.animateTopBarHide boolValue]];
-	}
-
-	if (self.topBarHideOnScroll) {
-		BOOL topBarHideOnScrollBool = [self.topBarHideOnScroll boolValue];
-		if (topBarHideOnScrollBool) {
-			viewController.navigationController.hidesBarsOnSwipe = YES;
-		} else {
-			viewController.navigationController.hidesBarsOnSwipe = NO;
-		}
-	}
-
-	if (self.topBarButtonColor) {
-		UIColor* buttonColor = [RCTConvert UIColor:self.topBarButtonColor];
-		viewController.navigationController.navigationBar.tintColor = buttonColor;
-	} else {
-		viewController.navigationController.navigationBar.tintColor = nil;
-	}
-
+	
 	if (self.tabBadge) {
 		NSString *badge = [RCTConvert NSString:self.tabBadge];
 		if (viewController.navigationController) {
@@ -105,25 +133,7 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 			viewController.tabBarItem.badgeValue = badge;
 		}
 	}
-
-	if (self.topBarTranslucent) {
-		if ([self.topBarTranslucent boolValue]) {
-			viewController.navigationController.navigationBar.translucent = YES;
-		} else {
-			viewController.navigationController.navigationBar.translucent = NO;
-		}
-	}
-
-	if (self.topBarNoBorder) {
-		if ([self.topBarNoBorder boolValue]) {
-			viewController.navigationController.navigationBar
-			.shadowImage = [[UIImage alloc] init];
-		} else {
-			viewController.navigationController.navigationBar
-			.shadowImage = nil;
-		}
-	}
-
+	
 	if (self.statusBarBlur) {
 		UIView* curBlurView = [viewController.view viewWithTag:BLUR_STATUS_TAG];
 		if ([self.statusBarBlur boolValue]) {
@@ -139,30 +149,6 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 			}
 		}
 	}
-
-	if (self.topBarBlur && [self.topBarBlur boolValue]) {
-
-		if (![viewController.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]) {
-
-			[viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-			viewController.navigationController.navigationBar.shadowImage = [UIImage new];
-			UIVisualEffectView *blur = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
-			CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
-			blur.frame = CGRectMake(0, -1 * statusBarFrame.size.height, viewController.navigationController.navigationBar.frame.size.width, viewController.navigationController.navigationBar.frame.size.height + statusBarFrame.size.height);
-			blur.userInteractionEnabled = NO;
-			blur.tag = BLUR_TOPBAR_TAG;
-			[viewController.navigationController.navigationBar insertSubview:blur atIndex:0];
-			[viewController.navigationController.navigationBar sendSubviewToBack:blur];
-		}
-
-	} else {
-		UIView *blur = [viewController.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG];
-		if (blur) {
-			[viewController.navigationController.navigationBar setBackgroundImage: nil forBarMetrics:UIBarMetricsDefault];
-			viewController.navigationController.navigationBar.shadowImage = nil;
-			[blur removeFromSuperview];
-		}
-	}
 }
 
 - (UIInterfaceOrientationMask)supportedOrientations {
@@ -187,7 +173,7 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 			}
 		}
 	}
-
+	
 	return supportedOrientationsMask;
 }
 

lib/ios/RNNTopBarOptions.h

@@ -0,0 +1,25 @@
+#import <Foundation/Foundation.h>
+
+extern const NSInteger BLUR_STATUS_TAG;
+extern const NSInteger BLUR_TOPBAR_TAG;
+
+@interface RNNTopBarOptions : NSObject
+
+@property (nonatomic, strong) NSNumber* backgroundColor;
+@property (nonatomic, strong) NSNumber* textColor;
+@property (nonatomic, strong) NSString* title;
+@property (nonatomic, strong) NSString* textFontFamily;
+@property (nonatomic, strong) NSNumber* hidden;
+@property (nonatomic, strong) NSNumber* hideOnScroll;
+@property (nonatomic, strong) NSNumber* buttonColor;
+@property (nonatomic, strong) NSNumber* translucent;
+@property (nonatomic, strong) NSNumber* textFontSize;
+@property (nonatomic, strong) NSNumber* noBorder;
+@property (nonatomic, strong) NSNumber* blur;
+@property (nonatomic, strong) NSNumber* animateHide;
+
+-(instancetype)init;
+-(instancetype)initWithDict:(NSDictionary *)topBarOptions;
+-(void)mergeWith:(NSDictionary*)otherOptions;
+
+@end

lib/ios/RNNTopBarOptions.m

@@ -0,0 +1,35 @@
+#import "RNNTopBarOptions.h"
+
+@implementation RNNTopBarOptions
+
+-(instancetype)init {
+	return [self initWithDict:@{}];
+}
+
+-(instancetype)initWithDict:(NSDictionary *)topBarOptions {
+	self = [super init];
+	
+	self.title = [topBarOptions valueForKey:@"title"];
+	self.backgroundColor = [topBarOptions valueForKey:@"backgroundColor"];
+	self.textColor = [topBarOptions valueForKey:@"textColor"];
+	self.textFontFamily = [topBarOptions valueForKey:@"textFontFamily"];
+	self.textFontSize = [topBarOptions valueForKey:@"textFontSize"];
+	self.hidden = [topBarOptions valueForKey:@"hidden"];
+	self.hideOnScroll = [topBarOptions valueForKey:@"hideOnScroll"];
+	self.buttonColor = [topBarOptions valueForKey:@"buttonColor"];
+	self.blur = [topBarOptions valueForKey:@"blur"];
+	self.translucent = [topBarOptions valueForKey:@"translucent"];
+	self.noBorder = [topBarOptions valueForKey:@"noBorder"];
+	self.animateHide =[topBarOptions valueForKey:@"animateHide"];
+	
+	return self;
+}
+
+-(void)mergeWith:(NSDictionary *)otherOptions {
+	for (id key in otherOptions) {
+		[self setValue:[otherOptions objectForKey:key] forKey:key];
+	}
+}
+@end
+
+

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -97,6 +97,7 @@
 		7BEF0D191E437684003E96B0 /* RNNRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BEF0D171E437684003E96B0 /* RNNRootViewController.m */; };
 		7BEF0D1C1E43771B003E96B0 /* RNNLayoutNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BEF0D1A1E43771B003E96B0 /* RNNLayoutNode.h */; };
 		7BEF0D1D1E43771B003E96B0 /* RNNLayoutNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BEF0D1B1E43771B003E96B0 /* RNNLayoutNode.m */; };
+		A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */; };
 		E83BAD681F2734B500A9F3DD /* RNNNavigationOptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E83BAD671F2734B500A9F3DD /* RNNNavigationOptionsTest.m */; };
 		E83BAD6B1F27363A00A9F3DD /* RNNNavigationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = E83BAD6A1F27363A00A9F3DD /* RNNNavigationOptions.m */; };
 		E83BAD791F27416B00A9F3DD /* RNNRootViewControllerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E83BAD781F27416B00A9F3DD /* RNNRootViewControllerTest.m */; };
@@ -220,6 +221,8 @@
 		7BEF0D171E437684003E96B0 /* RNNRootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNRootViewController.m; sourceTree = "<group>"; };
 		7BEF0D1A1E43771B003E96B0 /* RNNLayoutNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNLayoutNode.h; sourceTree = "<group>"; };
 		7BEF0D1B1E43771B003E96B0 /* RNNLayoutNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNLayoutNode.m; sourceTree = "<group>"; };
+		A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTopBarOptions.m; sourceTree = "<group>"; };
+		A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopBarOptions.h; sourceTree = "<group>"; };
 		D8AFADBD1BEE6F3F00A4592D /* libReactNativeNavigation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactNativeNavigation.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		E83BAD671F2734B500A9F3DD /* RNNNavigationOptionsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationOptionsTest.m; sourceTree = "<group>"; };
 		E83BAD691F27362500A9F3DD /* RNNNavigationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationOptions.h; sourceTree = "<group>"; };
@@ -368,6 +371,8 @@
 				21B85E5C1F44480200B314B5 /* RNNNavigationButtons.m */,
 				214545261F4DC164006E8DA1 /* RNNUIBarButtonItem.h */,
 				214545241F4DC125006E8DA1 /* RNNUIBarButtonItem.m */,
+				A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */,
+				A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -610,6 +615,7 @@
 				261F0E6B1E6F028A00989DE2 /* RNNNavigationStackManager.m in Sources */,
 				263905BF1E4C6F440023D7D3 /* RCCTheSideBarManagerViewController.m in Sources */,
 				7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */,
+				A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */,
 				263905CB1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.m in Sources */,
 				263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */,
 				7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -61,7 +61,7 @@
 
 -(void)testDynamicStylesMergeWithStaticStyles {
 	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] init];
-	[initialOptions setTitle:@"the title"];
+	[initialOptions.topBar setTitle:@"the title"];
 	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithName:@"name"
 																withOptions:initialOptions
 															withContainerId:@"containerId"
@@ -74,7 +74,7 @@
 	[self.store setReadyToReceiveCommands:true];
 	[self.store setContainer:vc containerId:@"containerId"];
 	
-	NSDictionary* dictFromJs = @{@"topBarBackgroundColor" :@(0xFFFF0000)};
+	NSDictionary* dictFromJs = @{@"topBar": @{@"backgroundColor" :@(0xFFFF0000)}};
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	
 	[self.uut setOptions:@"containerId" options:dictFromJs];

lib/ios/ReactNativeNavigationTests/RNNNavigationOptionsTest.m

@@ -16,24 +16,24 @@
 	XCTAssertTrue([options isKindOfClass:[RNNNavigationOptions class]]);
 }
 -(void)testAddsStyleFromDictionaryWithInit{
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBarBackgroundColor" : @(0xff0000ff)}];
-	XCTAssertTrue(options.topBarBackgroundColor);
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBar": @{@"backgroundColor" : @(0xff0000ff)}}];
+	XCTAssertTrue(options.topBar.backgroundColor);
 }
 -(void)testReturnsNilWhenStyleDoesNotExist{
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBarBackgroundColor" : @(0xff0000ff)}];
-	XCTAssertNil(options.topBarTextColor);
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBar": @{@"someColor" : @(0xff0000ff)}}];
+	XCTAssertNil(options.topBar.backgroundColor);
 }
 
 -(void)testChangeRNNNavigationOptionsDynamically{
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBarBackgroundColor" : @(0xff0000ff)}];
-	NSDictionary* dynamicOptions = @{@"topBarTextColor" : @(0xffff00ff), @"title" : @"hello"};
-    [options mergeWith:dynamicOptions];
-	XCTAssertTrue([options.title isEqual:@"hello"]);	
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBar": @{@"backgroundColor" : @(0xff0000ff)}}];
+	NSDictionary* dynamicOptions = @{@"topBar": @{@"textColor" : @(0xffff00ff), @"title" : @"hello"}};
+	[options mergeWith:dynamicOptions];
+	XCTAssertTrue([options.topBar.title isEqual:@"hello"]);
 }
 
 -(void)testChangeRNNNavigationOptionsWithInvalidProperties{
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBarBackgroundColor" : @(0xff0000ff)}];
-	NSDictionary* dynamicOptions = @{@"titleeeee" : @"hello"};
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBar": @{@"backgroundColor" : @(0xff0000ff)}}];
+	NSDictionary* dynamicOptions = @{@"topBar": @{@"titleeeee" : @"hello"}};
 	XCTAssertThrows([options mergeWith:dynamicOptions]);
 }
 @end

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -32,7 +32,7 @@
 
 -(void)testTopBarBackgroundColor_validColor{
 	NSNumber* inputColor = @(0xFFFF0000);
-	self.options.topBarBackgroundColor = inputColor;
+	self.options.topBar.backgroundColor = inputColor;
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
@@ -42,7 +42,7 @@
 
 -(void)testTopBarBackgroundColorWithoutNavigationController{
 	NSNumber* inputColor = @(0xFFFF0000);
-	self.options.topBarBackgroundColor = inputColor;
+	self.options.topBar.backgroundColor = inputColor;
 	
 	XCTAssertNoThrow([self.uut viewWillAppear:false]);
 }
@@ -64,7 +64,7 @@
 
 - (void)testStatusBarHideWithTopBar_false {
 	self.options.statusBarHideWithTopBar = @(0);
-	self.options.topBarHidden = @(1);
+	self.options.topBar.hidden = @(1);
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	
@@ -73,7 +73,7 @@
 
 - (void)testStatusBarHideWithTopBar_true {
 	self.options.statusBarHideWithTopBar = @(1);
-	self.options.topBarHidden = @(1);
+	self.options.topBar.hidden = @(1);
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 
@@ -91,7 +91,7 @@
 
 -(void)testTitle_string{
 	NSString* title =@"some title";
-	self.options.title= title;
+	self.options.topBar.title = title;
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	
 	[self.uut viewWillAppear:false];
@@ -107,7 +107,7 @@
 
 -(void)testTopBarTextColor_validColor{
 	NSNumber* inputColor = @(0xFFFF0000);
-	self.options.topBarTextColor = inputColor;
+	self.options.topBar.textColor = inputColor;
 	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
@@ -125,7 +125,7 @@
 -(void)testTopBarTextFontFamily_validFont{
 	NSString* inputFont = @"HelveticaNeue";
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
-	self.options.topBarTextFontFamily = inputFont;
+	self.options.topBar.textFontFamily = inputFont;
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:20];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -134,7 +134,7 @@
 -(void)testTopBarHideOnScroll_true {
 	NSNumber* hideOnScrollInput = @(1);
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
-	self.options.topBarHideOnScroll = hideOnScrollInput;
+	self.options.topBar.hideOnScroll = hideOnScrollInput;
 	[self.uut viewWillAppear:false];
 	XCTAssertTrue(self.uut.navigationController.hidesBarsOnSwipe);
 }
@@ -142,7 +142,7 @@
 -(void)testTopBarButtonColor {
 	NSNumber* inputColor = @(0xFFFF0000);
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
-	self.options.topBarButtonColor = inputColor;
+	self.options.topBar.buttonColor = inputColor;
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.tintColor isEqual:expectedColor]);
@@ -150,7 +150,7 @@
 
 -(void)testTopBarTranslucent {
 	NSNumber* topBarTranslucentInput = @(0);
-	self.options.topBarTranslucent = topBarTranslucentInput;
+	self.options.topBar.translucent = topBarTranslucentInput;
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	XCTAssertFalse(self.uut.navigationController.navigationBar.translucent);
@@ -173,7 +173,7 @@
 
 -(void)testTopBarTextFontSize_withoutTextFontFamily_withoutTextColor {
 	NSNumber* topBarTextFontSizeInput = @(15);
-	self.options.topBarTextFontSize = topBarTextFontSizeInput;
+	self.options.topBar.textFontSize = topBarTextFontSizeInput;
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
@@ -183,8 +183,8 @@
 -(void)testTopBarTextFontSize_withoutTextFontFamily_withTextColor {
 	NSNumber* topBarTextFontSizeInput = @(15);
 	NSNumber* inputColor = @(0xFFFF0000);
-	self.options.topBarTextFontSize = topBarTextFontSizeInput;
-	self.options.topBarTextColor = inputColor;
+	self.options.topBar.textFontSize = topBarTextFontSizeInput;
+	self.options.topBar.textColor = inputColor;
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
@@ -197,9 +197,9 @@
 	NSNumber* topBarTextFontSizeInput = @(15);
 	NSNumber* inputColor = @(0xFFFF0000);
 	NSString* inputFont = @"HelveticaNeue";
-	self.options.topBarTextFontSize = topBarTextFontSizeInput;
-	self.options.topBarTextColor = inputColor;
-	self.options.topBarTextFontFamily = inputFont;
+	self.options.topBar.textFontSize = topBarTextFontSizeInput;
+	self.options.topBar.textColor = inputColor;
+	self.options.topBar.textFontFamily = inputFont;
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
@@ -211,8 +211,8 @@
 -(void)testTopBarTextFontSize_withTextFontFamily_withoutTextColor {
 	NSNumber* topBarTextFontSizeInput = @(15);
 	NSString* inputFont = @"HelveticaNeue";
-	self.options.topBarTextFontSize = topBarTextFontSizeInput;
-	self.options.topBarTextFontFamily = inputFont;
+	self.options.topBar.textFontSize = topBarTextFontSizeInput;
+	self.options.topBar.textFontFamily = inputFont;
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
@@ -223,7 +223,7 @@
 -(void)testTopBarTextFontFamily_invalidFont{
 	NSString* inputFont = @"HelveticaNeueeeee";
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
-	self.options.topBarTextFontFamily = inputFont;
+	self.options.topBar.textFontFamily = inputFont;
 	//	XCTAssertThrows([self.uut viewWillAppear:false]);
 }
 
@@ -378,7 +378,7 @@
 
 -(void)testTopBarNoBorderOn {
 	NSNumber* topBarNoBorderInput = @(1);
-	self.options.topBarNoBorder = topBarNoBorderInput;
+	self.options.topBar.noBorder = topBarNoBorderInput;
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil(self.uut.navigationController.navigationBar.shadowImage);
@@ -386,7 +386,7 @@
 
 -(void)testTopBarNoBorderOff {
 	NSNumber* topBarNoBorderInput = @(0);
-	self.options.topBarNoBorder = topBarNoBorderInput;
+	self.options.topBar.noBorder = topBarNoBorderInput;
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil(self.uut.navigationController.navigationBar.shadowImage);
@@ -441,7 +441,7 @@
 
 -(void)testTopBarBlur_false {
 	NSNumber* topBarBlurInput = @(0);
-	self.options.topBarBlur = topBarBlurInput;
+	self.options.topBar.blur = topBarBlurInput;
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
@@ -449,7 +449,7 @@
 
 -(void)testTopBarBlur_true {
 	NSNumber* topBarBlurInput = @(1);
-	self.options.topBarBlur = topBarBlurInput;
+	self.options.topBar.blur = topBarBlurInput;
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);

playground/src/containers/OptionsScreen.js

@@ -13,10 +13,12 @@ class OptionsScreen extends Component {
 
   static get navigationOptions() {
     return {
-      title: 'Static Title',
-      topBarTextColor: 'black',
-      topBarTextFontSize: 16,
-      topBarTextFontFamily: 'HelveticaNeue-Italic',
+      topBar: {
+        title: 'Static Title',
+        textColor: 'black',
+        textFontSize: 16,
+        textFontFamily: 'HelveticaNeue-Italic'
+      },
       rightButtons: [{
         id: BUTTON_ONE,
         testID: BUTTON_ONE,
@@ -85,11 +87,13 @@ class OptionsScreen extends Component {
 
   onClickDynamicOptions() {
     Navigation.setOptions(this.props.containerId, {
-      title: 'Dynamic Title',
-      topBarTextColor: '#00FFFF',
-      topBarButtonColor: 'red',
-      topBarTextFontSize: 20,
-      topBarTextFontFamily: 'HelveticaNeue-CondensedBold'
+      topBar: {
+        title: 'Dynamic Title',
+        textColor: '#00FFFF',
+        buttonColor: 'red',
+        textFontSize: 20,
+        textFontFamily: 'HelveticaNeue-CondensedBold'
+      }
     });
   }
 
@@ -101,15 +105,19 @@ class OptionsScreen extends Component {
 
   onClickShowTopBar() {
     Navigation.setOptions(this.props.containerId, {
-      topBarHidden: false,
-      animateTopBarHide: true
+      topBar: {
+        hidden: false,
+        animateHide: true
+      }
     });
   }
 
   onClickHideTopBar() {
     Navigation.setOptions(this.props.containerId, {
-      topBarHidden: true,
-      animateTopBarHide: true
+      topBar: {
+        hidden: true,
+        animateHide: true
+      }
     });
   }
 

playground/src/containers/ScrollViewScreen.js

@@ -8,7 +8,9 @@ const Navigation = require('react-native-navigation');
 class ScrollViewScreen extends Component {
   static get navigationOptions() {
     return {
-      topBarTranslucent: false
+      topBar: {
+        translucent: false
+      }
     };
   }
 
@@ -32,7 +34,9 @@ class ScrollViewScreen extends Component {
 
   onClickToggleTopBarHideOnScroll() {
     Navigation.setOptions(this.props.containerId, {
-      topBarHideOnScroll: !this.state.topBarHideOnScroll
+      topBar: {
+        hideOnScroll: !this.state.topBarHideOnScroll
+      }
     });
   }
 }

playground/src/containers/TextScreen.js

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