Feature/styling

ios/RCCNavigationController.m

@@ -78,6 +78,7 @@ - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actio
       [mergedStyle removeObjectForKey:@"navBarTranslucent"];
       [mergedStyle removeObjectForKey:@"statusBarHideWithNavBar"];
       [mergedStyle removeObjectForKey:@"autoAdjustScrollViewInsets"];
+      [mergedStyle removeObjectForKey:@"statusBarTextColorSchemeSingleScreen"];
 
       [mergedStyle addEntriesFromDictionary:navigatorStyle];
       navigatorStyle = mergedStyle;

ios/RCCTabBarController.m

@@ -3,6 +3,15 @@
 #import "RCTConvert.h"
 #import "RCCManager.h"
 #import "RCTHelpers.h"
+#import "RCTUIManager.h"
+
+@interface RCTUIManager ()
+
+- (void)configureNextLayoutAnimation:(NSDictionary *)config
+                        withCallback:(RCTResponseSenderBlock)callback
+                       errorCallback:(__unused RCTResponseSenderBlock)errorCallback;
+
+@end
 
 @implementation RCCTabBarController
 
@@ -121,7 +130,7 @@ - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children
 
     NSMutableDictionary *selectedAttributes = [RCTHelpers textAttributesFromDictionary:tabsStyle withPrefix:@"tabBarSelectedText" baseFont:[UIFont systemFontOfSize:10]];
     if (!selectedAttributes[NSForegroundColorAttributeName] && selectedButtonColor) {
-      selectedAttributes[NSForegroundColorAttributeName] = buttonColor;
+      selectedAttributes[NSForegroundColorAttributeName] = selectedButtonColor;
     }
 
     [viewController.tabBarItem setTitleTextAttributes:selectedAttributes forState:UIControlStateSelected];

ios/RCCViewController.m

@@ -100,54 +100,54 @@ - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children
 {
     NSString *component = props[@"component"];
     if (!component) return nil;
-
+    
     NSDictionary *passProps = props[@"passProps"];
     NSDictionary *navigatorStyle = props[@"style"];
-
+    
     NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
     [mergedProps addEntriesFromDictionary:passProps];
-
+    
     RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
     if (!reactView) return nil;
-
+    
     self = [super init];
     if (!self) return nil;
-
+    
     [self commonInit:reactView navigatorStyle:navigatorStyle props:props];
-
+    
     return self;
 }
 
 - (instancetype)initWithComponent:(NSString *)component passProps:(NSDictionary *)passProps navigatorStyle:(NSDictionary*)navigatorStyle globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge
 {
     NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
     [mergedProps addEntriesFromDictionary:passProps];
-
+    
     RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
     if (!reactView) return nil;
-
+    
     self = [super init];
     if (!self) return nil;
-
+    
     [self commonInit:reactView navigatorStyle:navigatorStyle props:passProps];
-
+    
     return self;
 }
 
 - (void)commonInit:(RCTRootView*)reactView navigatorStyle:(NSDictionary*)navigatorStyle props:(NSDictionary*)props
 {
     self.view = reactView;
-
+    
     self.edgesForExtendedLayout = UIRectEdgeNone; // default
     self.automaticallyAdjustsScrollViewInsets = NO; // default
-
+    
     self.navigatorStyle = [NSMutableDictionary dictionaryWithDictionary:navigatorStyle];
-
+    
     [self setStyleOnInit];
-
+    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRNReload) name:RCTReloadNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onCancelReactTouches) name:RCCViewControllerCancelReactTouchesNotification object:nil];
-
+    
     // In order to support 3rd party native ViewControllers, we support passing a class name as a prop mamed `ExternalNativeScreenClass`
     // In this case, we create an instance and add it as a child ViewController which preserves the VC lifecycle.
     // In case some props are necessary in the native ViewController, the ExternalNativeScreenProps can be used to pass them
@@ -208,7 +208,7 @@ -(void)setStyleOnAppearForViewController:(UIViewController*)viewController appea
         UIColor *color = screenBackgroundColor != (id)[NSNull null] ? [RCTConvert UIColor:screenBackgroundColor] : nil;
         viewController.view.backgroundColor = color;
     }
