refactored navigation options (#2474)

* refactored navigation options

* test fix

* better namings

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

@@ -37,8 +37,6 @@ public class NavigationOptions implements DEFAULT_VALUES {
 		result.topTabsOptions = TopTabsOptions.parse(json.optJSONObject("topTabs"));
         result.topTabOptions = TopTabOptions.parse(typefaceManager, json.optJSONObject("topTab"));
 		result.bottomTabsOptions = BottomTabsOptions.parse(json.optJSONObject("bottomTabs"));
-		result.rightButtons = Button.parseJsonArray(json.optJSONArray("rightButtons"));
-        result.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"));
 
 		return result.withDefaultOptions(defaultOptions);
 	}
@@ -47,21 +45,11 @@ public class NavigationOptions implements DEFAULT_VALUES {
     @NonNull public TopTabsOptions topTabsOptions = new TopTabsOptions();
     @NonNull public TopTabOptions topTabOptions = new TopTabOptions();
     @NonNull public BottomTabsOptions bottomTabsOptions = new BottomTabsOptions();
-    public ArrayList<Button> leftButtons;
-    public ArrayList<Button> rightButtons;
 
 	public void mergeWith(final NavigationOptions other) {
         topBarOptions.mergeWith(other.topBarOptions);
         topTabsOptions.mergeWith(other.topTabsOptions);
         bottomTabsOptions.mergeWith(other.bottomTabsOptions);
-
-        if(other.leftButtons != null) {
-            leftButtons = other.leftButtons;
-        }
-
-        if(other.rightButtons != null) {
-            rightButtons = other.rightButtons;
-        }
     }
 
     NavigationOptions withDefaultOptions(final NavigationOptions other) {

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

@@ -9,6 +9,8 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+
 public class TopBarOptions implements DEFAULT_VALUES {
 
 	public static TopBarOptions parse(TypefaceLoader typefaceManager, JSONObject json) {
@@ -22,6 +24,8 @@ public class TopBarOptions implements DEFAULT_VALUES {
 		options.textFontFamily = typefaceManager.getTypeFace(json.optString("textFontFamily", NO_VALUE));
 		options.hidden = NavigationOptions.BooleanOptions.parse(json.optString("hidden"));
 		options.animateHide = NavigationOptions.BooleanOptions.parse(json.optString("animateHide"));
+		options.rightButtons = Button.parseJsonArray(json.optJSONArray("rightButtons"));
+		options.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"));
 
 		return options;
 	}
@@ -33,6 +37,8 @@ public class TopBarOptions implements DEFAULT_VALUES {
 	@Nullable public Typeface textFontFamily;
 	public NavigationOptions.BooleanOptions hidden = NavigationOptions.BooleanOptions.False;
 	public NavigationOptions.BooleanOptions animateHide = NavigationOptions.BooleanOptions.False;
+	public ArrayList<Button> leftButtons;
+	public ArrayList<Button> rightButtons;
 
 	void mergeWith(final TopBarOptions other) {
 		if (!NO_VALUE.equals(other.title)) title = other.title;
@@ -48,6 +54,10 @@ public class TopBarOptions implements DEFAULT_VALUES {
 			hidden = other.hidden;
 		if (other.animateHide != NavigationOptions.BooleanOptions.NoValue)
 			animateHide = other.animateHide;
+		if(other.leftButtons != null)
+			leftButtons = other.leftButtons;
+		if(other.rightButtons != null)
+			rightButtons = other.rightButtons;
 	}
 
     void mergeWithDefault(TopBarOptions defaultOptions) {
@@ -65,5 +75,9 @@ public class TopBarOptions implements DEFAULT_VALUES {
             hidden = defaultOptions.hidden;
         if (animateHide == NavigationOptions.BooleanOptions.NoValue)
             animateHide = defaultOptions.animateHide;
+		if(leftButtons == null)
+			leftButtons = defaultOptions.leftButtons;
+		if(rightButtons == null)
+			rightButtons = defaultOptions.rightButtons;
     }
 }

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

@@ -26,7 +26,7 @@ public class OptionsPresenter {
 
     public void applyOptions(NavigationOptions options) {
         applyTopBarOptions(options.topBarOptions);
-        applyButtons(options.leftButtons, options.rightButtons);
+        applyButtons(options.topBarOptions.leftButtons, options.topBarOptions.rightButtons);
         applyTopTabsOptions(options.topTabsOptions);
         applyTopTabOptions(options.topTabOptions);
     }

lib/ios/RNNTabItemOptions.h → lib/ios/RNNBottomTabOptions.h

@@ -1,6 +1,6 @@
-#import <Foundation/Foundation.h>
+#import "RNNOptions.h"
 
-@interface RNNTabItemOptions : NSObject
+@interface RNNBottomTabOptions : RNNOptions
 
 @property (nonatomic) NSUInteger tag;
 @property (nonatomic, strong) NSString* title;
@@ -9,10 +9,4 @@
 @property (nonatomic, strong) NSNumber* visible;
 @property (nonatomic, strong) NSDictionary* icon;
 
--(instancetype)initWithDict:(NSDictionary*)tabItemDict;
-
--(void)mergeWith:(NSDictionary *)otherOptions;
-
--(void)resetOptions;
-
 @end

lib/ios/RNNBottomTabOptions.m

@@ -0,0 +1,51 @@
+#import "RNNBottomTabOptions.h"
+
+@implementation RNNBottomTabOptions
+
+-(instancetype)initWithDict:(NSDictionary *)tabItemDict {
+	self = [super init];
+	
+	[self mergeWith:tabItemDict];
+	self.tag = [tabItemDict[@"tag"] integerValue];
+	
+	return self;
+}
+
+- (void)applyOn:(UIViewController *)viewController {
+	if (self.title || self.icon) {
+		UITabBarItem* tabItem = [[UITabBarItem alloc] initWithTitle:self.title image:[RCTConvert UIImage:self.icon] tag:self.tag];
+		tabItem.accessibilityIdentifier = self.testID;
+		[viewController.navigationController setTabBarItem:tabItem];
+	}
+	
+	if (self.badge) {
+		NSString *badge = [RCTConvert NSString:self.badge];
+		if (viewController.navigationController) {
+			viewController.navigationController.tabBarItem.badgeValue = badge;
+		} else {
+			viewController.tabBarItem.badgeValue = badge;
+		}
+	}
+	
+	if (self.visible) {
+		[viewController.tabBarController setSelectedIndex:[viewController.tabBarController.viewControllers indexOfObject:viewController]];
+	}
+	
+	[self resetOptions];
+}
+
+-(void)mergeWith:(NSDictionary *)otherOptions {
+	for (id key in otherOptions) {
+		[self setValue:[otherOptions objectForKey:key] forKey:key];
+	}
+}
+
+-(void)resetOptions {
+	self.title = nil;
+	self.badge = nil;
+	self.visible = nil;
+	self.icon = nil;
+	self.testID = nil;
+}
+
+@end

lib/ios/RNNTabBarOptions.h → lib/ios/RNNBottomTabsOptions.h

@@ -1,8 +1,6 @@
-#import <Foundation/Foundation.h>
+#import "RNNOptions.h"
 
-extern const NSInteger BLUR_TOPBAR_TAG;
-
-@interface RNNTabBarOptions : NSObject
+@interface RNNBottomTabsOptions : RNNOptions
 
 @property (nonatomic, strong) NSNumber* hidden;
 @property (nonatomic, strong) NSNumber* animateHide;
@@ -11,9 +9,4 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 @property (nonatomic, strong) NSNumber* drawUnder;
 @property (nonatomic, strong) NSString* currentTabId;
 
--(instancetype)init;
--(instancetype)initWithDict:(NSDictionary *)topBarOptions;
--(void)mergeWith:(NSDictionary*)otherOptions;
-- (void)resetOptions;
-
 @end

lib/ios/RNNBottomTabsOptions.m

@@ -0,0 +1,45 @@
+#import "RNNBottomTabsOptions.h"
+#import "RNNTabBarController.h"
+extern const NSInteger BLUR_TOPBAR_TAG;
+
+@implementation RNNBottomTabsOptions
+
+- (void)applyOn:(UIViewController *)viewController {
+	if (self.currentTabIndex) {
+		[viewController.tabBarController setSelectedIndex:[self.currentTabIndex unsignedIntegerValue]];
+	}
+	
+	if (self.currentTabId) {
+		[(RNNTabBarController*)viewController.tabBarController setSelectedIndexByContainerID:self.currentTabId];
+	}
+	
+	if (self.hidden) {
+		[((RNNTabBarController *)viewController.tabBarController) setTabBarHidden:[self.hidden boolValue] animated:[self.animateHide boolValue]];
+	}
+	
+	if (self.testID) {
+		viewController.tabBarController.tabBar.accessibilityIdentifier = self.testID;
+	}
+	
+	if (self.drawUnder) {
+		if ([self.drawUnder boolValue]) {
+			viewController.edgesForExtendedLayout |= UIRectEdgeBottom;
+		} else {
+			viewController.edgesForExtendedLayout &= ~UIRectEdgeBottom;
+		}
+	}
+	
+	[self resetOptions];
+}
+
+- (void)resetOptions {
+	self.currentTabId = nil;
+	self.currentTabIndex = nil;
+}
+
+-(void)mergeWith:(NSDictionary *)otherOptions {
+	for (id key in otherOptions) {
+		[self setValue:[otherOptions objectForKey:key] forKey:key];
+	}
+}
+@end

lib/ios/RNNCommandsHandler.m

@@ -46,7 +46,6 @@
 		[CATransaction setCompletionBlock:completion];
 		
 		[rootVc.navigationOptions applyOn:vc];
-		[rootVc applyNavigationButtons];
 		
 		[CATransaction commit];
 	}

lib/ios/RNNNavigationButtons.h

@@ -4,7 +4,6 @@
 
 @interface RNNNavigationButtons : NSObject
 
--(instancetype)init;
 -(instancetype)initWithViewController:(RNNRootViewController*)viewController;
 
 -(void)applyLeftButtons:(NSArray*)leftButtons rightButtons:(NSArray*)rightButtons;

lib/ios/RNNNavigationButtons.m

@@ -4,16 +4,15 @@
 #import "RCTHelpers.h"
 
 @interface RNNNavigationButtons()
+
 @property (weak, nonatomic) RNNRootViewController* viewController;
+@property (strong, nonatomic) NSArray* rightButtons;
+@property (strong, nonatomic) NSArray* leftButtons;
 
 @end
 
 @implementation RNNNavigationButtons
 
--(instancetype)init {
-	return [super init];
-}
-
 -(instancetype)initWithViewController:(RNNRootViewController*)viewController {
 	self = [super init];
 	
@@ -23,11 +22,11 @@
 }
 
 -(void)applyLeftButtons:(NSArray*)leftButtons rightButtons:(NSArray*)rightButtons {
-	if(leftButtons) {
+	if (leftButtons) {
 		[self setButtons:leftButtons side:@"left" animated:NO];
 	}
 	
-	if(rightButtons) {
+	if (rightButtons) {
 		[self setButtons:rightButtons side:@"right" animated:NO];
 	}
 }
@@ -41,14 +40,14 @@
 		}
 	}
 	
-	if ([side isEqualToString:@"left"])
-	{
-		[self.viewController.navigationItem setLeftBarButtonItems:barButtonItems animated:animated];
+	if ([side isEqualToString:@"left"]) {
+		self.leftButtons = barButtonItems;
+		[self.viewController.navigationItem setLeftBarButtonItems:self.leftButtons animated:animated];
 	}
 	
-	if ([side isEqualToString:@"right"])
-	{
-		[self.viewController.navigationItem setRightBarButtonItems:barButtonItems animated:animated];
+	if ([side isEqualToString:@"right"]) {
+		self.rightButtons = barButtonItems;
+		[self.viewController.navigationItem setRightBarButtonItems:self.rightButtons animated:animated];
 	}
 }
 
@@ -56,7 +55,7 @@
 	NSString* buttonId = dictionary[@"id"];
 	NSString* title = dictionary[@"title"];
 	
-	if(!buttonId){
+	if (!buttonId) {
 		@throw [NSException exceptionWithName:@"NSInvalidArgumentException" reason:[@"button id is not specified " stringByAppendingString:title] userInfo:nil];
 	}
 	
@@ -104,8 +103,8 @@
 	return barButtonItem;
 }
 
--(void)onButtonPress:(RNNUIBarButtonItem*)barButtonItem
-{
+-(void)onButtonPress:(RNNUIBarButtonItem*)barButtonItem {
 	[self.viewController.eventEmitter sendOnNavigationButtonPressed:self.viewController.containerId buttonId:barButtonItem.buttonId];
 }
+
 @end

lib/ios/RNNNavigationController.m

@@ -7,7 +7,7 @@
 	return self.viewControllers.lastObject.supportedInterfaceOrientations;
 }
 
-- (BOOL)isAnimated {
+- (BOOL)isCustomTransitioned {
 	return NO;
 }
 

lib/ios/RNNNavigationOptions.h

@@ -1,46 +1,37 @@
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 #import "RNNTopBarOptions.h"
-#import "RNNTabBarOptions.h"
+#import "RNNBottomTabsOptions.h"
+#import "RNNBottomTabOptions.h"
 #import "RNNSideMenuOptions.h"
-#import "RNNTabItemOptions.h"
 #import "RNNTopTabOptions.h"
+#import "RNNTopTabsOptions.h"
 
 extern const NSInteger BLUR_STATUS_TAG;
 extern const NSInteger BLUR_TOPBAR_TAG;
 extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 
-@interface RNNNavigationOptions : NSObject
+@interface RNNNavigationOptions : RNNOptions
+
+@property (nonatomic, strong) RNNTopBarOptions* topBar;
+@property (nonatomic, strong) RNNBottomTabsOptions* bottomTabs;
+@property (nonatomic, strong) RNNBottomTabOptions* bottomTab;
+@property (nonatomic, strong) RNNTopTabsOptions* topTabs;
+@property (nonatomic, strong) RNNTopTabOptions* topTab;
+@property (nonatomic, strong) RNNSideMenuOptions* sideMenu;
 
 @property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;
 @property (nonatomic, strong) NSString* backButtonTransition;
 @property (nonatomic, strong) id orientation;
-@property (nonatomic, strong) NSArray* leftButtons;
-@property (nonatomic, strong) NSArray* rightButtons;
 @property (nonatomic, strong) NSNumber* statusBarBlur;
 @property (nonatomic, strong) NSNumber* statusBarHideWithTopBar;
 @property (nonatomic, strong) NSNumber* popGesture;
-@property (nonatomic, strong) RNNTopBarOptions* topBar;
-@property (nonatomic, strong) RNNTabBarOptions* bottomTabs;
-@property (nonatomic, strong) RNNTopTabOptions* topTab;
-@property (nonatomic, strong) RNNSideMenuOptions* sideMenu;
 @property (nonatomic, strong) UIImage* backgroundImage;
 @property (nonatomic, strong) UIImage* rootBackgroundImage;
-@property (nonatomic, strong) RNNTabItemOptions* tabItem;
 
 
 - (UIInterfaceOrientationMask)supportedOrientations;
 
--(instancetype)init;
--(instancetype)initWithDict:(NSDictionary *)navigationOptions;
-
--(void)applyOn:(UIViewController*)viewController;
--(void)mergeWith:(NSDictionary*)otherOptions;
--(void)storeOriginalTopBarImages:(UIViewController*)viewController;
-
-- (void)applyTabBarItemOptions:(UIViewController*)viewController;
-- (void)applyTopTab:(UIViewController*)viewController;
 
 @end

lib/ios/RNNNavigationOptions.m

@@ -5,6 +5,7 @@
 #import "RNNTopBarOptions.h"
 #import "RNNSideMenuController.h"
 #import "RNNRootViewController.h"
+#import "RNNNavigationButtons.h"
 
 const NSInteger BLUR_STATUS_TAG = 78264801;
 const NSInteger BLUR_TOPBAR_TAG = 78264802;
@@ -12,8 +13,6 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 
 @implementation RNNNavigationOptions
 
-
-
 -(instancetype)init {
 	return [self initWithDict:@{}];
 }
@@ -24,31 +23,22 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	self.screenBackgroundColor = [navigationOptions objectForKey:@"screenBackgroundColor"];
 	self.backButtonTransition = [navigationOptions objectForKey:@"backButtonTransition"];
 	self.orientation = [navigationOptions objectForKey:@"orientation"];
-	self.leftButtons = [navigationOptions objectForKey:@"leftButtons"];
-	self.rightButtons = [navigationOptions objectForKey:@"rightButtons"];
 	self.topBar = [[RNNTopBarOptions alloc] initWithDict:[navigationOptions objectForKey:@"topBar"]];
 	self.topTab = [[RNNTopTabOptions alloc] initWithDict:[navigationOptions objectForKey:@"topTab"]];
-	self.bottomTabs = [[RNNTabBarOptions alloc] initWithDict:[navigationOptions objectForKey:@"bottomTabs"]];
+	self.bottomTabs = [[RNNBottomTabsOptions alloc] initWithDict:[navigationOptions objectForKey:@"bottomTabs"]];
 	self.sideMenu = [[RNNSideMenuOptions alloc] initWithDict:[navigationOptions objectForKey:@"sideMenu"]];
 	self.backgroundImage = [RCTConvert UIImage:[navigationOptions objectForKey:@"backgroundImage"]];
 	self.rootBackgroundImage = [RCTConvert UIImage:[navigationOptions objectForKey:@"rootBackgroundImage"]];
-	self.tabItem = [[RNNTabItemOptions alloc] initWithDict:[navigationOptions objectForKey:@"bottomTab"]];
+	self.bottomTab = [[RNNBottomTabOptions alloc] initWithDict:[navigationOptions objectForKey:@"bottomTab"]];
     
 	return self;
 }
 
 -(void)mergeWith:(NSDictionary *)otherOptions {
 	for (id key in otherOptions) {
-		if ([key isEqualToString:@"topBar"]) {
-			[self.topBar mergeWith:[otherOptions objectForKey:key]];
-		} else if ([key isEqualToString:@"bottomTabs"]) {
-			[self.bottomTabs mergeWith:[otherOptions objectForKey:key]];
-		} else if ([key isEqualToString:@"topTab"]) {
-			[self.topTab mergeWith:[otherOptions objectForKey:key]];
-		} else if ([key isEqualToString:@"sideMenu"]) {
-			[self.sideMenu mergeWith:[otherOptions objectForKey:@"sideMenu"]];
-		} else if ([key isEqualToString:@"bottomTab"]) {
-			[self.tabItem mergeWith:[otherOptions objectForKey:key]];
+		if ([[self valueForKey:key] isKindOfClass:[RNNOptions class]]) {
+			RNNOptions* options = [self valueForKey:key];
+			[options mergeWith:[otherOptions objectForKey:key]];
 		} else {
 			[self setValue:[otherOptions objectForKey:key] forKey:key];
 		}
@@ -56,145 +46,11 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 }
 
 -(void)applyOn:(UIViewController*)viewController {
-	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 (@available(iOS 11.0, *)) {
-			if (self.topBar.largeTitle){
-				if ([self.topBar.largeTitle boolValue]) {
-					viewController.navigationController.navigationBar.prefersLargeTitles = YES;
-					viewController.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeAlways;
-				} else {
-					viewController.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
-				}
-			} else {
-				viewController.navigationController.navigationBar.prefersLargeTitles = NO;
-				viewController.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
-			}
-		}
-		
-		
-		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 (@available(iOS 11.0, *)){
-				viewController.navigationController.navigationBar.largeTitleTextAttributes = navigationBarTitleTextAttributes;
-			}
-			
-		}
-		
-		
-		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.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];
-			}
-		}
-		
-		void (^disableTopBarTransparent)() = ^void(){
-			UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
-			if (transparentView){
-				[transparentView removeFromSuperview];
-				[viewController.navigationController.navigationBar setBackgroundImage:self.originalTopBarImages[@"backgroundImage"] forBarMetrics:UIBarMetricsDefault];
-				viewController.navigationController.navigationBar.shadowImage = self.originalTopBarImages[@"shadowImage"];
-				self.originalTopBarImages = nil;
-			}
-		};
-	
-		if (self.topBar.transparent) {
-			if ([self.topBar.transparent boolValue]) {
-				if (![viewController.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG]){
-					[self storeOriginalTopBarImages:viewController];
-					[viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-					viewController.navigationController.navigationBar.shadowImage = [UIImage new];
-					UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
-					transparentView.tag = TOP_BAR_TRANSPARENT_TAG;
-					[viewController.navigationController.navigationBar insertSubview:transparentView atIndex:0];
-				}
-			} else {
-				disableTopBarTransparent();
-			}
-		} else {
-			disableTopBarTransparent();
-		}
-
-		if (self.topBar.translucent) {
-			viewController.navigationController.navigationBar.translucent = [self.topBar.translucent boolValue];
-		}
-
-		if (self.topBar.drawUnder) {
-			if ([self.topBar.drawUnder boolValue]) {
-				viewController.edgesForExtendedLayout |= UIRectEdgeTop;
-			} else {
-				viewController.edgesForExtendedLayout &= ~UIRectEdgeTop;
-			}
-		}
-		
-		if (self.topBar.noBorder) {
-			if ([self.topBar.noBorder boolValue]) {
-				viewController.navigationController.navigationBar
-				.shadowImage = [[UIImage alloc] init];
-			} else {
-				viewController.navigationController.navigationBar
-				.shadowImage = nil;
-			}
-		}
-		
-		if (self.topBar.testID) {
-			viewController.navigationController.navigationBar.accessibilityIdentifier = self.topBar.testID;
-		}
-	}
+	[self.topBar applyOn:viewController];
+	[self.bottomTabs applyOn:viewController];
+	[self.topTab applyOn:viewController];
+	[self.bottomTab applyOn:viewController];
+	[self.sideMenu applyOn:viewController];
 	
 	if (self.popGesture) {
 		viewController.navigationController.interactivePopGestureRecognizer.enabled = [self.popGesture boolValue];
@@ -205,34 +61,6 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		viewController.view.backgroundColor = screenColor;
 	}
 	
-	if (self.bottomTabs) {
-		if (self.bottomTabs.currentTabIndex) {
-			[viewController.tabBarController setSelectedIndex:[self.bottomTabs.currentTabIndex unsignedIntegerValue]];
-		}
-		
-		if (self.bottomTabs.currentTabId) {
-			[(RNNTabBarController*)viewController.tabBarController setSelectedIndexByContainerID:self.bottomTabs.currentTabId];
-		}
-		
-		if (self.bottomTabs.hidden) {
-			[((RNNTabBarController *)viewController.tabBarController) setTabBarHidden:[self.bottomTabs.hidden boolValue] animated:[self.bottomTabs.animateHide boolValue]];
-		}
-		
-		if (self.bottomTabs.testID) {
-			viewController.tabBarController.tabBar.accessibilityIdentifier = self.bottomTabs.testID;
-		}
-		
-		if (self.bottomTabs.drawUnder) {
-			if ([self.bottomTabs.drawUnder boolValue]) {
-				viewController.edgesForExtendedLayout |= UIRectEdgeBottom;
-			} else {
-				viewController.edgesForExtendedLayout &= ~UIRectEdgeBottom;
-			}
-		}
-		
-		[self.bottomTabs resetOptions];
-	}
-	
 	if (self.statusBarBlur) {
 		UIView* curBlurView = [viewController.view viewWithTag:BLUR_STATUS_TAG];
 		if ([self.statusBarBlur boolValue]) {
@@ -249,27 +77,6 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		}
 	}
 	
-	RNNSideMenuController* sideMenuController = (RNNSideMenuController*)UIApplication.sharedApplication.delegate.window.rootViewController;
-	if ([sideMenuController isKindOfClass:[RNNSideMenuController class]]) {
-		if (self.sideMenu.leftSideVisible) {
-			if (self.sideMenu.leftSideVisible.boolValue) {
-				[sideMenuController showSideMenu:MMDrawerSideLeft animated:YES];
-			} else {
-				[sideMenuController hideSideMenu:MMDrawerSideLeft animated:YES];
-			}
-		}
-		
-		if (self.sideMenu.rightSideVisible) {
-			if (self.sideMenu.rightSideVisible.boolValue) {
-				[sideMenuController showSideMenu:MMDrawerSideRight animated:YES];
-			} else {
-				[sideMenuController hideSideMenu:MMDrawerSideRight animated:YES];
-			}
-		}
-		
-		[self.sideMenu resetOptions];
-	}
-	
 	if (self.backgroundImage) {
 		UIImageView* backgroundImageView = (viewController.view.subviews.count > 0) ? viewController.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
@@ -293,42 +100,6 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		backgroundImageView.image = self.rootBackgroundImage;
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
-	
-	[self applyTabBarItemOptions:viewController];
-	[self applyTopTab:viewController];
-}
-
-- (void)applyTopTab:(RNNRootViewController*)viewController {
-	if (self.topTab) {
-		if (self.topTab.title) {
-			[viewController.topTabsViewController viewController:viewController changedTitle:self.topTab.title];
-		}
-	}
-}
-
-- (void)applyTabBarItemOptions:(UIViewController*)viewController {
-	if (self.tabItem) {
-		if (self.tabItem.title || self.tabItem.icon) {
-			UITabBarItem* tabItem = [[UITabBarItem alloc] initWithTitle:self.tabItem.title image:[RCTConvert UIImage:self.tabItem.icon] tag:self.tabItem.tag];
-			tabItem.accessibilityIdentifier = self.tabItem.testID;
-			[viewController.navigationController setTabBarItem:tabItem];
-		}
-		
-		if (self.tabItem.badge) {
-			NSString *badge = [RCTConvert NSString:self.tabItem.badge];
-			if (viewController.navigationController) {
-				viewController.navigationController.tabBarItem.badgeValue = badge;
-			} else {
-				viewController.tabBarItem.badgeValue = badge;
-			}
-		}
-		
-		if (self.tabItem.visible) {
-			[viewController.tabBarController setSelectedIndex:[viewController.tabBarController.viewControllers indexOfObject:viewController]];
-		}
-		
-		[self.tabItem resetOptions];
-	}
 }
 
 - (UIInterfaceOrientationMask)supportedOrientations {
@@ -357,18 +128,4 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	return supportedOrientationsMask;
 }
 
--(void)storeOriginalTopBarImages:(UIViewController*)viewController {
-	NSMutableDictionary *originalTopBarImages = [@{} mutableCopy];
-	UIImage *bgImage = [viewController.navigationController.navigationBar backgroundImageForBarMetrics:UIBarMetricsDefault];
-	if (bgImage != nil) {
-		originalTopBarImages[@"backgroundImage"] = bgImage;
-	}
-	UIImage *shadowImage = viewController.navigationController.navigationBar.shadowImage;
-	if (shadowImage != nil) {
-		originalTopBarImages[@"shadowImage"] = shadowImage;
-	}
-	self.originalTopBarImages = originalTopBarImages;
-}
-
-
 @end

lib/ios/RNNNavigationStackManager.m

@@ -25,7 +25,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	self.toVC = newTop;
 	self.fromVC = vc;
 	
-	if (self.toVC.isAnimated) {
+	if (self.toVC.isCustomTransitioned) {
 		vc.navigationController.delegate = newTop;
 	} else {
 		vc.navigationController.delegate = nil;

lib/ios/RNNOptions.h

@@ -0,0 +1,17 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <React/RCTConvert.h>
+@protocol RNNOptionsProtocol <NSObject>
+
+@optional
+-(void)resetOptions;
+-(void)applyOn:(UIViewController*)viewController;
+
+@end
+
+@interface RNNOptions : NSObject <RNNOptionsProtocol>
+
+-(instancetype)initWithDict:(NSDictionary*)dict;
+-(void)mergeWith:(NSDictionary*)otherOptions;
+
+@end

lib/ios/RNNOptions.m

@@ -0,0 +1,18 @@
+
+#import "RNNOptions.h"
+
+@implementation RNNOptions
+
+-(instancetype)initWithDict:(NSDictionary *)dict {
+	self = [super init];
+	[self mergeWith:dict];
+	return self;
+}
+
+-(void)mergeWith:(NSDictionary *)otherOptions {
+	for (id key in otherOptions) {
+		[self setValue:[otherOptions objectForKey:key] forKey:key];
+	}
+}
+
+@end

lib/ios/RNNRootViewController.h

@@ -25,10 +25,9 @@
 		   animator:(RNNAnimator*)animator;
 
 
--(void)applyNavigationButtons;
 -(void)applyTabBarItem;
 -(void)applyTopTabsOptions;
 
--(BOOL)isAnimated;
+-(BOOL)isCustomTransitioned;
 
 @end

lib/ios/RNNRootViewController.m

@@ -2,12 +2,10 @@
 #import "RNNRootViewController.h"
 #import <React/RCTConvert.h>
 #import "RNNAnimator.h"
-#import "RNNNavigationButtons.h"
 
 @interface RNNRootViewController()
 @property (nonatomic, strong) NSString* containerName;
 @property (nonatomic) BOOL _statusBarHidden;
-@property (nonatomic, strong) RNNNavigationButtons* navigationButtons;
 
 @end
 
@@ -33,21 +31,20 @@
 											   object:nil];
 	self.navigationController.modalPresentationStyle = UIModalPresentationCustom;
 	self.navigationController.delegate = self;
-	self.navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:self];
+
 	return self;
 }
 	
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	[self.navigationOptions applyOn:self];
-	[self applyNavigationButtons];
 }
 
 - (void)viewDidLoad {
 	[super viewDidLoad];
 }
 
--(BOOL)isAnimated {
+-(BOOL)isCustomTransitioned {
 	return self.animator;
 }
 
@@ -106,16 +103,12 @@
 
 }
 
--(void)applyNavigationButtons{
-	[self.navigationButtons applyLeftButtons:self.navigationOptions.leftButtons rightButtons:self.navigationOptions.rightButtons];
-}
-
 -(void)applyTabBarItem {
-	[self.navigationOptions applyTabBarItemOptions:self];
+	[self.navigationOptions.bottomTab applyOn:self];
 }
 
 -(void)applyTopTabsOptions {
-	[self.navigationOptions applyTopTab:self];
+	[self.navigationOptions.topTab applyOn:self];
 }
 
 /**

lib/ios/RNNRootViewProtocol.h

@@ -1,9 +1,10 @@
+#import "RNNNavigationOptions.h"
 
 @protocol RNNRootViewProtocol <NSObject, UINavigationControllerDelegate>
 
 @required
 
-- (BOOL)isAnimated;
+- (BOOL)isCustomTransitioned;
 
 @end
 

lib/ios/RNNSideMenuChildVC.m

@@ -33,7 +33,7 @@
 	return self;
 }
 
-- (BOOL)isAnimated {
+- (BOOL)isCustomTransitioned {
 	return NO;
 }
 

lib/ios/RNNSideMenuController.m

@@ -72,7 +72,7 @@
 	}
 }
 
-- (BOOL)isAnimated {
+- (BOOL)isCustomTransitioned {
 	return NO;
 }
 

lib/ios/RNNSideMenuOptions.h

@@ -1,14 +1,8 @@
-#import <Foundation/Foundation.h>
+#import "RNNOptions.h"
 
-@interface RNNSideMenuOptions : NSObject
+@interface RNNSideMenuOptions : RNNOptions
 
 @property (nonatomic, strong) NSNumber* leftSideVisible;
 @property (nonatomic, strong) NSNumber* rightSideVisible;
 
--(instancetype)init;
--(instancetype)initWithDict:(NSDictionary *)sideMenuOptions;
--(void)mergeWith:(NSDictionary*)otherOptions;
-
--(void)resetOptions;
-
 @end

lib/ios/RNNSideMenuOptions.m

@@ -1,17 +1,29 @@
 #import "RNNSideMenuOptions.h"
+#import "RNNSideMenuController.h"
 
 @implementation RNNSideMenuOptions
 
--(instancetype)init {
-	return [self initWithDict:@{}];
-}
-
--(instancetype)initWithDict:(NSDictionary *)sideMenuOptions {
-	self = [super init];
-	
-	[self mergeWith:sideMenuOptions];
-	
-	return self;
+- (void)applyOn:(UIViewController *)viewController {
+	RNNSideMenuController* sideMenuController = (RNNSideMenuController*)UIApplication.sharedApplication.delegate.window.rootViewController;
+	if ([sideMenuController isKindOfClass:[RNNSideMenuController class]]) {
+		if (self.leftSideVisible) {
+			if (self.leftSideVisible.boolValue) {
+				[sideMenuController showSideMenu:MMDrawerSideLeft animated:YES];
+			} else {
+				[sideMenuController hideSideMenu:MMDrawerSideLeft animated:YES];
+			}
+		}
+		
+		if (self.rightSideVisible) {
+			if (self.rightSideVisible.boolValue) {
+				[sideMenuController showSideMenu:MMDrawerSideRight animated:YES];
+			} else {
+				[sideMenuController hideSideMenu:MMDrawerSideRight animated:YES];
+			}
+		}
+		
+		[self resetOptions];
+	}
 }
 
 -(void)mergeWith:(NSDictionary *)otherOptions {

lib/ios/RNNTabBarController.m

@@ -33,7 +33,7 @@
 	}
 }
 
-- (BOOL)isAnimated {
+- (BOOL)isCustomTransitioned {
 	return NO;
 }
 

lib/ios/RNNTabBarOptions.m

@@ -1,32 +0,0 @@
-#import "RNNTabBarOptions.h"
-
-@implementation RNNTabBarOptions
-
--(instancetype)init {
-	return [self initWithDict:@{}];
-}
-
--(instancetype)initWithDict:(NSDictionary *)tabBarOptions {
-	self = [super init];
-	
-	self.hidden = [tabBarOptions valueForKey:@"hidden"];
-	self.animateHide = [tabBarOptions valueForKey:@"animateHide"];
-	self.currentTabIndex = [tabBarOptions valueForKey:@"currentTabIndex"];
-	self.testID = [tabBarOptions valueForKey:@"testID"];
-	self.currentTabId = [tabBarOptions valueForKey:@"currentTabId"];
-	self.drawUnder = [tabBarOptions valueForKey:@"drawUnder"];
-	
-	return self;
-}
-
-- (void)resetOptions {
-	self.currentTabId = nil;
-	self.currentTabIndex = nil;
-}
-
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
-	}
-}
-@end

lib/ios/RNNTabItemOptions.m

@@ -1,32 +0,0 @@
-#import "RNNTabItemOptions.h"
-
-@implementation RNNTabItemOptions
-
--(instancetype)initWithDict:(NSDictionary *)tabItemDict {
-	self = [super init];
-	
-	self.title = tabItemDict[@"title"];
-	self.tag = [tabItemDict[@"tag"] integerValue];
-	self.badge = tabItemDict[@"badge"];
-	self.testID = tabItemDict[@"testID"];
-	self.visible = tabItemDict[@"visible"];
-	self.icon = tabItemDict[@"icon"];
-	
-	return self;
-}
-
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
-	}
-}
-
--(void)resetOptions {
-	self.title = nil;
-	self.badge = nil;
-	self.visible = nil;
-	self.icon = nil;
-	self.testID = nil;
-}
-
-@end

lib/ios/RNNTopBarOptions.h

@@ -1,9 +1,9 @@
-#import <Foundation/Foundation.h>
+#import "RNNOptions.h"
 
-extern const NSInteger BLUR_TOPBAR_TAG;
-
-@interface RNNTopBarOptions : NSObject
+@interface RNNTopBarOptions : RNNOptions
 
+@property (nonatomic, strong) NSArray* leftButtons;
+@property (nonatomic, strong) NSArray* rightButtons;
 @property (nonatomic, strong) NSNumber* backgroundColor;
 @property (nonatomic, strong) NSNumber* textColor;
 @property (nonatomic, strong) NSString* title;
@@ -21,8 +21,4 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 @property (nonatomic, strong) NSNumber* largeTitle;
 @property (nonatomic, strong) NSString* testID;
 
--(instancetype)init;
--(instancetype)initWithDict:(NSDictionary *)topBarOptions;
--(void)mergeWith:(NSDictionary*)otherOptions;
-
 @end

lib/ios/RNNTopBarOptions.m

@@ -1,39 +1,175 @@
 #import "RNNTopBarOptions.h"
+#import "RNNNavigationButtons.h"
 
-@implementation RNNTopBarOptions
+extern const NSInteger BLUR_TOPBAR_TAG;
 
--(instancetype)init {
-	return [self initWithDict:@{}];
-}
+@interface RNNTopBarOptions ()
+
+@property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;
+@property (nonatomic, strong) RNNNavigationButtons* navigationButtons;
+
+@end
 
--(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.transparent = [topBarOptions valueForKey:@"transparent"];
-	self.noBorder = [topBarOptions valueForKey:@"noBorder"];
-	self.animateHide = [topBarOptions valueForKey:@"animateHide"];
-	self.largeTitle = [topBarOptions valueForKey:@"largeTitle"];
-	self.testID = [topBarOptions valueForKey:@"testID"];
-	self.drawUnder = [topBarOptions valueForKey:@"drawUnder"];
-	
-	return self;
+@implementation RNNTopBarOptions
+
+- (void)applyOn:(UIViewController*)viewController {
+	if (self.backgroundColor) {
+		UIColor* backgroundColor = [RCTConvert UIColor:self.backgroundColor];
+		viewController.navigationController.navigationBar.barTintColor = backgroundColor;
+	} else {
+		viewController.navigationController.navigationBar.barTintColor = nil;
+	}
+	
+	if (self.title) {
+		viewController.navigationItem.title = self.title;
+	}
+	
+	if (@available(iOS 11.0, *)) {
+		if (self.largeTitle){
+			if ([self.largeTitle boolValue]) {
+				viewController.navigationController.navigationBar.prefersLargeTitles = YES;
+				viewController.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeAlways;
+			} else {
+				viewController.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
+			}
+		} else {
+			viewController.navigationController.navigationBar.prefersLargeTitles = NO;
+			viewController.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
+		}
+	}
+	
+	
+	if (self.textFontFamily || self.textFontSize || self.textColor) {
+		NSMutableDictionary* navigationBarTitleTextAttributes = [NSMutableDictionary new];
+		if (self.textColor) {
+			navigationBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:[self valueForKey:@"textColor"]];
+		}
+		if (self.textFontFamily){
+			if(self.textFontSize) {
+				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.textFontFamily size:[self.textFontSize floatValue]];
+			} else {
+				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont fontWithName:self.textFontFamily size:20];
+			}
+		} else if (self.textFontSize) {
+			navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:[self.textFontSize floatValue]];
+		}
+		viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
+		if (@available(iOS 11.0, *)){
+			viewController.navigationController.navigationBar.largeTitleTextAttributes = navigationBarTitleTextAttributes;
+		}
+		
+	}
+	
+	
+	if (self.hidden){
+		[viewController.navigationController setNavigationBarHidden:[self.hidden boolValue] animated:[self.animateHide boolValue]];
+	}
+	
+	if (self.hideOnScroll) {
+		viewController.navigationController.hidesBarsOnSwipe = [self.hideOnScroll boolValue];
+	}
+	
+	if (self.buttonColor) {
+		UIColor* buttonColor = [RCTConvert UIColor:self.buttonColor];
+		viewController.navigationController.navigationBar.tintColor = buttonColor;
+	} else {
+		viewController.navigationController.navigationBar.tintColor = nil;
+	}
+	
+	if ([self.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];
+		}
+	}
+	
+	void (^disableTopBarTransparent)() = ^void(){
+		UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
+		if (transparentView){
+			[transparentView removeFromSuperview];
+			[viewController.navigationController.navigationBar setBackgroundImage:self.originalTopBarImages[@"backgroundImage"] forBarMetrics:UIBarMetricsDefault];
+			viewController.navigationController.navigationBar.shadowImage = self.originalTopBarImages[@"shadowImage"];
+			self.originalTopBarImages = nil;
+		}
+	};
+	
+	if (self.transparent) {
+		if ([self.transparent boolValue]) {
+			if (![viewController.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG]){
+				[self storeOriginalTopBarImages:viewController];
+				[viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+				viewController.navigationController.navigationBar.shadowImage = [UIImage new];
+				UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
+				transparentView.tag = TOP_BAR_TRANSPARENT_TAG;
+				[viewController.navigationController.navigationBar insertSubview:transparentView atIndex:0];
+			}
+		} else {
+			disableTopBarTransparent();
+		}
+	} else {
+		disableTopBarTransparent();
+	}
+	
+	if (self.translucent) {
+		viewController.navigationController.navigationBar.translucent = [self.translucent boolValue];
+	}
+	
+	if (self.drawUnder) {
+		if ([self.drawUnder boolValue]) {
+			viewController.edgesForExtendedLayout |= UIRectEdgeTop;
+		} else {
+			viewController.edgesForExtendedLayout &= ~UIRectEdgeTop;
+		}
+	}
+	
+	if (self.noBorder) {
+		if ([self.noBorder boolValue]) {
+			viewController.navigationController.navigationBar
+			.shadowImage = [[UIImage alloc] init];
+		} else {
+			viewController.navigationController.navigationBar
+			.shadowImage = nil;
+		}
+	}
+	
+	if (self.testID) {
+		viewController.navigationController.navigationBar.accessibilityIdentifier = self.testID;
+	}
+	
+	if (self.rightButtons || self.leftButtons) {
+		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
+		[_navigationButtons applyLeftButtons:self.leftButtons rightButtons:self.rightButtons];
+	}
 }
 
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
+-(void)storeOriginalTopBarImages:(UIViewController*)viewController {
+	NSMutableDictionary *originalTopBarImages = [@{} mutableCopy];
+	UIImage *bgImage = [viewController.navigationController.navigationBar backgroundImageForBarMetrics:UIBarMetricsDefault];
+	if (bgImage != nil) {
+		originalTopBarImages[@"backgroundImage"] = bgImage;
 	}
+	UIImage *shadowImage = viewController.navigationController.navigationBar.shadowImage;
+	if (shadowImage != nil) {
+		originalTopBarImages[@"shadowImage"] = shadowImage;
+	}
+	self.originalTopBarImages = originalTopBarImages;
 }
+
 @end
 
 

lib/ios/RNNTopTabOptions.h

@@ -1,14 +1,9 @@
-#import <Foundation/Foundation.h>
+#import "RNNOptions.h"
 
-extern const NSInteger BLUR_TOPBAR_TAG;
-
-@interface RNNTopTabOptions : NSObject
+@interface RNNTopTabOptions : RNNOptions
 
 @property (nonatomic, strong) NSString* title;
-
--(instancetype)init;
--(instancetype)initWithDict:(NSDictionary *)topBarOptions;
--(void)mergeWith:(NSDictionary*)otherOptions;
+@property (nonatomic, strong) NSString* titleFontFamily;
 
 @end
 

lib/ios/RNNTopTabOptions.m

@@ -1,17 +1,12 @@
 #import "RNNTopTabOptions.h"
+#import "RNNRootViewController.h"
 
 @implementation RNNTopTabOptions
 
--(instancetype)init {
-	return [self initWithDict:@{}];
-}
-
--(instancetype)initWithDict:(NSDictionary *)tabBarOptions {
-	self = [super init];
-	
-	self.title = [tabBarOptions valueForKey:@"title"];
-	
-	return self;
+- (void)applyOn:(RNNRootViewController*)viewController {
+	if (self.title) {
+		[viewController.topTabsViewController viewController:viewController changedTitle:self.title];
+	}
 }
 
 -(void)mergeWith:(NSDictionary *)otherOptions {

lib/ios/RNNTopTabsOptions.h

@@ -0,0 +1,7 @@
+#import "RNNOptions.h"
+
+@interface RNNTopTabsOptions : RNNOptions
+
+@property (nonatomic, strong) NSNumber* backgroundColor;
+
+@end

lib/ios/RNNTopTabsOptions.m

@@ -0,0 +1,10 @@
+#import "RNNTopTabsOptions.h"
+#import "RNNTopTabsViewController.h"
+
+@implementation RNNTopTabsOptions
+
+- (void)applyOn:(RNNTopTabsViewController *)viewController {
+
+}
+
+@end

lib/ios/RNNTopTabsViewController.m

@@ -15,7 +15,7 @@
 
 - (instancetype)init {
 	self = [super init];
-		
+	
 	[self.view setBackgroundColor:[UIColor whiteColor]];
 	self.edgesForExtendedLayout = UIRectEdgeNone;
 	
@@ -72,7 +72,7 @@
     [super viewDidLoad];
 }
 
-- (BOOL)isAnimated {
+- (BOOL)isCustomTransitioned {
 	return NO;
 }
 

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -57,6 +57,12 @@
 		268692831E5054F800E2C612 /* RNNStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 268692811E5054F800E2C612 /* RNNStore.m */; };
 		26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = 26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */; };
 		26916C991E4B9E7700D13680 /* RNNReactRootViewCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */; };
+		504AFE641FFE53070076E904 /* RNNOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 504AFE621FFE53070076E904 /* RNNOptions.h */; };
+		504AFE651FFE53070076E904 /* RNNOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 504AFE631FFE53070076E904 /* RNNOptions.m */; };
+		504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */; };
+		504AFE751FFFF0540076E904 /* RNNTopTabsOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 504AFE731FFFF0540076E904 /* RNNTopTabsOptions.m */; };
+		504AFE761FFFF1E00076E904 /* RNNNavigationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = E83BAD691F27362500A9F3DD /* RNNNavigationOptions.h */; };
+		504AFE771FFFF1E20076E904 /* RNNTopBarOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */; };
 		507F43C51FF4F17C00D9425B /* RNNTopTabsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */; };
 		507F43C61FF4F17C00D9425B /* RNNTopTabsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 507F43C41FF4F17C00D9425B /* RNNTopTabsViewController.m */; };
 		507F43C91FF4F9CC00D9425B /* RNNTopTabOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43C71FF4F9CC00D9425B /* RNNTopTabOptions.h */; };
