Implement setStyle on Android (#1168)

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -96,6 +96,11 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
         NavigationCommandsHandler.setScreenFab(screenInstanceId, navigatorEventId, fabParams);
     }
 
+    @ReactMethod
+    public void setScreenStyle(String screenInstanceId, ReadableMap style) {
+        NavigationCommandsHandler.setScreenStyle(screenInstanceId, BundleConverter.toBundle(style));
+    }
+
     @ReactMethod
     public void setBottomTabBadgeByIndex(Integer index, String badge) {
         NavigationCommandsHandler.setBottomTabBadgeByIndex(index, badge);

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation.controllers;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Build;
+import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Window;
 import android.view.WindowManager;
@@ -56,6 +57,10 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         layout.setFab(screenInstanceId, navigatorEventId, fab);
     }
 
+    void updateScreenStyle(String screenInstanceId, Bundle styleParams) {
+        layout.updateScreenStyle(screenInstanceId, styleParams);
+    }
+
     public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
         layout.showContextualMenu(screenInstanceId, params, onButtonClicked);
     }

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.controllers;
 
+import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Window;
 
@@ -130,6 +131,12 @@ class ModalController implements ScreenStackContainer, Modal.OnModalDismissedLis
         }
     }
 
+    void updateScreenStyle(String screenInstanceId, Bundle styleParams) {
+        for (Modal modal : stack) {
+            modal.updateScreenStyle(screenInstanceId, styleParams);
+        }
+    }
+
     public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
         for (Modal modal : stack) {
             modal.showContextualMenu(screenInstanceId, params, onButtonClicked);

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -291,6 +291,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         modalController.setFab(screenInstanceId, navigatorEventId, fab);
     }
 
+    public void setScreenStyle(String screenInstanceId, Bundle styleParams) {
+        layout.updateScreenStyle(screenInstanceId, styleParams);
+        modalController.updateScreenStyle(screenInstanceId, styleParams);
+    }
+
     public void toggleSideMenuVisible(boolean animated, Side side) {
         layout.toggleSideMenuVisible(animated, side);
     }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -247,6 +247,19 @@ public class NavigationCommandsHandler {
         });
     }
 
+    public static void setScreenStyle(final String screenInstanceId, final Bundle styleParams) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.setScreenStyle(screenInstanceId, styleParams);
+            }
+        });
+    }
+
     public static void dismissTopModal() {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.layouts;
 
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
@@ -195,6 +196,13 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
         }
     }
 
