[Android] Add navBarTextFontBold, navBarHeight and topTabsHeight (#1691)

* testing

* test

* try fix props on topTabs

* Test xml menu

* Add titleBarHeight

* Remove test

* Add to StyleParams

* Add topTabsHeight

* Fix styleParams type

* Add navBarFontBold

* Add typeface package

* Remove unused debugging

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

@@ -99,7 +99,9 @@ public class StyleParams {
     public Color titleBarDisabledButtonColor;
     public Font titleBarTitleFont;
     public int titleBarTitleFontSize;
+    public boolean titleBarTitleFontBold;
     public boolean titleBarTitleTextCentered;
+    public int titleBarHeight;
     public boolean backButtonHidden;
 
     public Color topTabTextColor;
@@ -109,6 +111,7 @@ public class StyleParams {
     public int selectedTopTabIndicatorHeight;
     public Color selectedTopTabIndicatorColor;
     public boolean topTabsScrollable;
+    public int topTabsHeight;
 
     public Color screenBackgroundColor;
 

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

@@ -55,7 +55,9 @@ public class StyleParamsParser {
         result.titleBarDisabledButtonColor = getColor("titleBarDisabledButtonColor", getTitleBarDisabledButtonColor());
         result.titleBarTitleFont = getFont("titleBarTitleFontFamily", getDefaultTitleTextFontFamily());
         result.titleBarTitleFontSize = getInt("titleBarTitleFontSize", getDefaultTitleTextFontSize());
+        result.titleBarTitleFontBold = getBoolean("titleBarTitleFontBold", getDefaultTitleTextFontBold());
         result.titleBarTitleTextCentered = getBoolean("titleBarTitleTextCentered", getDefaultTitleBarTextCentered());
+        result.titleBarHeight = getInt("titleBarHeight", getDefaultTitleBarHeight());
         result.backButtonHidden = getBoolean("backButtonHidden", getDefaultBackButtonHidden());
         result.topTabsHidden = getBoolean("topTabsHidden", getDefaultTopTabsHidden());
 
@@ -66,6 +68,7 @@ public class StyleParamsParser {
         result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
         result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
         result.topTabsScrollable = getBoolean("topTabsScrollable", getDefaultTopTabsScrollable());
+        result.topTabsHeight = getInt("topTabsHeight", getDefaultTopTabsHeight());
 
         result.screenBackgroundColor = getColor("screenBackgroundColor", getDefaultScreenBackgroundColor());
 
@@ -194,6 +197,10 @@ public class StyleParamsParser {
         return AppStyle.appStyle != null && AppStyle.appStyle.topTabsScrollable;
     }
 
+    private int getDefaultTopTabsHeight() {
+        return AppStyle.appStyle == null ? -1 : AppStyle.appStyle.topTabsHeight;
+    }
+
     private StyleParams.Color getDefaultTopTabIconColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.topTabIconColor;
     }
@@ -254,10 +261,18 @@ public class StyleParamsParser {
         return AppStyle.appStyle == null ? -1 : AppStyle.appStyle.titleBarTitleFontSize;
     }
 
+    private boolean getDefaultTitleTextFontBold() {
+        return AppStyle.appStyle != null && AppStyle.appStyle.titleBarTitleFontBold;
+    }
+
     private boolean getDefaultTitleBarTextCentered() {
         return AppStyle.appStyle != null && AppStyle.appStyle.titleBarTitleTextCentered;
     }
 
+    private int getDefaultTitleBarHeight() {
+        return AppStyle.appStyle == null ? -1 : AppStyle.appStyle.titleBarHeight;
+    }
+
     private boolean getBoolean(String key, boolean defaultValue) {
         return params.containsKey(key) ? params.getBoolean(key) : defaultValue;
     }

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

@@ -146,7 +146,8 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
                 screenParams.leftButton,
                 leftButtonOnClickListener,
                 getNavigatorEventId(),
-                screenParams.overrideBackPressInJs);
+                screenParams.overrideBackPressInJs,
+                styleParams);
     }
 
     private void createAndAddTopBar() {

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

@@ -52,7 +52,7 @@ public class ViewPagerScreen extends Screen {
 
     @Override
     protected void createContent() {
-        TopTabs topTabs = topBar.initTabs();
+        TopTabs topTabs = topBar.initTabs(screenParams.styleParams);
         createViewPager();
         addPages();
         setupViewPager(topTabs);

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

@@ -5,6 +5,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.Toolbar;
@@ -76,6 +77,7 @@ public class TitleBar extends Toolbar {
         setTitleTextColor(params);
         setTitleTextFont(params);
         setTitleTextFontSize(params);
+        setTitleTextFontWeight(params);
         setSubtitleTextColor(params);
         colorOverflowButton(params);
         setBackground(params);
@@ -152,6 +154,15 @@ public class TitleBar extends Toolbar {
         }
     }
 
+    protected void setTitleTextFontWeight(StyleParams params) {
+        if (params.titleBarTitleFontBold) {
+            View titleView = getTitleView();
+            if (titleView instanceof TextView) {
+                ((TextView) titleView).setTypeface(((TextView) titleView).getTypeface(), Typeface.BOLD);
+            }
+        }
+    }
+
     protected void setSubtitleTextColor(StyleParams params) {
         if (params.titleBarSubtitleColor.hasColor()) {
             setSubtitleTextColor(params.titleBarSubtitleColor.getColor());

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

@@ -63,9 +63,10 @@ public class TopBar extends AppBarLayout {
     public void addTitleBarAndSetButtons(List<TitleBarButtonParams> rightButtons,
                                          TitleBarLeftButtonParams leftButton,
                                          LeftButtonOnClickListener leftButtonOnClickListener,
-                                         String navigatorEventId, boolean overrideBackPressInJs) {
+                                         String navigatorEventId, boolean overrideBackPressInJs,
+                                         StyleParams styleParams) {
         titleBar = createTitleBar();
-        addTitleBar();
+        addTitleBar(styleParams);
         addButtons(rightButtons, leftButton, leftButtonOnClickListener, navigatorEventId, overrideBackPressInJs);
     }
 
@@ -73,8 +74,14 @@ public class TopBar extends AppBarLayout {
         return new TitleBar(getContext());
     }
 
-    protected void addTitleBar() {
-        titleBarAndContextualMenuContainer.addView(titleBar, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+    protected void addTitleBar(StyleParams styleParams) {
+        final int titleBarHeight = styleParams.titleBarHeight > 0
+            ? (int) ViewUtils.convertDpToPixel(styleParams.titleBarHeight)
+            : MATCH_PARENT;
+
+        ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(MATCH_PARENT, titleBarHeight);
+
+        titleBarAndContextualMenuContainer.addView(titleBar, lp);
     }
 
     private void addButtons(List<TitleBarButtonParams> rightButtons, TitleBarLeftButtonParams leftButton, LeftButtonOnClickListener leftButtonOnClickListener, String navigatorEventId, boolean overrideBackPressInJs) {
@@ -177,9 +184,14 @@ public class TopBar extends AppBarLayout {
         titleBar.setRightButtons(titleBarButtons, navigatorEventId);
     }
 
-    public TopTabs initTabs() {
+    public TopTabs initTabs(StyleParams styleParams) {
         topTabs = new TopTabs(getContext());
-        addView(topTabs, new ViewGroup.LayoutParams(MATCH_PARENT, (int) ViewUtils.convertDpToPixel(48)));
+
+        final int topTabsHeight = styleParams.topTabsHeight > 0
+            ? (int) ViewUtils.convertDpToPixel(styleParams.topTabsHeight)
+            : MATCH_PARENT;
+
+        addView(topTabs, new ViewGroup.LayoutParams(MATCH_PARENT, topTabsHeight));
         return topTabs;
     }
 

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTopBar.java

@@ -119,11 +119,11 @@ public class CollapsingTopBar extends TopBar implements CollapsingView {
     }
 
     @Override
-    protected void addTitleBar() {
+    protected void addTitleBar(StyleParams styleParams) {
         if (params.hasReactView()) {
             titleBarAndContextualMenuContainer.addView(titleBar, new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
         } else {
-            super.addTitleBar();
+            super.addTitleBar(styleParams);
         }
     }
 

src/deprecated/platformSpecificDeprecated.android.js

@@ -163,7 +163,9 @@ function convertStyleParams(originalStyleObject) {
     titleBarDisabledButtonColor: processColor(originalStyleObject.titleBarDisabledButtonColor),
     titleBarTitleFontFamily: originalStyleObject.navBarTextFontFamily,
     titleBarTitleFontSize: originalStyleObject.navBarTextFontSize,
+    titleBarTitleFontBold: originalStyleObject.navBarTextFontBold,
     titleBarTitleTextCentered: originalStyleObject.navBarTitleTextCentered,
+    titleBarHeight: originalStyleObject.navBarHeight,
     backButtonHidden: originalStyleObject.backButtonHidden,
     topTabsHidden: originalStyleObject.topTabsHidden,
     contextualMenuStatusBarColor: processColor(originalStyleObject.contextualMenuStatusBarColor),
@@ -179,6 +181,7 @@ function convertStyleParams(originalStyleObject) {
     selectedTopTabIndicatorHeight: originalStyleObject.selectedTopTabIndicatorHeight,
     selectedTopTabIndicatorColor: processColor(originalStyleObject.selectedTopTabIndicatorColor),
     topTabsScrollable: originalStyleObject.topTabsScrollable,
+    topTabsHeight: originalStyleObject.topTabsHeight,
     screenBackgroundColor: processColor(originalStyleObject.screenBackgroundColor),
 
     drawScreenAboveBottomTabs: !originalStyleObject.drawUnderTabBar,