Implement topBar.height and title.height

This commit add support for changing the TopBar height as well as changing
the height of custom component used as background

lib/android/app/src/main/java/com/reactnativenavigation/parse/TitleOptions.java

@@ -7,7 +7,9 @@ import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullFraction;
+import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.NullText;
+import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.parse.parsers.ColorParser;
 import com.reactnativenavigation.parse.parsers.FractionParser;
@@ -38,6 +40,7 @@ public class TitleOptions {
     public Alignment alignment = Alignment.Default;
     @Nullable public Typeface fontFamily;
     public Component component = new Component();
+    public Number height = new NullNumber();
 
     void mergeWith(final TitleOptions other) {
         if (other.text.hasValue()) text = other.text;
@@ -46,6 +49,7 @@ public class TitleOptions {
         if (other.fontFamily != null) fontFamily = other.fontFamily;
         if (other.alignment != Alignment.Default) alignment = other.alignment;
         if (other.component.hasValue()) component = other.component;
+        if (other.height.hasValue()) height = other.height;
     }
 
     void mergeWithDefault(TitleOptions defaultOptions) {
@@ -55,5 +59,6 @@ public class TitleOptions {
         if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
         if (alignment == Alignment.Default) alignment = defaultOptions.alignment;
         component.mergeWithDefault(defaultOptions.component);
+        if (!height.hasValue()) height = defaultOptions.height;
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java

@@ -8,9 +8,12 @@ import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.NullText;
+import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.parse.parsers.BoolParser;
+import com.reactnativenavigation.parse.parsers.NumberParser;
 import com.reactnativenavigation.parse.parsers.TextParser;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
@@ -34,6 +37,7 @@ public class TopBarOptions {
         options.rightButtons = Button.parseJsonArray(json.optJSONArray("rightButtons"), typefaceLoader);
         options.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"), typefaceLoader);
         options.testId = TextParser.parse(json, "testID");
+        options.height = NumberParser.parse(json, "height");
 
         options.validate();
         return options;
@@ -47,6 +51,7 @@ public class TopBarOptions {
     public Bool animate = new NullBool();
     public Bool hideOnScroll = new NullBool();
     public Bool drawBehind = new NullBool();
+    public Number height = new NullNumber();
     @Nullable public ArrayList<Button> leftButtons;
     @Nullable public ArrayList<Button> rightButtons;
 
@@ -61,6 +66,7 @@ public class TopBarOptions {
         if (other.drawBehind.hasValue()) drawBehind = other.drawBehind;
         if (other.leftButtons != null) leftButtons = other.leftButtons;
         if (other.rightButtons != null) rightButtons = other.rightButtons;
+        if (other.height.hasValue()) height = other.height;
         validate();
     }
 
@@ -75,6 +81,7 @@ public class TopBarOptions {
         if (leftButtons == null) leftButtons = defaultOptions.leftButtons;
         if (rightButtons == null) rightButtons = defaultOptions.rightButtons;
         if (!testId.hasValue()) testId = defaultOptions.testId;
+        if (!height.hasValue()) height = defaultOptions.height;
         validate();
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackOptionsPresenter.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.presentation;
 
 import android.app.Activity;
 import android.graphics.Color;
+import android.view.ViewGroup.LayoutParams;
 
 import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.parse.Options;
@@ -44,6 +45,9 @@ public class StackOptionsPresenter {
     }
 
     private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, Component component, Options componentOptions) {
+        topBar.setHeight(options.height.get(LayoutParams.WRAP_CONTENT));
+
+        topBar.setTitleHeight(options.title.height.get(LayoutParams.WRAP_CONTENT));
         topBar.setTitle(options.title.text.get(""));
         if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component);
         topBar.setTitleFontSize(options.title.fontSize.get(defaultTitleFontSize));

lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -74,4 +74,8 @@ public class ViewUtils {
         }
         return false;
     }
+
+    public static int getPreferredHeight(View view) {
+        return view.getLayoutParams().height < 0 ? view.getHeight() : view.getLayoutParams().height;
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentLayout.java

@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.views.topbar.TopBar;
@@ -87,7 +88,7 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, TopB
     public void drawBelowTopBar(TopBar topBar) {
         if (getParent() instanceof RelativeLayout) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
-            layoutParams.topMargin = topBar.getHeight();
+            layoutParams.topMargin = ViewUtils.getPreferredHeight(topBar);
             setLayoutParams(layoutParams);
         }
     }

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

@@ -7,6 +7,7 @@ import android.graphics.Typeface;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.reactnativenavigation.parse.Alignment;
@@ -213,4 +214,10 @@ public class TitleBar extends Toolbar {
         }
         return lp;
     }
+
+    public void setHeight(int height) {
+        ViewGroup.LayoutParams lp = getLayoutParams();
+        lp.height = (int) UiUtils.dpToPx(getContext(), height);
+        setLayoutParams(lp);
+    }
 }

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

@@ -10,6 +10,7 @@ import android.support.design.widget.AppBarLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -23,6 +24,8 @@ import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.utils.CompatUtils;
+import com.reactnativenavigation.utils.UiUtils;
+import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
@@ -70,6 +73,16 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         return new TitleBar(context, buttonCreator, reactViewCreator, onClickListener);
     }
 
+    public void setHeight(int height) {
+        ViewGroup.LayoutParams lp = getLayoutParams();
+        lp.height = (int) UiUtils.dpToPx(getContext(), height);
+        setLayoutParams(lp);
+    }
+
+    public void setTitleHeight(int height) {
+        titleBar.setHeight(height);
+    }
+
     public void setTitle(String title) {
         titleBar.setTitle(title);
     }
@@ -125,7 +138,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     public void setBackgroundComponent(Component component) {
         if (component.hasValue()) {
             topBarBackgroundViewController.setComponent(component);
-            RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, getHeight());
+            RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, ViewUtils.getPreferredHeight(this));
             root.addView(topBarBackgroundViewController.getView(), 0, lp);
         }
     }
@@ -213,7 +226,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         if (visibility == View.GONE) {
             this.parentView.removeView(this);
         } else if (visibility == View.VISIBLE && this.getParent() == null) {
-            this.parentView.addView(this, MATCH_PARENT, WRAP_CONTENT);
+            this.parentView.addView(this);
         }
     }