Resolving buttons options with the component options - fixes styles

lib/ios/RNNBasePresenter.h

@@ -12,7 +12,7 @@
 
 - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options;
 
-- (void)mergeOptions:(RNNNavigationOptions *)options;
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
 
 - (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions;
 

lib/ios/RNNBasePresenter.m

@@ -28,7 +28,7 @@
 	[self.bottomTabPresenter applyOptions:initialOptions];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
 	
 }
 

lib/ios/RNNNavigationController.m

@@ -43,7 +43,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options];
+	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 

lib/ios/RNNNavigationControllerPresenter.m

@@ -29,8 +29,8 @@
 	[navigationController rnn_setNavigationBarFontFamily:[options.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[options.topBar.title.fontSize getWithDefaultValue:nil] color:[options.topBar.title.color getWithDefaultValue:nil]];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[super mergeOptions:options];
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
+	[super mergeOptions:options resolvedOptions:resolvedOptions];
 	
 	RNNNavigationController* navigationController = self.bindedViewController;
 	RNNNavigationOptions* withDefault = (RNNNavigationOptions *)[options withDefault:self.defaultOptions];

lib/ios/RNNRootViewController.m

@@ -69,7 +69,7 @@
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options];
+	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 	
 	[self initCustomViews];

lib/ios/RNNSideMenuChildVC.m

@@ -44,7 +44,7 @@
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options];
+	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 

lib/ios/RNNSideMenuController.m

@@ -59,7 +59,7 @@
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options];
+	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 

lib/ios/RNNSideMenuPresenter.m

@@ -25,8 +25,8 @@
 	}
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[super mergeOptions:options];
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
+	[super mergeOptions:options resolvedOptions:resolvedOptions];
 	
 	RNNSideMenuController* sideMenuController = self.bindedViewController;
 	

lib/ios/RNNSplitViewController.m

@@ -28,7 +28,7 @@
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options];
+	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 

lib/ios/RNNTabBarController.m

@@ -62,7 +62,7 @@
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options];
+	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 

lib/ios/RNNTabBarPresenter.m

@@ -13,8 +13,8 @@
 	[tabBarController rnn_setTabBarTestID:[options.bottomTabs.testID getWithDefaultValue:nil]];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[super mergeOptions:options];
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
+	[super mergeOptions:options resolvedOptions:resolvedOptions];
 	
 	UITabBarController* tabBarController = self.bindedViewController;
 	

lib/ios/RNNTopTabsViewController.m

@@ -49,7 +49,7 @@
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options];
+	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 

lib/ios/RNNViewControllerPresenter.m

@@ -44,8 +44,8 @@
 	
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[super mergeOptions:options];
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
+	[super mergeOptions:options resolvedOptions:resolvedOptions];
 	
 	RNNNavigationOptions* withDefault = (RNNNavigationOptions *)[options withDefault:self.defaultOptions];
 	
@@ -112,8 +112,9 @@
 	}
 	
 	if (options.topBar.leftButtons || options.topBar.rightButtons) {
+		RNNNavigationOptions* buttonsResolvedOptions = (RNNNavigationOptions *)[[resolvedOptions overrideOptions:options] withDefault:self.defaultOptions];
 		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
-		[_navigationButtons applyLeftButtons:options.topBar.leftButtons rightButtons:options.topBar.rightButtons defaultLeftButtonStyle:withDefault.topBar.leftButtonStyle defaultRightButtonStyle:withDefault.topBar.rightButtonStyle];
+		[_navigationButtons applyLeftButtons:options.topBar.leftButtons rightButtons:options.topBar.rightButtons defaultLeftButtonStyle:buttonsResolvedOptions.topBar.leftButtonStyle defaultRightButtonStyle:buttonsResolvedOptions.topBar.rightButtonStyle];
 	}
 }