AppStyle

android/app/build.gradle

@@ -46,7 +46,7 @@ allprojects { p ->
 
 dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.aurelhubert:ahbottomnavigation:1.3.0"
+    compile "com.aurelhubert:ahbottomnavigation:1.3.3"
     compile "com.android.support:appcompat-v7:23.0.1"
     compile 'com.android.support:design:23.1.1'
     compile "com.facebook.react:react-native:+"  // From node_modules

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

@@ -11,7 +11,7 @@ public class ScreenParams {
     public List<TitleBarButtonParams> rightButtons;
     public TitleBarLeftButtonParams leftButton;
     public String title;
-    public ScreenStyleParams styleParams;
+    public StyleParams styleParams;
     public List<TopTabParams> topTabParams;
     public String fragmentCreatorClassName;
 

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

@@ -2,7 +2,7 @@ package com.reactnativenavigation.params;
 
 import android.support.annotation.ColorInt;
 
-public class ScreenStyleParams {
+public class StyleParams {
     public static class Color {
         @ColorInt
         private int color = -1;
@@ -41,5 +41,5 @@ public class ScreenStyleParams {
 
     public Color navigationBarColor;
 
-    public boolean drawBelowTopBar;
+    public boolean drawScreenBelowTopBar;
 }

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

@@ -20,7 +20,7 @@ public class TitleBarButtonParams {
     public String eventId;
     public String label;
     public Drawable icon;
-    public ScreenStyleParams.Color color;
+    public StyleParams.Color color;
     public ShowAsAction showAsAction;
     public boolean enabled = true;
 }

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

@@ -3,10 +3,14 @@ package com.reactnativenavigation.params.parsers;
 import android.os.Bundle;
 
 import com.reactnativenavigation.params.ActivityParams;
+import com.reactnativenavigation.params.StyleParams;
 
 public class ActivityParamsParser extends Parser {
     public static ActivityParams parse(Bundle params) {
         ActivityParams result = new ActivityParams();
+
+        StyleParamsParser.setAppStyle(params);
+
         if (hasKey(params, "screen")) {
             result.type = ActivityParams.Type.SingleScreen;
             result.screenParams = ScreenParamsParser.parse(params.getBundle("screen"));

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

@@ -38,7 +38,7 @@ public class ScreenParamsParser extends Parser {
             result.leftButton = new TitleBarLeftButtonParamsParser().parseSingleButton(params.getBundle(KEY_LEFT_BUTTON));
         }
         result.title = params.getString(KEY_TITLE);
-        result.styleParams = ScreenStyleParamsParser.parse(params.getBundle(STYLE_PARAMS));
+        result.styleParams = new StyleParamsParser(params.getBundle(STYLE_PARAMS)).parse();
         if (hasKey(params, TOP_TABS)) {
             result.topTabParams = TopTabParamsParser.parse(params.getBundle(TOP_TABS));
         }

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

@@ -1,32 +0,0 @@
-package com.reactnativenavigation.params.parsers;
-
-import android.os.Bundle;
-
-import com.reactnativenavigation.params.ScreenStyleParams;
-
-public class ScreenStyleParamsParser {
-    public static ScreenStyleParams parse(Bundle params) {
-        ScreenStyleParams result = new ScreenStyleParams();
-        if (params == null) {
-            return result;
-        }
-
-        result.statusBarColor = new ScreenStyleParams.Color(ColorParser.parse(params.getString("statusBarColor")));
-        result.topBarColor = new ScreenStyleParams.Color(ColorParser.parse(params.getString("topBarColor")));
-        result.navigationBarColor = new ScreenStyleParams.Color(ColorParser.parse(params.getString("navigationBarColor")));
-        result.titleBarHidden = params.getBoolean("titleBarHidden");
-        result.titleBarTitleColor =
-                new ScreenStyleParams.Color(ColorParser.parse(params.getString("titleBarTitleColor")));
-        result.backButtonHidden = params.getBoolean("backButtonHidden");
-        result.topTabsHidden = params.getBoolean("topTabsHidden");
-        result.bottomTabsHidden = params.getBoolean("bottomTabsHidden");
-        result.bottomTabsHiddenOnScroll = params.getBoolean("bottomTabsHiddenOnScroll");
-        result.bottomTabsColor = new ScreenStyleParams.Color(ColorParser.parse(params.getString("bottomTabsColor")));
-        result.bottomTabsButtonColor =
-                new ScreenStyleParams.Color(ColorParser.parse(params.getString("bottomTabsButtonColor")));
-        result.selectedBottomTabsButtonColor =
-                new ScreenStyleParams.Color(ColorParser.parse(params.getString("selectedBottomTabsButtonColor")));
-        result.drawBelowTopBar = params.getBoolean("drawBelowTopBar", false);
-        return result;
-    }
-}

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

@@ -0,0 +1,122 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.reactnativenavigation.params.StyleParams;
+
+public class StyleParamsParser {
+    private static StyleParams appStyle;
+    private Bundle params;
+
+    public static void setAppStyle(Bundle params) {
+        StyleParamsParser.appStyle = new StyleParamsParser(params.getBundle("appStyle")).parse();
+    }
+
+    public StyleParamsParser(Bundle params) {
+        this.params = params;
+    }
+
+    public StyleParams parse() {
+        StyleParams result = new StyleParams();
+        if (params == null) {
+            return result;
+        }
+
+        result.statusBarColor = getColor("statusBarColor", getDefaultStatusBarColor());
+
+        result.topBarColor = getColor("topBarColor", getDefaultTopBarColor());
+        result.titleBarHidden = getBoolean("titleBarHidden", isDefaultTopBarHidden());
+        result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
+        result.backButtonHidden = getBoolean("backButtonHidden", isDefaultBackButtonHidden());
+        result.topTabsHidden = getBoolean("topTabsHidden", isDefaultTopTabsHidden());
+
+        result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", isDefaultScreenBelowTopBar());
+
+        result.bottomTabsHidden = getBoolean("bottomTabsHidden", isDefaultBottomTabsHidden());
+        result.bottomTabsHiddenOnScroll =
+                getBoolean("bottomTabsHiddenOnScroll", isDefaultBottomTabsHiddenOnScroll());
+        result.bottomTabsColor = getColor("bottomTabsColor", getDefaultBottomTabsColor());
+        result.bottomTabsButtonColor = getColor("bottomTabsButtonColor", getDefaultBottomTabsButtonColor());
+        result.selectedBottomTabsButtonColor =
+                getColor("selectedBottomTabsButtonColor", getDefaultSelectedBottomTabsButtonColor());
+
+        result.navigationBarColor = getColor("navigationBarColor", getDefaultNavigationColor());
+
+        return result;
+    }
+
+    @Nullable
+    private StyleParams.Color getDefaultNavigationColor() {
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.navigationBarColor;
+    }
+
+    @Nullable
+    private StyleParams.Color getDefaultSelectedBottomTabsButtonColor() {
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.selectedBottomTabsButtonColor;
+    }
+
+    @Nullable
+    private StyleParams.Color getDefaultBottomTabsButtonColor() {
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.bottomTabsButtonColor;
+    }
+
+    @Nullable
+    private StyleParams.Color getDefaultBottomTabsColor() {
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.bottomTabsColor;
+    }
+
+    private boolean isDefaultBottomTabsHiddenOnScroll() {
+        return appStyle != null && appStyle.bottomTabsHiddenOnScroll;
+    }
+
+    private boolean isDefaultBottomTabsHidden() {
+        return appStyle != null && appStyle.bottomTabsHidden;
+    }
+
+    private boolean isDefaultScreenBelowTopBar() {
+        return appStyle == null || appStyle.drawScreenBelowTopBar;
+    }
+
+    private boolean isDefaultTopTabsHidden() {
+        return appStyle != null && appStyle.topTabsHidden;
+    }
+
+    private boolean isDefaultBackButtonHidden() {
+        return appStyle != null && appStyle.backButtonHidden;
+    }
+
+    @Nullable
+    private StyleParams.Color getDefaultTitleBarColor() {
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.titleBarTitleColor;
+    }
+
+    private boolean isDefaultTopBarHidden() {
+        return appStyle != null && appStyle.titleBarHidden;
+    }
+
+    @Nullable
+    private StyleParams.Color getDefaultTopBarColor() {
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.topBarColor;
+    }
+
+    @Nullable
+    private StyleParams.Color getDefaultStatusBarColor() {
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.statusBarColor;
+    }
+
+    private boolean getBoolean(String titleBarHidden, boolean defaultValue) {
+        return params.containsKey(titleBarHidden) ? params.getBoolean(titleBarHidden) : defaultValue;
+    }
+
+    @NonNull
+    private StyleParams.Color getColor(String key, StyleParams.Color defaultColor) {
+        StyleParams.Color color = new StyleParams.Color(ColorParser.parse(params.getString(key)));
+        if (color.hasColor()) {
+            return color;
+        } else {
+            return defaultColor.hasColor() ? defaultColor : color;
+        }
+    }
+}

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

@@ -2,7 +2,7 @@ package com.reactnativenavigation.params.parsers;
 
 import android.os.Bundle;
 
-import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.react.ImageLoader;
 
@@ -25,7 +25,7 @@ public class TitleBarButtonParamsParser extends Parser {
         if (hasKey(bundle,"icon")) {
             result.icon = ImageLoader.loadImage(bundle.getString("icon"));
         }
-        result.color = new ScreenStyleParams.Color(ColorParser.parse(bundle.getString("color")));
+        result.color = new StyleParams.Color(ColorParser.parse(bundle.getString("color")));
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
         result.enabled = bundle.getBoolean("enabled", true);
         result.eventId = bundle.getString("id");

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

@@ -41,7 +41,7 @@ public class FragmentScreen extends Screen {
         ContentView contentView = new ContentView(getContext(), screenParams.screenId, screenParams.passProps, screenParams.navigationParams, null);
         addView(contentView, 0, 0);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        if (screenParams.styleParams.drawBelowTopBar) {
+        if (screenParams.styleParams.drawScreenBelowTopBar) {
             params.addRule(BELOW, topBar.getId());
         }
         addView(content, params);

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

@@ -11,7 +11,7 @@ import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.SdkSupports;
@@ -74,14 +74,14 @@ public abstract class Screen extends RelativeLayout implements ScrollDirectionLi
         });
     }
 
-    private void setStyle(ScreenStyleParams styleParams) {
+    private void setStyle(StyleParams styleParams) {
         setStatusBarColor(styleParams.statusBarColor);
         setNavigationBarColor(styleParams.navigationBarColor);
         topBar.setStyle(styleParams);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    private void setStatusBarColor(ScreenStyleParams.Color statusBarColor) {
+    private void setStatusBarColor(StyleParams.Color statusBarColor) {
         if (!SdkSupports.lollipop()) {
             return;
         }
@@ -96,7 +96,7 @@ public abstract class Screen extends RelativeLayout implements ScrollDirectionLi
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public void setNavigationBarColor(ScreenStyleParams.Color navigationBarColor) {
+    public void setNavigationBarColor(StyleParams.Color navigationBarColor) {
         if (!SdkSupports.lollipop()) {
             return;
         }
@@ -154,7 +154,7 @@ public abstract class Screen extends RelativeLayout implements ScrollDirectionLi
         topBar.setTitleBarRightButton(navigatorEventId, backButtonListener, titleBarLeftButtonParams);
     }
 
-    public ScreenStyleParams getStyleParams() {
+    public StyleParams getStyleParams() {
         return screenParams.styleParams;
     }
 }

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

@@ -5,7 +5,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.Task;
@@ -134,7 +134,7 @@ public class ScreenStack extends FrameLayout implements TitleBarBackButtonListen
         }
     }
 
-    public ScreenStyleParams getCurrentScreenStyleParams() {
+    public StyleParams getCurrentScreenStyleParams() {
         return stack.peek().getStyleParams();
     }
 

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

@@ -21,7 +21,7 @@ public class SingleScreen extends Screen {
     protected void createContent() {
         contentView = new ContentView(getContext(), screenParams.screenId, screenParams.passProps, screenParams.navigationParams, this);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        if (screenParams.styleParams.drawBelowTopBar) {
+        if (screenParams.styleParams.drawScreenBelowTopBar) {
             params.addRule(BELOW, topBar.getId());
         }
         addView(contentView, params);

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

@@ -52,7 +52,7 @@ public class ViewPagerScreen extends Screen {
 
     private void addContent(ContentView contentView) {
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        if (screenParams.styleParams.drawBelowTopBar) {
+        if (screenParams.styleParams.drawScreenBelowTopBar) {
             params.addRule(BELOW, topBar.getId());
         }
         viewPager.addView(contentView, params);

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

@@ -6,7 +6,7 @@ import android.graphics.Color;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.StyleParams;
 
 import java.util.List;
 
@@ -25,8 +25,9 @@ public class BottomTabs extends AHBottomNavigation {
         }
     }
 
-    public void setStyleFromScreen(ScreenStyleParams params) {
+    public void setStyleFromScreen(StyleParams params) {
         setBackgroundColor(params.bottomTabsColor);
+
         if (params.bottomTabsButtonColor.hasColor()) {
             setInactiveColor(params.bottomTabsButtonColor.getColor());
         }
@@ -36,7 +37,7 @@ public class BottomTabs extends AHBottomNavigation {
         }
     }
 
-    private void setBackgroundColor(ScreenStyleParams.Color bottomTabsColor) {
+    private void setBackgroundColor(StyleParams.Color bottomTabsColor) {
         if (bottomTabsColor.hasColor()) {
             setDefaultBackgroundColor(bottomTabsColor.getColor());
         } else {

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

@@ -5,7 +5,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 
 import com.reactnativenavigation.animation.VisibilityAnimator;
-import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 
@@ -41,12 +41,12 @@ public class TitleBar extends Toolbar {
         }
     }
 
-    public void setStyle(ScreenStyleParams params) {
+    public void setStyle(StyleParams params) {
         setVisibility(params.titleBarHidden ? GONE : VISIBLE);
         setTitleTextColor(params);
     }
 
-    private void setTitleTextColor(ScreenStyleParams params) {
+    private void setTitleTextColor(StyleParams params) {
         if (params.titleBarTitleColor.hasColor()) {
             setTitleTextColor(params.titleBarTitleColor.getColor());
         }

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TabLayout;
 
-import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.ViewUtils;
@@ -35,7 +35,7 @@ public class TopBar extends AppBarLayout {
         titleBar.setTitle(title);
     }
 
-    public void setStyle(ScreenStyleParams styleParams) {
+    public void setStyle(StyleParams styleParams) {
         if (styleParams.topBarColor.hasColor()) {
             setBackgroundColor(styleParams.topBarColor.getColor());
         }

src/deprecated/platformSpecificDeprecated.android.js

@@ -24,9 +24,11 @@ function startSingleScreenApp(params) {
   /*
    * adapt to new API
    */
+  console.log('0');
   screen.screenId = screen.screen;
   params.screen = adaptNavigationStyleToScreenStyle(screen);
   params.screen = adaptNavigationParams(screen);
+  params.appStyle = convertStyleParams(params.appStyle);
 
   newPlatformSpecific.startApp(params);
 }
@@ -81,25 +83,33 @@ function adaptNavigationStyleToScreenStyle(screen) {
     return screen;
   }
 
-  screen.styleParams = {
-    statusBarColor: navigatorStyle.statusBarColor,
-    topBarColor: navigatorStyle.toolBarColor,
-    navigationBarColor: navigatorStyle.navigationBarColor,
-    titleBarHidden: navigatorStyle.navBarHidden,
-    titleBarTitleColor: navigatorStyle.navBarTextColor,
-    backButtonHidden: navigatorStyle.backButtonHidden,
-    topTabsHidden: navigatorStyle.topTabsHidden,
-    bottomTabsHidden: navigatorStyle.tabBarHidden,
-    bottomTabsHiddenOnScroll: navigatorStyle.bottomTabsHiddenOnScroll,
-    drawBelowTopBar: !navigatorStyle.drawUnderNavBar,
-    bottomTabsColor: navigatorStyle.tabBarBackgroundColor,
-    bottomTabsButtonColor: navigatorStyle.tabBarButtonColor,
-    selectedBottomTabsButtonColor: navigatorStyle.tabBarButtonColor
-  };
+  screen.styleParams = convertStyleParams(navigatorStyle);
 
   return _.omit(screen, ['navigatorStyle']);
 }
 
+function convertStyleParams(originalStyleObject) {
+  if (!originalStyleObject) {
+    return null;
+  }
+
+  return {
+    statusBarColor: originalStyleObject.statusBarColor,
+    topBarColor: originalStyleObject.toolBarColor,
+    navigationBarColor: originalStyleObject.navigationBarColor,
+    titleBarHidden: originalStyleObject.navBarHidden,
+    titleBarTitleColor: originalStyleObject.navBarTextColor,
+    backButtonHidden: originalStyleObject.backButtonHidden,
+    topTabsHidden: originalStyleObject.topTabsHidden,
+    bottomTabsHidden: originalStyleObject.tabBarHidden,
+    bottomTabsHiddenOnScroll: originalStyleObject.bottomTabsHiddenOnScroll,
+    drawBelowTopBar: !originalStyleObject.drawUnderNavBar,
+    bottomTabsColor: originalStyleObject.tabBarBackgroundColor,
+    bottomTabsButtonColor: originalStyleObject.tabBarButtonColor,
+    selectedBottomTabsButtonColor: originalStyleObject.tabBarSelectedButtonColor
+  }
+}
+
 function adaptNavigationParams(screen) {
   screen.navigationParams = {
     screenInstanceID: screen.screenInstanceID,
@@ -128,6 +138,12 @@ function startTabBasedApp(params) {
     tab.screen = adaptNavigationParams(tab);
   });
 
+  params.appStyle = convertStyleParams(params.appStyle);
+
+  console.log('appStyle.bottomTabsButtonColor', params.appStyle.bottomTabsButtonColor);
+  console.log('appStyle.bottomTabsColor', params.appStyle.bottomTabsColor);
+  console.log('appStyle.selectedBottomTabsButtonColor', params.appStyle.selectedBottomTabsButtonColor);
+
   // TODO: add drawer params
   newPlatformSpecific.startApp(params);
 }