@@ -68,8 +74,7 @@
 		507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */; };
 		50CB3B691FDE911400AA153B /* RNNSideMenuOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */; };
 		50CB3B6A1FDE911400AA153B /* RNNSideMenuOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */; };
-		50EB93411FE14A3E00BD8EEE /* RNNTabItemOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50EB933F1FE14A3E00BD8EEE /* RNNTabItemOptions.h */; };
-		50EB93421FE14A3E00BD8EEE /* RNNTabItemOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EB93401FE14A3E00BD8EEE /* RNNTabItemOptions.m */; };
+		50EB93421FE14A3E00BD8EEE /* RNNBottomTabOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EB93401FE14A3E00BD8EEE /* RNNBottomTabOptions.m */; };
 		50F5DFC11F407A8C001A00BC /* RNNTabBarController.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F5DFBF1F407A8C001A00BC /* RNNTabBarController.h */; };
 		50F5DFC21F407A8C001A00BC /* RNNTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50F5DFC01F407A8C001A00BC /* RNNTabBarController.m */; };
 		50F5DFC51F407AA0001A00BC /* RNNNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F5DFC31F407AA0001A00BC /* RNNNavigationController.h */; };
@@ -111,7 +116,7 @@
 		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 */; };
-		A7626C011FC5796200492FB8 /* RNNTabBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7626C001FC5796200492FB8 /* RNNTabBarOptions.m */; };
+		A7626C011FC5796200492FB8 /* RNNBottomTabsOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7626C001FC5796200492FB8 /* RNNBottomTabsOptions.m */; };
 		E8367B801F7A8A4700675C05 /* VICMAImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = E8367B7E1F7A8A4700675C05 /* VICMAImageView.h */; };
 		E8367B811F7A8A4700675C05 /* VICMAImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8367B7F1F7A8A4700675C05 /* VICMAImageView.m */; };
 		E83BAD681F2734B500A9F3DD /* RNNNavigationOptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E83BAD671F2734B500A9F3DD /* RNNNavigationOptionsTest.m */; };