-
+    
     NSString *navBarBackgroundColor = self.navigatorStyle[@"navBarBackgroundColor"];
     if (navBarBackgroundColor) {
 
@@ -257,18 +257,16 @@ -(void)setStyleOnAppearForViewController:(UIViewController*)viewController appea
     {
         viewController.navigationController.navigationBar.tintColor = nil;
     }
-
-    BOOL viewControllerBasedStatusBar = false;
-
-    NSObject *viewControllerBasedStatusBarAppearance = [[NSBundle mainBundle] infoDictionary][@"UIViewControllerBasedStatusBarAppearance"];
-    if (viewControllerBasedStatusBarAppearance && [viewControllerBasedStatusBarAppearance isKindOfClass:[NSNumber class]]) {
-        viewControllerBasedStatusBar = [(NSNumber *)viewControllerBasedStatusBarAppearance boolValue];
-    }
-
+
+    NSString *statusBarTextColorSchemeSingleScreen = self.navigatorStyle[@"statusBarTextColorSchemeSingleScreen"];
     NSString *statusBarTextColorScheme = self.navigatorStyle[@"statusBarTextColorScheme"];
-    if (statusBarTextColorScheme && [statusBarTextColorScheme isEqualToString:@"light"]) {
+	NSString *finalColorScheme = statusBarTextColorSchemeSingleScreen ? : statusBarTextColorScheme;
+
+    if (finalColorScheme && [finalColorScheme isEqualToString:@"light"]) {
 
-        viewController.navigationController.navigationBar.barStyle = UIBarStyleBlack;
+		if (!statusBarTextColorSchemeSingleScreen) {
+        	viewController.navigationController.navigationBar.barStyle = UIBarStyleBlack;
+		}
         self._statusBarTextColorSchemeLight = true;
         if (!viewControllerBasedStatusBarAppearance) {
             [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
@@ -277,14 +275,16 @@ -(void)setStyleOnAppearForViewController:(UIViewController*)viewController appea
 
     } else {
 
-        viewController.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+		if (!statusBarTextColorSchemeSingleScreen) {
+        	viewController.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+		}
         self._statusBarTextColorSchemeLight = false;
         if (!viewControllerBasedStatusBarAppearance) {
             [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
         }
         [viewController setNeedsStatusBarAppearanceUpdate];
     }
-
+  
     NSNumber *navBarHidden = self.navigatorStyle[@"navBarHidden"];
     BOOL navBarHiddenBool = navBarHidden ? [navBarHidden boolValue] : NO;
     if (viewController.navigationController.navigationBarHidden != navBarHiddenBool) {
@@ -340,28 +340,31 @@ -(void)setStyleOnAppearForViewController:(UIViewController*)viewController appea
 
     NSNumber *navBarTransparent = self.navigatorStyle[@"navBarTransparent"];
     BOOL navBarTransparentBool = navBarTransparent ? [navBarTransparent boolValue] : NO;
-    if (navBarTransparentBool) {
-
-        if (![viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG]) {
-
-            [self storeOriginalNavBarImages];
-
-            [viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-            viewController.navigationController.navigationBar.shadowImage = [UIImage new];
-            UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
-            transparentView.tag = TRANSPARENT_NAVBAR_TAG;
-            [viewController.navigationController.navigationBar insertSubview:transparentView atIndex:0];
+
+    void (^action)() = ^ {
+        if (navBarTransparentBool)
+        {
+            if (![viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG])
+            {
+                [self storeOriginalNavBarImages];
+
+                [viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+                viewController.navigationController.navigationBar.shadowImage = [UIImage new];
+                UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
+                transparentView.tag = TRANSPARENT_NAVBAR_TAG;
+                [viewController.navigationController.navigationBar insertSubview:transparentView atIndex:0];
+            }
         }
-
-    } else {
-
-        UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG];
-        if (transparentView) {
-
-            [transparentView removeFromSuperview];
-            [viewController.navigationController.navigationBar setBackgroundImage:self.originalNavBarImages[@"bgImage"] forBarMetrics:UIBarMetricsDefault];
-            viewController.navigationController.navigationBar.shadowImage = self.originalNavBarImages[@"shadowImage"];
-            self.originalNavBarImages = nil;
+        else
+        {
+            UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG];
+            if (transparentView)
+            {
+                [transparentView removeFromSuperview];
+                [viewController.navigationController.navigationBar setBackgroundImage:self.originalNavBarImages[@"bgImage"] forBarMetrics:UIBarMetricsDefault];
+                viewController.navigationController.navigationBar.shadowImage = self.originalNavBarImages[@"shadowImage"];
+                self.originalNavBarImages = nil;
+            }
         }
     };
 
@@ -416,15 +419,15 @@ -(void)setStyleOnAppearForViewController:(UIViewController*)viewController appea
     } else {
         self.navBarHairlineImageView.hidden = NO;
     }
-
+    
     //Bug fix: in case there is a interactivePopGestureRecognizer, it prevents react-native from getting touch events on the left screen area that the gesture handles
     //overriding the delegate of the gesture prevents this from happening while keeping the gesture intact (another option was to disable it completely by demand)
     self.originalInteractivePopGestureDelegate = nil;
-    if (self.navigationController != nil && self.navigationController.interactivePopGestureRecognizer != nil) {
-        
+    if (self.navigationController != nil && self.navigationController.interactivePopGestureRecognizer != nil)
+    {
         id <UIGestureRecognizerDelegate> interactivePopGestureRecognizer = self.navigationController.interactivePopGestureRecognizer.delegate;
-        if (interactivePopGestureRecognizer != nil) {
-            
+        if (interactivePopGestureRecognizer != nil)
+        {
             self.originalInteractivePopGestureDelegate = interactivePopGestureRecognizer;
             self.navigationController.interactivePopGestureRecognizer.delegate = self;
         }
@@ -449,8 +452,9 @@ -(void)storeOriginalNavBarImages {
 -(void)setStyleOnDisappear
 {
     self.navBarHairlineImageView.hidden = NO;
-
-    if (self.navigationController != nil && self.navigationController.interactivePopGestureRecognizer != nil && self.originalInteractivePopGestureDelegate != nil) {
+
+    if (self.navigationController != nil && self.navigationController.interactivePopGestureRecognizer != nil && self.originalInteractivePopGestureDelegate != nil)
+    {
         self.navigationController.interactivePopGestureRecognizer.delegate = self.originalInteractivePopGestureDelegate;
         self.originalInteractivePopGestureDelegate = nil;
     }
@@ -533,27 +537,30 @@ - (UIImageView *)findHairlineImageViewUnder:(UIView *)view {
 -(void)addExternalVCIfNecessary:(NSDictionary*)props
 {
     NSString *externalScreenClass = props[@"externalNativeScreenClass"];
-    if (externalScreenClass != nil) {
-        
+    if (externalScreenClass != nil)
+    {
         Class class = NSClassFromString(externalScreenClass);
-        if (class != NULL) {
-            
+        if (class != NULL)
+        {
             id obj = [[class alloc] init];
-            if (obj != nil && [obj isKindOfClass:[UIViewController class]] && [obj conformsToProtocol:@protocol(RCCExternalViewControllerProtocol)]) {
-                
+            if (obj != nil && [obj isKindOfClass:[UIViewController class]] && [obj conformsToProtocol:@protocol(RCCExternalViewControllerProtocol)])
+            {
                 ((id <RCCExternalViewControllerProtocol>)obj).controllerDelegate = self;
                 [obj setProps:props[@"externalNativeScreenProps"]];
-
+                
                 UIViewController *viewController = (UIViewController*)obj;
                 [self addChildViewController:viewController];
-                    viewController.view.frame = self.view.bounds;
+                viewController.view.frame = self.view.bounds;
                 [self.view addSubview:viewController.view];
                 [viewController didMoveToParentViewController:self];
-
-            } else {
+            }
+            else
+            {
                 NSLog(@"addExternalVCIfNecessary: could not create instance. Make sure that your class is a UIViewController whihc confirms to RCCExternalViewControllerProtocol");
             }
-        } else {
+        }
+        else
+        {
             NSLog(@"addExternalVCIfNecessary: could not create class from string. Check that the proper class name wass passed in ExternalNativeScreenClass");
         }
     }
@@ -564,19 +571,21 @@ -(void)addExternalVCIfNecessary:(NSDictionary*)props
 - (NSString*) customNewRelicInteractionName
 {
     NSString *interactionName = nil;
-
-    if (self.view != nil && [self.view isKindOfClass:[RCTRootView class]]) {
-        
+    
+    if (self.view != nil && [self.view isKindOfClass:[RCTRootView class]])
+    {
         NSString *moduleName = ((RCTRootView*)self.view).moduleName;
-        if(moduleName != nil) {
+        if(moduleName != nil)
+        {
             interactionName = [NSString stringWithFormat:@"RCCViewController: %@", moduleName];
         }
     }
-
-    if (interactionName == nil) {
+
+    if (interactionName == nil)
+    {
         interactionName = [NSString stringWithFormat:@"RCCViewController with title: %@", self.title];
     }
-
+    
     return interactionName;
 }
 

src/deprecated/platformSpecificDeprecated.android.js

@@ -388,6 +388,7 @@ function addNavigatorParams(screen, navigator = null, idx = '') {
 }
 
 function addNavigatorButtons(screen, sideMenuParams) {
+
   const Screen = Navigation.getRegisteredScreen(screen.screen);
   if (screen.navigatorButtons == null) {
     screen.navigatorButtons = _.cloneDeep(Screen.navigatorButtons);
@@ -514,9 +515,17 @@ function getLeftButtonDeprecated(screen) {
 function getRightButtons(screen) {
   if (screen.navigatorButtons && screen.navigatorButtons.rightButtons) {
     return screen.navigatorButtons.rightButtons;
+  } else if (screen.rightButtons) {
+    return screen.rightButtons
+  }
+
+  const Screen = Navigation.getRegisteredScreen(screen.screen);
+
+  if (Screen.navigatorButtons && !_.isEmpty(Screen.navigatorButtons)) {
+    return _.cloneDeep(Screen.navigatorButtons);
   }
 
-  return screen.rightButtons;
+  return null;
 }
 
 function addNavigationStyleParams(screen) {