Add TopTabs style

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

@@ -45,6 +45,12 @@ public class StyleParams {
     public Color titleBarButtonColor;
     public boolean backButtonHidden;
 
+    public Color topTabTextColor;
+    public Color selectedTopTabTextColor;
+    public Color selectedTopTabColor;
+    public int selectedTopTabIndicatorHeight;
+    public Color selectedTopTabIndicatorColor;
+
     public boolean bottomTabsHidden;
     public boolean bottomTabsHiddenOnScroll;
     public Color bottomTabsColor;

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

@@ -23,19 +23,25 @@ public class StyleParamsParser {
         result.statusBarColor = getColor("statusBarColor", getDefaultStatusBarColor());
 
         result.topBarColor = getColor("topBarColor", getDefaultTopBarColor());
-        result.titleBarHidden = getBoolean("titleBarHidden", isDefaultTopBarHidden());
+        result.titleBarHidden = getBoolean("titleBarHidden", getDefaultTopBarHidden());
         result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
         result.titleBarButtonColor = getColor("titleBarButtonColor", getTitleBarButtonColor());
-        result.backButtonHidden = getBoolean("backButtonHidden", isDefaultBackButtonHidden());
-        result.topTabsHidden = getBoolean("topTabsHidden", isDefaultTopTabsHidden());
+        result.backButtonHidden = getBoolean("backButtonHidden", getDefaultBackButtonHidden());
+        result.topTabsHidden = getBoolean("topTabsHidden", getDefaultTopTabsHidden());
+
+        result.topTabTextColor = getColor("topTabTextColor", getDefaultTopTabTextColor());
+        result.selectedTopTabTextColor = getColor("selectedTopTabTextColor", getDefaultSelectedTopTabTextColor());
+        result.selectedTopTabColor = getColor("selectedTopTabColor", getDefaultSelectedTopTabColor());
+        result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
+        result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
 
         // TODO: Uncomment once we support drawBelowTopBar again
         //result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", isDefaultScreenBelowTopBar());
         result.drawScreenBelowTopBar = true;
 
-        result.bottomTabsHidden = getBoolean("bottomTabsHidden", isDefaultBottomTabsHidden());
+        result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
         result.bottomTabsHiddenOnScroll =
-                getBoolean("bottomTabsHiddenOnScroll", isDefaultBottomTabsHiddenOnScroll());
+                getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
         result.bottomTabsColor = getColor("bottomTabsColor", getDefaultBottomTabsColor());
         result.bottomTabsButtonColor = getColor("bottomTabsButtonColor", getDefaultBottomTabsButtonColor());
         result.selectedBottomTabsButtonColor =
@@ -46,6 +52,22 @@ public class StyleParamsParser {
         return result;
     }
 
+    private StyleParams.Color getDefaultSelectedTopTabIndicatorColor() {
+        return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedTopTabIndicatorColor;
+    }
+
+    private int getDefaultSelectedTopTabIndicatorHeight() {
+        return AppStyle.appStyle == null ? -1 : AppStyle.appStyle.selectedTopTabIndicatorHeight;
+    }
+
+    private StyleParams.Color getDefaultSelectedTopTabColor() {
+        return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedTopTabColor;
+    }
+
+    private StyleParams.Color getDefaultSelectedTopTabTextColor() {
+        return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedTopTabTextColor;
+    }
+
     @Nullable
     private StyleParams.Color getDefaultNavigationColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.navigationBarColor;
@@ -66,11 +88,11 @@ public class StyleParamsParser {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.bottomTabsColor;
     }
 
-    private boolean isDefaultBottomTabsHiddenOnScroll() {
+    private boolean getDefaultBottomTabsHiddenOnScroll() {
         return AppStyle.appStyle != null && AppStyle.appStyle.bottomTabsHiddenOnScroll;
     }
 
-    private boolean isDefaultBottomTabsHidden() {
+    private boolean getDefaultBottomTabsHidden() {
         return AppStyle.appStyle != null && AppStyle.appStyle.bottomTabsHidden;
     }
 
@@ -78,11 +100,15 @@ public class StyleParamsParser {
         return AppStyle.appStyle == null || AppStyle.appStyle.drawScreenBelowTopBar;
     }
 
-    private boolean isDefaultTopTabsHidden() {
+    private boolean getDefaultTopTabsHidden() {
         return AppStyle.appStyle != null && AppStyle.appStyle.topTabsHidden;
     }
 
-    private boolean isDefaultBackButtonHidden() {
+    private StyleParams.Color getDefaultTopTabTextColor() {
+        return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.topTabTextColor;
+    }
+
+    private boolean getDefaultBackButtonHidden() {
         return AppStyle.appStyle != null && AppStyle.appStyle.backButtonHidden;
     }
 
@@ -96,7 +122,7 @@ public class StyleParamsParser {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.titleBarButtonColor;
     }
 
-    private boolean isDefaultTopBarHidden() {
+    private boolean getDefaultTopBarHidden() {
         return AppStyle.appStyle != null && AppStyle.appStyle.titleBarHidden;
     }
 
@@ -123,4 +149,10 @@ public class StyleParamsParser {
             return defaultColor != null && defaultColor.hasColor() ? defaultColor : color;
         }
     }
+
+    private int getInt(String selectedTopTabIndicatorHeight, int defaultSelectedTopTabIndicatorHeight) {
+        return params.containsKey(selectedTopTabIndicatorHeight) ?
+                (int) params.getDouble(selectedTopTabIndicatorHeight) :
+                defaultSelectedTopTabIndicatorHeight;
+    }
 }

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

@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.os.Build;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.Window;
 import android.widget.RelativeLayout;
 
@@ -119,18 +118,6 @@ public abstract class Screen extends RelativeLayout {
         }
     }
 
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        Log.d("LOG", "Screen.onAttachedToWindow " + this);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        Log.d("LOG", "Screen.onDetachedFromWindow " + this);
-    }
-
     public abstract void ensureUnmountOnDetachedFromWindow();
 
     public abstract void preventUnmountOnDetachedFromWindow();

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

@@ -14,6 +14,7 @@ import java.util.List;
 public class TopBar extends AppBarLayout {
 
     private TitleBar titleBar;
+    private TopTabs topTabs;
 
     public TopBar(Context context) {
         super(context);
@@ -40,6 +41,7 @@ public class TopBar extends AppBarLayout {
         }
         setVisibility(styleParams.topBarHidden ? GONE : VISIBLE);
         titleBar.setStyle(styleParams);
+        setTopTabsStyle(styleParams);
     }
 
     public void setTitleBarRightButtons(String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
@@ -47,9 +49,9 @@ public class TopBar extends AppBarLayout {
     }
 
     public TabLayout initTabs() {
-        TabLayout tabLayout = new TabLayout(getContext());
-        addView(tabLayout);
-        return tabLayout;
+        topTabs = new TopTabs(getContext());
+        addView(topTabs);
+        return topTabs;
     }
 
     public void setTitleBarRightButton(String navigatorEventId,
@@ -58,7 +60,12 @@ public class TopBar extends AppBarLayout {
         titleBar.setLeftButton(titleBarLeftButtonParams, titleBarBackButtonListener, navigatorEventId);
     }
 
-    public TitleBar getTitleBar() {
-        return titleBar;
+    private void setTopTabsStyle(StyleParams style) {
+        if (topTabs == null) {
+            return;
+        }
+
+        topTabs.setTopTabsTextColor(style);
+        topTabs.setSelectedTabIndicatorStyle(style);
     }
 }

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

@@ -0,0 +1,40 @@
+package com.reactnativenavigation.views;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.support.design.widget.TabLayout;
+
+import com.reactnativenavigation.params.StyleParams;
+
+public class TopTabs extends TabLayout {
+
+    public TopTabs(Context context) {
+        super(context);
+    }
+
+    void setSelectedTabIndicatorStyle(StyleParams style) {
+        if (style.selectedTopTabIndicatorColor.hasColor()) {
+            setSelectedTabIndicatorColor(style.selectedTopTabIndicatorColor.getColor());
+        }
+
+        if (style.selectedTopTabIndicatorHeight >= 0) {
+            setSelectedTabIndicatorHeight(style.selectedTopTabIndicatorHeight);
+        }
+    }
+
+    void setTopTabsTextColor(StyleParams style) {
+        ColorStateList originalTabColors = getTabTextColors();
+        int selectedTabColor = originalTabColors != null ? originalTabColors.getColorForState(TabLayout.SELECTED_STATE_SET, -1) : -1;
+        int tabTextColor = originalTabColors != null ? originalTabColors.getColorForState(TabLayout.EMPTY_STATE_SET, -1) : -1;
+
+        if (style.topTabTextColor.hasColor()) {
+            tabTextColor = style.topTabTextColor.getColor();
+        }
+
+        if (style.selectedTopTabTextColor.hasColor()) {
+            selectedTabColor = style.selectedTopTabTextColor.getColor();
+        }
+
+        setTabTextColors(tabTextColor, selectedTabColor);
+    }
+}

src/deprecated/platformSpecificDeprecated.android.js

@@ -97,18 +97,27 @@ function convertStyleParams(originalStyleObject) {
   return {
     statusBarColor: originalStyleObject.statusBarColor,
     topBarColor: originalStyleObject.navBarBackgroundColor,
-    navigationBarColor: originalStyleObject.navigationBarColor,
     titleBarHidden: originalStyleObject.navBarHidden,
     titleBarTitleColor: originalStyleObject.navBarTextColor,
     titleBarButtonColor: originalStyleObject.navBarButtonColor,
     backButtonHidden: originalStyleObject.backButtonHidden,
     topTabsHidden: originalStyleObject.topTabsHidden,
-    bottomTabsHidden: originalStyleObject.tabBarHidden,
-    bottomTabsHiddenOnScroll: originalStyleObject.bottomTabsHiddenOnScroll,
+
     drawBelowTopBar: !originalStyleObject.drawUnderNavBar,
+
+    topTabTextColor: originalStyleObject.topTabTextColor,
+    selectedTopTabTextColor: originalStyleObject.selectedTopTabTextColor,
+    selectedTopTabColor: originalStyleObject.selectedTopTabColor,
+    selectedTopTabIndicatorHeight: originalStyleObject.selectedTopTabIndicatorHeight,
+    selectedTopTabIndicatorColor: originalStyleObject.selectedTopTabIndicatorColor,
+
     bottomTabsColor: originalStyleObject.tabBarBackgroundColor,
     bottomTabsButtonColor: originalStyleObject.tabBarButtonColor,
-    bottomTabsSelectedButtonColor: originalStyleObject.tabBarSelectedButtonColor
+    bottomTabsSelectedButtonColor: originalStyleObject.tabBarSelectedButtonColor,
+    bottomTabsHidden: originalStyleObject.tabBarHidden,
+    bottomTabsHiddenOnScroll: originalStyleObject.bottomTabsHiddenOnScroll,
+
+    navigationBarColor: originalStyleObject.navigationBarColor
   }
 }