+    @Override
+    public void updateScreenStyle(String screenInstanceId, Bundle styleParams) {
+        for (int i = 0; i < bottomTabs.getItemsCount(); i++) {
+            screenStacks[i].updateScreenStyle(screenInstanceId, styleParams);
+        }
+    }
+
     @Override
     public void selectTopTabByTabIndex(String screenInstanceId, int index) {
         for (int i = 0; i < bottomTabs.getItemsCount(); i++) {

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.layouts;
 
+import android.os.Bundle;
 import android.view.View;
 
 import com.facebook.react.bridge.Callback;
@@ -61,4 +62,6 @@ public interface Layout extends ScreenStackContainer {
     void selectTopTabByTabIndex(String screenInstanceId, int index);
 
     void selectTopTabByScreen(String screenInstanceId);
+
+    void updateScreenStyle(String screenInstanceId, Bundle styleParams);
 }

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.layouts;
 
+import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
@@ -260,6 +261,11 @@ public class SingleScreenLayout extends BaseLayout {
         stack.selectTopTabByScreen(screenInstanceId);
     }
 
+    @Override
+    public void updateScreenStyle(String screenInstanceId, Bundle styleParams) {
+        stack.updateScreenStyle(screenInstanceId, styleParams);
+    }
+
     @Override
     public void showSlidingOverlay(final SlidingOverlayParams params) {
         slidingOverlaysQueue.add(new SlidingOverlay(this, params));

android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java

@@ -7,6 +7,11 @@ import android.support.annotation.ColorInt;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
 public class StyleParams {
+    public Bundle params;
+
+    public StyleParams(Bundle params) {
+        this.params = params;
+    }
     public static class Color {
         @ColorInt
         private Integer color = null;

android/app/src/main/java/com/reactnativenavigation/params/TitleBarButtonParams.java

@@ -10,8 +10,7 @@ public class TitleBarButtonParams extends BaseTitleBarButtonParams {
         font = styleParams.titleBarTitleFont;
     }
 
-    public boolean hasFont()
-    {
+    public boolean hasFont() {
         return font != null && font.hasFont();
     }
 }

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

@@ -14,12 +14,17 @@ public class StyleParamsParser {
         this.params = params;
     }
 
+    public StyleParamsParser merge(Bundle b) {
+        params.putAll(b);
+        return this;
+    }
+
     public StyleParams parse() {
         if (params == null) {
             return createDefaultStyleParams();
         }
 
-        StyleParams result = new StyleParams();
+        StyleParams result = new StyleParams(params);
         result.orientation = Orientation.fromString(params.getString("orientation", getDefaultOrientation()));
         result.statusBarColor = getColor("statusBarColor", getDefaultStatusBarColor());
         result.contextualMenuStatusBarColor = getColor("contextualMenuStatusBarColor", getDefaultContextualMenuStatusBarColor());
@@ -85,7 +90,7 @@ public class StyleParamsParser {
     }
 
     private StyleParams createDefaultStyleParams() {
-        StyleParams result = new StyleParams();
+        StyleParams result = new StyleParams(Bundle.EMPTY);
         result.titleBarDisabledButtonColor = getTitleBarDisabledButtonColor();
         result.topBarElevationShadowEnabled = true;
         result.titleBarHideOnScroll = false;

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

@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Build;
+import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Window;
 import android.widget.RelativeLayout;
@@ -25,6 +26,7 @@ import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.params.parsers.StyleParamsParser;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
@@ -50,7 +52,7 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
     private final LeftButtonOnClickListener leftButtonOnClickListener;
     private VisibilityAnimator topBarVisibilityAnimator;
     private ScreenAnimator screenAnimator;
-    protected final StyleParams styleParams;
+    protected StyleParams styleParams;
     public final SharedElements sharedElements;
 
     public Screen(AppCompatActivity activity, ScreenParams screenParams, LeftButtonOnClickListener leftButtonOnClickListener) {
@@ -80,6 +82,21 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
         }
     }
 
+    public void updateVisibleScreenStyle(Bundle styleParams) {
+        updateStyle(styleParams);
+        setStyle();
+    }
+
+    public void updateInvisibleScreenStyle(Bundle styleParams) {
+        updateStyle(styleParams);
+    }
+
+    private void updateStyle(Bundle styleParams) {
+        screenParams.styleParams = new StyleParamsParser(screenParams.styleParams.params).merge(styleParams).parse();
+        this.styleParams = screenParams.styleParams;
+        topBar.setButtonColor(this.styleParams);
+    }
+
     public void setStyle() {
         setStatusBarColor(styleParams.statusBarColor);
         setNavigationBarColor(styleParams.navigationBarColor);
@@ -233,7 +250,7 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
         }
 
         for (TitleBarButtonParams titleBarButtonParam : titleBarButtonParams) {
-            titleBarButtonParam.setStyleFromScreen(screenParams.styleParams);
+            titleBarButtonParam.setStyleFromScreen(styleParams);
         }
     }
 

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.screens;
 
+import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
@@ -340,6 +341,23 @@ public class ScreenStack {
         });
     }
 
+    public void updateScreenStyle(String screenInstanceId, final Bundle styleParams) {
+        performOnScreen(screenInstanceId, new Task<Screen>() {
+            @Override
+            public void run(Screen screen) {
+                if (isScreenVisible(screen)) {
+                    screen.updateVisibleScreenStyle(styleParams);
+                } else {
+                    screen.updateInvisibleScreenStyle(styleParams);
+                }
+            }
+        });
+    }
+
+    private boolean isScreenVisible(Screen screen) {
+        return isStackVisible && peek() == screen;
+    }
+
     public void showContextualMenu(String screenInstanceId, final ContextualMenuParams params, final Callback onButtonClicked) {
         performOnScreen(screenInstanceId, new Task<Screen>() {
             @Override

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

@@ -25,6 +25,7 @@ public class TitleBar extends Toolbar {
     private static final int TITLE_VISIBILITY_ANIMATION_DURATION = 320;
     private LeftButton leftButton;
     private ActionMenuView actionMenuView;
+    private List<TitleBarButtonParams> rightButtons;
 
     public TitleBar(Context context) {
         super(context);
@@ -44,12 +45,13 @@ public class TitleBar extends Toolbar {
     }
 
     public void setRightButtons(List<TitleBarButtonParams> rightButtons, String navigatorEventId) {
+        this.rightButtons = rightButtons;
         Menu menu = getMenu();
         menu.clear();
         if (rightButtons == null) {
             return;
         }
-        addButtonsToTitleBar(rightButtons, navigatorEventId, menu);
+        addButtonsToTitleBar(navigatorEventId, menu);
     }
 
     public void setLeftButton(TitleBarLeftButtonParams leftButtonParams,
@@ -141,7 +143,7 @@ public class TitleBar extends Toolbar {
         }
     }
 
-    private void addButtonsToTitleBar(List<TitleBarButtonParams> rightButtons, String navigatorEventId, Menu menu) {
+    private void addButtonsToTitleBar(String navigatorEventId, Menu menu) {
         for (int i = 0; i < rightButtons.size(); i++) {
             final TitleBarButton button = ButtonFactory.create(menu, this, rightButtons.get(i), navigatorEventId);
             addButtonInReverseOrder(rightButtons, i, button);
@@ -245,4 +247,45 @@ public class TitleBar extends Toolbar {
             }
         });
     }
+
+    public void setButtonColor(StyleParams.Color titleBarButtonColor) {
+        if (!titleBarButtonColor.hasColor()) {
+            return;
+        }
+        updateButtonColor(titleBarButtonColor);
+        setButtonsIconColor();
+        setButtonTextColor();
+    }
+
+    private void updateButtonColor(StyleParams.Color titleBarButtonColor) {
+        for (TitleBarButtonParams rightButton : rightButtons) {
+            rightButton.color = titleBarButtonColor;
+        }
+    }
+
+    private void setButtonTextColor() {
+        final ActionMenuView buttonsContainer = ViewUtils.findChildByClass(this, ActionMenuView.class);
+        if (buttonsContainer != null) {
+            for (int i = 0; i < buttonsContainer.getChildCount(); i++) {
+                if (buttonsContainer.getChildAt(i) instanceof TextView) {
+                    ((TextView) buttonsContainer.getChildAt(i)).setTextColor(getButton(i).getColor().getColor());
+                }
+            }
+        }
+    }
+
+    private void setButtonsIconColor() {
+        final Menu menu = getMenu();
+        for (int i = 0; i < menu.size(); i++) {
+            if (menu.getItem(i).getIcon() != null) {
+                ViewUtils.tintDrawable(menu.getItem(i).getIcon(),
+                        getButton(i).getColor().getColor(),
+                        getButton(i).enabled);
+            }
+        }
+    }
+
+    BaseTitleBarButtonParams getButton(int index) {
+        return rightButtons.get(rightButtons.size() - index - 1);
+    }
 }

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

@@ -66,6 +66,10 @@ public class TopBar extends AppBarLayout {
         titleBar.setSubtitle(subtitle);
     }
 
+    public void setButtonColor(StyleParams styleParams) {
+        titleBar.setButtonColor(styleParams.titleBarButtonColor);
+    }
+
     public void setStyle(StyleParams styleParams) {
         if (styleParams.topBarColor.hasColor()) {
             setBackgroundColor(styleParams.topBarColor.getColor());

src/Screen.js

@@ -89,11 +89,7 @@ class Navigator {
   }
 
   setStyle(params = {}) {
-    if (Platform.OS === 'ios') {
-      return platformSpecific.navigatorSetStyle(this, params);
-    } else {
-      console.log(`Setting style isn\'t supported on ${Platform.OS} yet`);
-    }
+    return platformSpecific.navigatorSetStyle(this, params);
   }
 
   toggleDrawer(params = {}) {

src/deprecated/platformSpecificDeprecated.android.js

@@ -342,6 +342,11 @@ function navigatorSetSubtitle(navigator, params) {
   newPlatformSpecific.setScreenTitleBarSubtitle(navigator.screenInstanceID, params.subtitle);
 }
 
+function navigatorSetStyle(navigator, params) {
+  const style = convertStyleParams(params);
+  newPlatformSpecific.setScreenStyle(navigator.screenInstanceID, style);
+}
+
 function navigatorSwitchToTab(navigator, params) {
   if (params.tabIndex >= 0) {
     newPlatformSpecific.selectBottomTabByTabIndex(params.tabIndex);
@@ -668,6 +673,7 @@ export default {
   navigatorSetTabBadge,
   navigatorSetTitle,
   navigatorSetSubtitle,
+  navigatorSetStyle,
   navigatorSwitchToTab,
   navigatorSwitchToTopTab,
   navigatorToggleDrawer,

src/platformSpecific.android.js

@@ -161,6 +161,10 @@ function dismissContextualMenu(screenInstanceID) {
   NativeReactModule.dismissContextualMenu(screenInstanceID);
 }
 
+function setScreenStyle(screenInstanceId, style) {
+  NativeReactModule.setScreenStyle(screenInstanceId, style);
+}
+
 module.exports = {
   startApp,
   push,
@@ -190,5 +194,6 @@ module.exports = {
   showSnackbar,
   dismissSnackbar,
   showContextualMenu,
-  dismissContextualMenu
+  dismissContextualMenu,
+  setScreenStyle
 };