@@ -216,6 +221,10 @@
 		26916C941E4B9CCC00D13680 /* RNNRootViewCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNRootViewCreator.h; sourceTree = "<group>"; };
 		26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNReactRootViewCreator.h; sourceTree = "<group>"; };
 		26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNReactRootViewCreator.m; sourceTree = "<group>"; };
+		504AFE621FFE53070076E904 /* RNNOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOptions.h; sourceTree = "<group>"; };
+		504AFE631FFE53070076E904 /* RNNOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOptions.m; sourceTree = "<group>"; };
+		504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsOptions.h; sourceTree = "<group>"; };
+		504AFE731FFFF0540076E904 /* RNNTopTabsOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTopTabsOptions.m; sourceTree = "<group>"; };
 		507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsViewController.h; sourceTree = "<group>"; };
 		507F43C41FF4F17C00D9425B /* RNNTopTabsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTopTabsViewController.m; sourceTree = "<group>"; };
 		507F43C71FF4F9CC00D9425B /* RNNTopTabOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabOptions.h; sourceTree = "<group>"; };
@@ -227,8 +236,8 @@
 		507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewProtocol.h; sourceTree = "<group>"; };
 		50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuOptions.h; sourceTree = "<group>"; };
 		50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuOptions.m; sourceTree = "<group>"; };
-		50EB933F1FE14A3E00BD8EEE /* RNNTabItemOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabItemOptions.h; sourceTree = "<group>"; };
-		50EB93401FE14A3E00BD8EEE /* RNNTabItemOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabItemOptions.m; sourceTree = "<group>"; };
+		50EB933F1FE14A3E00BD8EEE /* RNNBottomTabOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBottomTabOptions.h; sourceTree = "<group>"; };
+		50EB93401FE14A3E00BD8EEE /* RNNBottomTabOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabOptions.m; sourceTree = "<group>"; };
 		50F5DFBF1F407A8C001A00BC /* RNNTabBarController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabBarController.h; sourceTree = "<group>"; };
 		50F5DFC01F407A8C001A00BC /* RNNTabBarController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabBarController.m; sourceTree = "<group>"; };
 		50F5DFC31F407AA0001A00BC /* RNNNavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationController.h; sourceTree = "<group>"; };
@@ -272,8 +281,8 @@
 		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>"; };
-		A7626BFF1FC578AB00492FB8 /* RNNTabBarOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabBarOptions.h; sourceTree = "<group>"; };
-		A7626C001FC5796200492FB8 /* RNNTabBarOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabBarOptions.m; sourceTree = "<group>"; };
+		A7626BFF1FC578AB00492FB8 /* RNNBottomTabsOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBottomTabsOptions.h; sourceTree = "<group>"; };
+		A7626C001FC5796200492FB8 /* RNNBottomTabsOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabsOptions.m; sourceTree = "<group>"; };
 		D8AFADBD1BEE6F3F00A4592D /* libReactNativeNavigation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactNativeNavigation.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		E8367B7E1F7A8A4700675C05 /* VICMAImageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VICMAImageView.h; sourceTree = "<group>"; };
 		E8367B7F1F7A8A4700675C05 /* VICMAImageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VICMAImageView.m; sourceTree = "<group>"; };
@@ -414,6 +423,29 @@
 			path = Animations;
 			sourceTree = "<group>";
 		};
+		504AFE611FFE52EF0076E904 /* Options */ = {
+			isa = PBXGroup;
+			children = (
+				504AFE621FFE53070076E904 /* RNNOptions.h */,
+				504AFE631FFE53070076E904 /* RNNOptions.m */,
+				E83BAD691F27362500A9F3DD /* RNNNavigationOptions.h */,
+				E83BAD6A1F27363A00A9F3DD /* RNNNavigationOptions.m */,
+				A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */,
+				A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */,
+				A7626BFF1FC578AB00492FB8 /* RNNBottomTabsOptions.h */,
+				A7626C001FC5796200492FB8 /* RNNBottomTabsOptions.m */,
+				50EB933F1FE14A3E00BD8EEE /* RNNBottomTabOptions.h */,
+				50EB93401FE14A3E00BD8EEE /* RNNBottomTabOptions.m */,
+				507F43C71FF4F9CC00D9425B /* RNNTopTabOptions.h */,
+				507F43C81FF4F9CC00D9425B /* RNNTopTabOptions.m */,
+				504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */,
+				504AFE731FFFF0540076E904 /* RNNTopTabsOptions.m */,
+				50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */,
+				50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */,
+			);
+			name = Options;
+			sourceTree = "<group>";
+		};
 		507F43F11FF4FCD800D9425B /* HMSegmentControl */ = {
 			isa = PBXGroup;
 			children = (
@@ -428,6 +460,7 @@
 			children = (
 				E8AEDB471F584175000F5A6A /* Components */,
 				E8AEDB461F58414D000F5A6A /* Animations */,
+				504AFE611FFE52EF0076E904 /* Options */,
 				261F0E621E6EC94900989DE2 /* RNNModalManager.h */,
 				261F0E631E6EC94900989DE2 /* RNNModalManager.m */,
 				261F0E681E6F028A00989DE2 /* RNNNavigationStackManager.h */,
@@ -451,22 +484,10 @@
 				7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */,
 				263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */,
 				263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */,
-				E83BAD691F27362500A9F3DD /* RNNNavigationOptions.h */,
-				E83BAD6A1F27363A00A9F3DD /* RNNNavigationOptions.m */,
 				21B85E5E1F44482A00B314B5 /* RNNNavigationButtons.h */,
 				21B85E5C1F44480200B314B5 /* RNNNavigationButtons.m */,
 				214545261F4DC164006E8DA1 /* RNNUIBarButtonItem.h */,
 				214545241F4DC125006E8DA1 /* RNNUIBarButtonItem.m */,
-				50EB933F1FE14A3E00BD8EEE /* RNNTabItemOptions.h */,
-				50EB93401FE14A3E00BD8EEE /* RNNTabItemOptions.m */,
-				A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */,
-				A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */,
-				A7626BFF1FC578AB00492FB8 /* RNNTabBarOptions.h */,
-				A7626C001FC5796200492FB8 /* RNNTabBarOptions.m */,
-				507F43C71FF4F9CC00D9425B /* RNNTopTabOptions.h */,
-				507F43C81FF4F9CC00D9425B /* RNNTopTabOptions.m */,
-				50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */,
-				50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */,
 				507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */,
 				507F43C41FF4F17C00D9425B /* RNNTopTabsViewController.m */,
 				507F43F61FF525B500D9425B /* RNNSegmentedControl.h */,
@@ -607,6 +628,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				261F0E6A1E6F028A00989DE2 /* RNNNavigationStackManager.h in Headers */,
+				504AFE761FFFF1E00076E904 /* RNNNavigationOptions.h in Headers */,
+				504AFE771FFFF1E20076E904 /* RNNTopBarOptions.h in Headers */,
 				26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */,
 				263905B01E4C6F440023D7D3 /* MMDrawerController+Subclass.h in Headers */,
 				E8AEDB4A1F5C0BAF000F5A6A /* RNNInteractivePopAnimator.h in Headers */,
@@ -647,10 +670,11 @@
 				507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */,
 				263905CA1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.h in Headers */,
 				263905B11E4C6F440023D7D3 /* MMDrawerController.h in Headers */,
-				50EB93411FE14A3E00BD8EEE /* RNNTabItemOptions.h in Headers */,
+				504AFE641FFE53070076E904 /* RNNOptions.h in Headers */,
 				263905B91E4C6F440023D7D3 /* RCCDrawerController.h in Headers */,
 				263905B31E4C6F440023D7D3 /* MMDrawerVisualState.h in Headers */,
 				E8A5CD621F49114F00E89D0D /* RNNElement.h in Headers */,
+				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
 				E8E5182E1F83A48B000467AC /* RNNTransitionStateHolder.h in Headers */,
 				7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */,
 				263905D61E4C94970023D7D3 /* RNNSideMenuController.h in Headers */,
@@ -790,8 +814,10 @@
 				7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */,
 				261F0E651E6EC94900989DE2 /* RNNModalManager.m in Sources */,
 				E8A5CD631F49114F00E89D0D /* RNNElement.m in Sources */,
+				504AFE751FFFF0540076E904 /* RNNTopTabsOptions.m in Sources */,
 				7BEF0D1D1E43771B003E96B0 /* RNNLayoutNode.m in Sources */,
 				7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */,
+				504AFE651FFE53070076E904 /* RNNOptions.m in Sources */,
 				263905BA1E4C6F440023D7D3 /* RCCDrawerController.m in Sources */,
 				50F5DFC21F407A8C001A00BC /* RNNTabBarController.m in Sources */,
 				263905BC1E4C6F440023D7D3 /* RCCDrawerHelper.m in Sources */,
@@ -807,9 +833,9 @@
 				E8A430121F9CB87B00B61A20 /* RNNAnimatedView.m in Sources */,
 				507F43F51FF4FCFE00D9425B /* HMSegmentedControl.m in Sources */,
 				507F43C61FF4F17C00D9425B /* RNNTopTabsViewController.m in Sources */,
-				50EB93421FE14A3E00BD8EEE /* RNNTabItemOptions.m in Sources */,
+				50EB93421FE14A3E00BD8EEE /* RNNBottomTabOptions.m in Sources */,
 				E8367B811F7A8A4700675C05 /* VICMAImageView.m in Sources */,
-				A7626C011FC5796200492FB8 /* RNNTabBarOptions.m in Sources */,
+				A7626C011FC5796200492FB8 /* RNNBottomTabsOptions.m in Sources */,
 				263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */,
 				E8AEDB4B1F5C0BAF000F5A6A /* RNNInteractivePopAnimator.m in Sources */,
 				7B4928091E70415400555040 /* RNNCommandsHandler.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNNavigationOptionsTest.m

@@ -19,9 +19,8 @@
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBar": @{@"backgroundColor" : @(0xff0000ff)}}];
 	XCTAssertTrue(options.topBar.backgroundColor);
 }
--(void)testReturnsNilWhenStyleDoesNotExist{
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBar": @{@"someColor" : @(0xff0000ff)}}];
-	XCTAssertNil(options.topBar.backgroundColor);
+-(void)testThrowsWhenStyleDoesNotExist{
+	XCTAssertThrows([[RNNNavigationOptions alloc] initWithDict:@{@"topBar": @{@"someColor" : @(0xff0000ff)}}]);
 }
 
 -(void)testChangeRNNNavigationOptionsDynamically{
@@ -36,4 +35,5 @@
 	NSDictionary* dynamicOptions = @{@"topBar": @{@"titleeeee" : @"hello"}};
 	XCTAssertThrows([options mergeWith:dynamicOptions]);
 }
+
 @end

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -174,7 +174,7 @@
 
 -(void)testTabBadge {
 	NSString* tabBadgeInput = @"5";
-	self.options.tabItem.badge = tabBadgeInput;
+	self.options.bottomTab.badge = tabBadgeInput;
 	__unused RNNTabBarController* vc = [[RNNTabBarController alloc] init];
 	NSMutableArray* controllers = [NSMutableArray new];
 	UITabBarItem* item = [[UITabBarItem alloc] initWithTitle:@"A Tab" image:nil tag:1];
@@ -355,7 +355,7 @@
 }
 
 -(void)testRightButtonsWithTitle_withoutStyle {
-	self.options.rightButtons = @[@{@"id": @"testId", @"title": @"test"}];
+	self.options.topBar.rightButtons = @[@{@"id": @"testId", @"title": @"test"}];
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	
@@ -370,7 +370,7 @@
 -(void)testRightButtonsWithTitle_withStyle {
 	NSNumber* inputColor = @(0xFFFF0000);
 	
-	self.options.rightButtons = @[@{@"id": @"testId", @"title": @"test", @"disabled": @true, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
+	self.options.topBar.rightButtons = @[@{@"id": @"testId", @"title": @"test", @"disabled": @true, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	
@@ -386,7 +386,7 @@
 
 
 -(void)testLeftButtonsWithTitle_withoutStyle {
-	self.options.leftButtons = @[@{@"id": @"testId", @"title": @"test"}];
+	self.options.topBar.leftButtons = @[@{@"id": @"testId", @"title": @"test"}];
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	
@@ -401,7 +401,7 @@
 -(void)testLeftButtonsWithTitle_withStyle {
 	NSNumber* inputColor = @(0xFFFF0000);
 	
-	self.options.leftButtons = @[@{@"id": @"testId", @"title": @"test", @"disabled": @true, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
+	self.options.topBar.leftButtons = @[@{@"id": @"testId", @"title": @"test", @"disabled": @true, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	

lib/src/params/options/NavigationOptions.js

@@ -1,6 +1,5 @@
 const TopBar = require('./TopBar');
 const BottomTabs = require('./BottomTabs');
-const Button = require('./Button');
 const BottomTab = require('./BottomTab');
 const TopTabs = require('./TopTabs');
 
@@ -11,16 +10,12 @@ class NavigationOptions {
    * @property {options:BottomTab} [bottomTab]
    * @property {string} [orientation]
    * @property {options:TopTabs} [topTabs]
-   * @property {options:Button[]} [rightButtons]
-   * @property {options:Button[]} [leftButtons]
    */
   constructor(options) {
     this.topBar = options.topBar && new TopBar(options.topBar);
     this.bottomTabs = options.bottomTabs && new BottomTabs(options.bottomTabs);
     this.bottomTab = options.bottomTab && new BottomTab(options.bottomTab);
     this.orientation = options.orientation;
-    this.rightButtons = options.rightButtons && options.rightButtons.map((button) => new Button(button));
-    this.leftButtons = options.leftButtons && options.leftButtons.map((button) => new Button(button));
     this.sideMenu = options.sideMenu;
     this.backgroundImage = options.backgroundImage;
     this.rootBackgroundImage = options.rootBackgroundImage;

lib/src/params/options/NavigationOptions.test.js

@@ -7,22 +7,6 @@ const TopTabs = require('./TopTabs');
 const TAB_BAR = {};
 const TOP_BAR = {};
 const TAB_ITEM = {};
-const RIGHT_BUTTONS = [
-  {
-    id: 'myBtn',
-    testID: 'BTN',
-    title: 'My Button',
-    buttonColor: 'red'
-  }
-];
-const LEFT_BUTTONS = [
-  {
-    id: 'myBtn',
-    testID: 'BTN',
-    title: 'My Button',
-    buttonColor: 'red'
-  }
-];
 const TOP_TABS = {
   selectedTabColor: 'blue',
   unselectedTabColor: 'red'
@@ -32,8 +16,6 @@ const NAVIGATION_OPTIONS = {
   bottomTabs: TAB_BAR,
   bottomTab: TAB_ITEM,
   orientation: 'portrait',
-  rightButtons: RIGHT_BUTTONS,
-  leftButtons: LEFT_BUTTONS,
   topTabs: TOP_TABS
 };
 
@@ -44,8 +26,6 @@ describe('NavigationOptions', () => {
     expect(uut.topBar).toBeInstanceOf(TopBar);
     expect(uut.bottomTab).toBeInstanceOf(BottomTab);
     expect(uut.orientation).toEqual('portrait');
-    expect(uut.rightButtons).toEqual(RIGHT_BUTTONS);
-    expect(uut.leftButtons).toEqual(LEFT_BUTTONS);
     expect(uut.topTabs).toBeInstanceOf(TopTabs);
   });
 });

lib/src/params/options/TopBar.js

@@ -1,3 +1,5 @@
+const Button = require('./Button');
+
 class TopBar {
   /**
    * @property {string} [title]
@@ -16,6 +18,8 @@ class TopBar {
    * @property {boolean} [noBorder]
    * @property {boolean} [largeTitle]
    * @property {boolean} [drawUnder]
+   * @property {options:Button[]} [rightButtons]
+   * @property {options:Button[]} [leftButtons]
    */
   constructor(options) {
     this.title = options.title;
@@ -34,6 +38,8 @@ class TopBar {
     this.largeTitle = options.largeTitle;
     this.testID = options.testID;
     this.drawUnder = options.drawUnder;
+    this.rightButtons = options.rightButtons && options.rightButtons.map((button) => new Button(button));
+    this.leftButtons = options.leftButtons && options.leftButtons.map((button) => new Button(button));
   }
 }
 

lib/src/params/options/TopBar.test.js

@@ -1,4 +1,22 @@
 const TopBar = require('./TopBar');
+const Button = require('./Button');
+
+const RIGHT_BUTTONS = [
+  {
+    id: 'myBtn',
+    testID: 'BTN',
+    title: 'My Button',
+    buttonColor: 'red'
+  }
+];
+const LEFT_BUTTONS = [
+  {
+    id: 'myBtn',
+    testID: 'BTN',
+    title: 'My Button',
+    buttonColor: 'red'
+  }
+];
 
 const TOP_BAR = {
   title: 'something',
@@ -9,7 +27,9 @@ const TOP_BAR = {
   hidden: true,
   animateHide: true,
   hideOnScroll: true,
-  transparent: true
+  transparent: true,
+  rightButtons: RIGHT_BUTTONS,
+  leftButtons: LEFT_BUTTONS
 };
 
 describe('TopBar', () => {
@@ -24,5 +44,6 @@ describe('TopBar', () => {
     expect(uut.animateHide).toEqual(true);
     expect(uut.hideOnScroll).toEqual(true);
     expect(uut.transparent).toEqual(true);
+    expect(uut.leftButtons[0]).toBeInstanceOf(Button);
   });
 });

playground/src/containers/OptionsScreen.js

@@ -20,22 +20,22 @@ class OptionsScreen extends Component {
         hidden: false,
         textFontSize: 16,
         textFontFamily: 'HelveticaNeue-Italic',
-        testID: testIDs.TOP_BAR_ELEMENT
-      },
-      rightButtons: [{
-        id: BUTTON_ONE,
-        testID: BUTTON_ONE,
-        title: 'One',
-        buttonFontSize: 28,
-        buttonColor: 'red'
-      }],
-      leftButtons: [{
-        id: BUTTON_LEFT,
-        testID: BUTTON_LEFT,
-        icon: require('../../img/navicon_add.png'),
-        title: 'Left',
-        buttonColor: 'purple'
-      }]
+        testID: testIDs.TOP_BAR_ELEMENT,
+        rightButtons: [{
+          id: BUTTON_ONE,
+          testID: BUTTON_ONE,
+          title: 'One',
+          buttonFontSize: 28,
+          buttonColor: 'red'
+        }],
+        leftButtons: [{
+          id: BUTTON_LEFT,
+          testID: BUTTON_LEFT,
+          icon: require('../../img/navicon_add.png'),
+          title: 'Left',
+          buttonColor: 'purple'
+        }]
+      }
     };
   }
 
@@ -71,35 +71,39 @@ class OptionsScreen extends Component {
   onNavigationButtonPressed(id) {
     if (id === BUTTON_ONE) {
       Navigation.setOptions(this.props.containerId, {
-        rightButtons: [{
-          id: BUTTON_TWO,
-          testID: BUTTON_TWO,
-          title: 'Two',
-          icon: require('../../img/navicon_add.png'),
-          disableIconTint: true,
-          // disabled: true,
-          showAsAction: 'ifRoom',
-          buttonColor: 'green',
-          buttonFontSize: 28,
-          buttonFontWeight: '800'
-        }],
-        leftButtons: []
+        topBar: {
+          rightButtons: [{
+            id: BUTTON_TWO,
+            testID: BUTTON_TWO,
+            title: 'Two',
+            icon: require('../../img/navicon_add.png'),
+            disableIconTint: true,
+            // disabled: true,
+            showAsAction: 'ifRoom',
+            buttonColor: 'green',
+            buttonFontSize: 28,
+            buttonFontWeight: '800'
+          }],
+          leftButtons: []
+        }
       });
     } else if (id === BUTTON_TWO) {
       Navigation.setOptions(this.props.containerId, {
-        rightButtons: [{
-          id: BUTTON_ONE,
-          testID: BUTTON_ONE,
-          title: 'One',
-          buttonColor: 'red'
-        }],
-        leftButtons: [{
-          id: BUTTON_LEFT,
-          testID: BUTTON_LEFT,
-          icon: require('../../img/navicon_add.png'),
-          title: 'Left',
-          buttonColor: 'purple'
-        }]
+        topBar: {
+          rightButtons: [{
+            id: BUTTON_ONE,
+            testID: BUTTON_ONE,
+            title: 'One',
+            buttonColor: 'red'
+          }],
+          leftButtons: [{
+            id: BUTTON_LEFT,
+            testID: BUTTON_LEFT,
+            icon: require('../../img/navicon_add.png'),
+            title: 'Left',
+            buttonColor: 'purple'
+          }]
+        }
       });
     } else if (id === BUTTON_LEFT) {
       Navigation.pop(this.props.containerId);

playground/src/containers/WelcomeScreen.js

@@ -183,7 +183,7 @@ class WelcomeScreen extends Component {
           navigationOptions: {
             topTab: {
               title: 'Tab 2',
-              titleFontFamily: 'Dosis-Regular'
+              titleFontFamily: 'HelveticaNeue-Italic'
             }
           }
         },