Revert "SetStyle fix (#2539)"

This reverts commit 883dcfe49f.

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -16,7 +16,6 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.events.Event;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.params.ActivityParams;
@@ -230,8 +229,6 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
         for (int i = 0; i < bottomTabs.getItemsCount(); i++) {
             screenStacks[i].updateScreenStyle(screenInstanceId, styleParams);
         }
-
-        bottomTabs.setStyleFromScreen(this.getCurrentScreen().getStyleParams());
     }
 
     @Override
@@ -363,7 +360,7 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
 
     private boolean hasBackgroundColor(StyleParams params) {
         return params.screenBackgroundColor != null &&
-                params.screenBackgroundColor.hasColor();
+            params.screenBackgroundColor.hasColor();
     }
 
     private void setStyleFromScreen(StyleParams params) {
@@ -394,7 +391,7 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
         performOnStack(params.getNavigatorId(), new Task<ScreenStack>() {
             @Override
             public void run(ScreenStack stack) {
-                stack.pop(params.animateScreenTransitions, params.timestamp, new ScreenStack.OnScreenPop() {
+            stack.pop(params.animateScreenTransitions, params.timestamp, new ScreenStack.OnScreenPop() {
                     @Override
                     public void onScreenPopAnimationEnd() {
                         setBottomTabsStyleFromCurrentScreen();
@@ -453,8 +450,8 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
             task.run(screenStack);
         } catch (ScreenStackNotFoundException e) {
             Log.e("Navigation", "Could not perform action on stack [" + navigatorId + "]." +
-                    "This should not have happened, it probably means a navigator action" +
-                    "was called from an unmounted tab.");
+                                      "This should not have happened, it probably means a navigator action" +
+                                      "was called from an unmounted tab.");
         }
     }
 

android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java

@@ -131,14 +131,6 @@ public class StyleParamsParser {
         result.titleBarHeight = -1;
         result.screenAnimationType = "slide-up";
         result.drawUnderStatusBar = false;
-
-        result.bottomTabsColor = getDefaultBottomTabsColor();
-        result.bottomTabsButtonColor = getDefaultBottomTabsButtonColor();
-        result.selectedBottomTabsButtonColor = getDefaultSelectedBottomTabsButtonColor();
-
-        result.bottomTabBadgeTextColor = getBottomTabBadgeTextColor();
-        result.bottomTabBadgeBackgroundColor = getBottomTabBadgeBackgroundColor();
-
         return result;
     }
 

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -216,7 +216,7 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
     }
 
     public void setTitleBarTitle(String title) {
-        topBar.setTitle(title, styleParams);
+       topBar.setTitle(title, styleParams);
     }
 
     public void setTitleBarSubtitle(String subtitle) {

android/app/src/main/java/com/reactnativenavigation/views/BottomTabs.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.views;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
@@ -11,7 +10,6 @@ import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.params.AppStyle;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
-import com.reactnativenavigation.params.parsers.StyleParamsParser;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.utils.Constants;
 
@@ -23,17 +21,17 @@ public class BottomTabs extends AHBottomNavigation {
 
     public BottomTabs(Context context) {
         super(context);
-
         setForceTint(true);
         setId(ViewUtils.generateViewId());
         createVisibilityAnimator();
-        setStyle(AppStyle.appStyle);
+        setStyle();
         setFontFamily();
     }
 
     public void addTabs(List<ScreenParams> params, OnTabSelectedListener onTabSelectedListener) {
         for (ScreenParams screenParams : params) {
-            AHBottomNavigationItem item = new AHBottomNavigationItem(screenParams.tabLabel, screenParams.tabIcon, Color.GRAY);
+            AHBottomNavigationItem item = new AHBottomNavigationItem(screenParams.tabLabel, screenParams.tabIcon,
+                    Color.GRAY);
             addItem(item);
             setOnTabSelectedListener(onTabSelectedListener);
         }
@@ -41,7 +39,19 @@ public class BottomTabs extends AHBottomNavigation {
     }
 
     public void setStyleFromScreen(StyleParams params) {
-        this.setStyle(params);
+        if (params.bottomTabsColor.hasColor()) {
+            setBackgroundColor(params.bottomTabsColor);
+        }
+        if (params.bottomTabsButtonColor.hasColor()) {
+            if (getInactiveColor() != params.bottomTabsButtonColor.getColor()) {
+                setInactiveColor(params.bottomTabsButtonColor.getColor());
+            }
+        }
+        if (params.selectedBottomTabsButtonColor.hasColor()) {
+            if (getAccentColor() != params.selectedBottomTabsButtonColor.getColor()) {
+                setAccentColor(params.selectedBottomTabsButtonColor.getColor());
+            }
+        }
 
         setVisibility(params.bottomTabsHidden, true);
     }
@@ -122,27 +132,23 @@ public class BottomTabs extends AHBottomNavigation {
                 Constants.BOTTOM_TABS_HEIGHT);
     }
 
-    private void setStyle(StyleParams params) {
-        if (params.bottomTabBadgeBackgroundColor.hasColor()) {
+    private void setStyle() {
+        if (hasBadgeBackgroundColor()) {
             setNotificationBackgroundColor(AppStyle.appStyle.bottomTabBadgeBackgroundColor.getColor());
         }
-        if (params.bottomTabBadgeTextColor.hasColor()) {
+        if (hasBadgeTextColor()) {
             setNotificationTextColor(AppStyle.appStyle.bottomTabBadgeTextColor.getColor());
         }
+    }
 
-        if (params.bottomTabsColor.hasColor()) {
-            setBackgroundColor(params.bottomTabsColor);
-        }
-        if (params.bottomTabsButtonColor.hasColor()) {
-            if (getInactiveColor() != params.bottomTabsButtonColor.getColor()) {
-                setInactiveColor(params.bottomTabsButtonColor.getColor());
-            }
-        }
-        if (params.selectedBottomTabsButtonColor.hasColor()) {
-            if (getAccentColor() != params.selectedBottomTabsButtonColor.getColor()) {
-                setAccentColor(params.selectedBottomTabsButtonColor.getColor());
-            }
-        }
+    private boolean hasBadgeTextColor() {
+        return AppStyle.appStyle.bottomTabBadgeTextColor != null &&
+               AppStyle.appStyle.bottomTabBadgeTextColor.hasColor();
+    }
+
+    private boolean hasBadgeBackgroundColor() {
+        return AppStyle.appStyle.bottomTabBadgeBackgroundColor != null &&
+               AppStyle.appStyle.bottomTabBadgeBackgroundColor.hasColor();
     }
 
     private void setFontFamily() {

ios/RCCNavigationController.m

@@ -339,25 +339,23 @@ NSString const *CALLBACK_ASSOCIATED_ID = @"RCCNavigationController.CALLBACK_ASSO
   // setStyle
   if ([performAction isEqualToString:@"setStyle"])
   {
-    for (UIViewController *viewController in self.viewControllers) {
-      if ([viewController isKindOfClass:[RCCViewController class]])
-      {
-        RCCViewController *rccViewController = (RCCViewController*)viewController;
-        
-        NSDictionary *navigatorStyle = [[NSDictionary alloc] initWithDictionary:actionParams copyItems:YES];
-        NSMutableDictionary *mergedStyle = [NSMutableDictionary dictionaryWithDictionary:rccViewController.navigatorStyle];
-        
-        // there are a few styles that we don't want to remember from our parent (they should be local)
-        [mergedStyle setValuesForKeysWithDictionary:navigatorStyle];
-        
-        rccViewController.navigatorStyle = mergedStyle;
-        
-        [rccViewController setStyleOnInit];
-        
-        if (viewController == self.topViewController) {
-          [rccViewController updateStyle];
-        }
-      }
+    
+    NSDictionary *navigatorStyle = actionParams;
+    
+    // merge the navigatorStyle of our parent
+    if ([self.topViewController isKindOfClass:[RCCViewController class]])
+    {
+      RCCViewController *parent = (RCCViewController*)self.topViewController;
+      NSMutableDictionary *mergedStyle = [NSMutableDictionary dictionaryWithDictionary:parent.navigatorStyle];
+      
+      // there are a few styles that we don't want to remember from our parent (they should be local)
+      [mergedStyle setValuesForKeysWithDictionary:navigatorStyle];
+      navigatorStyle = mergedStyle;
+      
+      parent.navigatorStyle = navigatorStyle;
+      
+      [parent setStyleOnInit];
+      [parent updateStyle];
     }
   }
 }

ios/RCCTabBarController.h

@@ -5,7 +5,6 @@
 
 - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge;
 - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge completion:(void (^)(void))completion;
-+ (UIImage *)image:(UIImage*)image withColor:(UIColor *)color1;
 
 @property (nonatomic) BOOL tabBarHidden;
 

ios/RCCTabBarController.m

@@ -55,7 +55,7 @@
   return YES;
 }
 
-+ (UIImage *)image:(UIImage*)image withColor:(UIColor *)color1
+- (UIImage *)image:(UIImage*)image withColor:(UIColor *)color1
 {
   UIGraphicsBeginImageContextWithOptions(image.size, NO, image.scale);
   CGContextRef context = UIGraphicsGetCurrentContext();
@@ -159,7 +159,7 @@
       iconImage = [RCTConvert UIImage:icon];
       if (buttonColor)
       {
-        iconImage = [[RCCTabBarController image:iconImage withColor:buttonColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        iconImage = [[self image:iconImage withColor:buttonColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
       }
     }
     UIImage *iconImageSelected = nil;
@@ -327,7 +327,7 @@
       if (icon && icon != (id)[NSNull null])
       {
         iconImage = [RCTConvert UIImage:icon];
-        iconImage = [[RCCTabBarController image:iconImage withColor:self.tabBar.tintColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        iconImage = [[self image:iconImage withColor:self.tabBar.tintColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         viewController.tabBarItem.image = iconImage;
       }
       

ios/RCCViewController.m

@@ -478,95 +478,11 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
     [viewController setNeedsStatusBarAppearanceUpdate];
   }
   
-  if (viewController.tabBarController && viewController.tabBarController.tabBar != (id)[NSNull null]) {
+  NSNumber *tabBarHidden = self.navigatorStyle[@"tabBarHidden"];
+  BOOL tabBarHiddenBool = tabBarHidden ? [tabBarHidden boolValue] : NO;
+  if (tabBarHiddenBool) {
     UITabBar *tabBar = viewController.tabBarController.tabBar;
-    
-    if (tabBar && tabBar != (id)[NSNull null]) {
-      UIColor *buttonColor = nil;
-      UIColor *selectedButtonColor = nil;
-      UIColor *labelColor = nil;
-      UIColor *selectedLabelColor = nil;
-      
-      NSNumber *tabBarHidden = self.navigatorStyle[@"tabBarHidden"];
-      BOOL tabBarHiddenBool = tabBarHidden ? [tabBarHidden boolValue] : NO;
-      if (tabBarHiddenBool) {
-        tabBar.transform = CGAffineTransformMakeTranslation(0, tabBar.frame.size.height);
-      }
-      
-      NSString *tabBarButtonColor = self.navigatorStyle[@"tabBarButtonColor"];
-      NSString *tabBarSelectedButtonColor = self.navigatorStyle[@"tabBarSelectedButtonColor"];
-      
-      if (tabBarButtonColor)
-      {
-        buttonColor = tabBarButtonColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarButtonColor] : nil;
-        
-        if (tabBarSelectedButtonColor) {
-          selectedButtonColor = tabBarSelectedButtonColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarSelectedButtonColor] : nil;
-          
-          tabBar.tintColor = selectedLabelColor = selectedButtonColor;
-          tabBar.unselectedItemTintColor = labelColor = buttonColor;
-        }
-        else {
-          tabBar.tintColor = labelColor = buttonColor;
-        }
-      }
-      else if (tabBarSelectedButtonColor) {
-        selectedButtonColor = tabBarSelectedButtonColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarSelectedButtonColor] : nil;
-        tabBar.tintColor = selectedLabelColor = selectedButtonColor;
-      }
-      
-      NSString *tabBarLabelColor = self.navigatorStyle[@"tabBarLabelColor"];
-      if(tabBarLabelColor) {
-        UIColor *color = tabBarLabelColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarLabelColor] : nil;
-        labelColor = color;
-      }
-      NSString *tabBarSelectedLabelColor = self.navigatorStyle[@"tabBarSelectedLabelColor"];
-      if(tabBarLabelColor) {
-        UIColor *color = tabBarSelectedLabelColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarSelectedLabelColor] : nil;
-        selectedLabelColor = color;
-      }
-      
-      NSString *tabBarBackgroundColor = self.navigatorStyle[@"tabBarBackgroundColor"];
-      if (tabBarBackgroundColor)
-      {
-        UIColor *color = tabBarBackgroundColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarBackgroundColor] : nil;
-        tabBar.barTintColor = color;
-      }
-      
-      NSNumber *tabBarTranslucent = self.navigatorStyle[@"tabBarTranslucent"];
-      if (tabBarTranslucent)
-      {
-        BOOL tabBarTranslucentBool = tabBarTranslucent ? [tabBarTranslucent boolValue] : NO;
-        tabBar.translucent = tabBarTranslucentBool;
-      }
-      
-      NSNumber *tabBarHideShadow = self.navigatorStyle[@"tabBarHideShadow"];
-      if (tabBarHideShadow)
-      {
-        BOOL tabBarHideShadowBool = tabBarHideShadow ? [tabBarHideShadow boolValue] : NO;
-        tabBar.clipsToBounds = tabBarHideShadowBool ? YES : NO;
-      }
-      
-      for (UIViewController *tabViewController in [viewController.tabBarController viewControllers]) {
-        NSMutableDictionary *unselectedAttributes = [RCTHelpers textAttributesFromDictionary:self.navigatorStyle withPrefix:@"tabBarText" baseFont:[UIFont systemFontOfSize:10]];
-        if (!unselectedAttributes[NSForegroundColorAttributeName] && labelColor) {
-          unselectedAttributes[NSForegroundColorAttributeName] = labelColor;
-        }
-        [tabViewController.tabBarItem setTitleTextAttributes:unselectedAttributes forState:UIControlStateNormal];
-        
-        
-        NSMutableDictionary *selectedAttributes = [RCTHelpers textAttributesFromDictionary:self.navigatorStyle withPrefix:@"tabBarSelectedText" baseFont:[UIFont systemFontOfSize:10]];
-        if (!selectedAttributes[NSForegroundColorAttributeName] && selectedLabelColor) {
-          selectedAttributes[NSForegroundColorAttributeName] = selectedLabelColor;
-        }
-        [tabViewController.tabBarItem setTitleTextAttributes:selectedAttributes forState:UIControlStateSelected];
-        
-        if (buttonColor)
-        {
-          tabViewController.tabBarItem.image = [[RCCTabBarController image:tabViewController.tabBarItem.image withColor:buttonColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-        }
-      }
-    }
+    tabBar.transform = CGAffineTransformMakeTranslation(0, tabBar.frame.size.height);
   }
 
   NSNumber *navBarHidden = self.navigatorStyle[@"navBarHidden"];