Implement topBar.borderColor and topBar.borderHeight

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

@@ -7,12 +7,18 @@ import android.util.Log;
 import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.NullBool;
+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.BoolParser;
+import com.reactnativenavigation.parse.parsers.ColorParser;
+import com.reactnativenavigation.parse.parsers.FractionParser;
 import com.reactnativenavigation.parse.parsers.NumberParser;
 import com.reactnativenavigation.parse.parsers.TextParser;
 import com.reactnativenavigation.utils.TypefaceLoader;
@@ -38,6 +44,8 @@ public class TopBarOptions {
         options.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"), typefaceLoader);
         options.testId = TextParser.parse(json, "testID");
         options.height = NumberParser.parse(json, "height");
+        options.borderColor = ColorParser.parse(json, "borderColor");
+        options.borderHeight = FractionParser.parse(json, "borderHeight");
 
         options.validate();
         return options;
@@ -52,6 +60,8 @@ public class TopBarOptions {
     public Bool hideOnScroll = new NullBool();
     public Bool drawBehind = new NullBool();
     public Number height = new NullNumber();
+    public Fraction borderHeight = new NullFraction();
+    public Color borderColor = new NullColor();
     @Nullable public ArrayList<Button> leftButtons;
     @Nullable public ArrayList<Button> rightButtons;
 
@@ -67,6 +77,8 @@ public class TopBarOptions {
         if (other.leftButtons != null) leftButtons = other.leftButtons;
         if (other.rightButtons != null) rightButtons = other.rightButtons;
         if (other.height.hasValue()) height = other.height;
+        if (other.borderHeight.hasValue()) borderHeight = other.borderHeight;
+        if (other.borderColor.hasValue()) borderColor = other.borderColor;
         validate();
     }
 
@@ -82,6 +94,8 @@ public class TopBarOptions {
         if (rightButtons == null) rightButtons = defaultOptions.rightButtons;
         if (!testId.hasValue()) testId = defaultOptions.testId;
         if (!height.hasValue()) height = defaultOptions.height;
+        if (!borderHeight.hasValue()) borderHeight = defaultOptions.borderHeight;
+        if (!borderColor.hasValue()) borderColor = defaultOptions.borderColor;
         validate();
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/parse/params/Fraction.java

@@ -1,7 +1,7 @@
 package com.reactnativenavigation.parse.params;
 
-public class Fraction extends Param<Float> {
-    public Fraction(float value) {
+public class Fraction extends Param<Double> {
+    public Fraction(double value) {
         super(value);
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/FractionParser.java

@@ -7,6 +7,6 @@ import org.json.JSONObject;
 
 public class FractionParser {
     public static Fraction parse(JSONObject json, String fraction) {
-        return json.has(fraction) ? new Fraction(json.optInt(fraction)) : new NullFraction();
+        return json.has(fraction) ? new Fraction(json.optDouble(fraction)) : new NullFraction();
     }
 }

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

@@ -21,8 +21,9 @@ import java.util.ArrayList;
 public class StackOptionsPresenter {
     private static final int DEFAULT_TITLE_COLOR = Color.BLACK;
     private static final int DEFAULT_SUBTITLE_COLOR = Color.GRAY;
-    private final float defaultTitleFontSize;
-    private final float defaultSubtitleFontSize;
+    private static final int DEFAULT_BORDER_COLOR = Color.BLACK;
+    private final double defaultTitleFontSize;
+    private final double defaultSubtitleFontSize;
 
     private TopBar topBar;
 
@@ -61,6 +62,9 @@ public class StackOptionsPresenter {
         topBar.setSubtitleFontFamily(options.subtitle.fontFamily);
         topBar.setSubtitleAlignment(options.subtitle.alignment);
 
+        topBar.setBorderHeight(options.borderHeight.get(0d));
+        topBar.setBorderColor(options.borderColor.get(DEFAULT_BORDER_COLOR));
+
         topBar.setBackgroundColor(options.background.color);
         topBar.setBackgroundComponent(options.background.component);
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());

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

@@ -74,9 +74,9 @@ public class TitleBar extends Toolbar {
         if (color.hasValue()) setBackgroundColor(color.get());
     }
 
-    public void setTitleFontSize(float size) {
+    public void setTitleFontSize(double size) {
         TextView titleTextView = findTitleTextView();
-        if (titleTextView != null) titleTextView.setTextSize(size);
+        if (titleTextView != null) titleTextView.setTextSize((float) size);
     }
 
     public void setTitleTypeface(Typeface typeface) {
@@ -95,9 +95,9 @@ public class TitleBar extends Toolbar {
         if (subtitleTextView != null) subtitleTextView.setTypeface(typeface);
     }
 
-    public void setSubtitleFontSize(float size) {
+    public void setSubtitleFontSize(double size) {
         TextView subtitleTextView = findSubtitleTextView();
-        if (subtitleTextView != null) subtitleTextView.setTextSize(size);
+        if (subtitleTextView != null) subtitleTextView.setTextSize((float) size);
     }
 
     public void setSubtitleAlignment(Alignment alignment) {

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

@@ -9,11 +9,14 @@ import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.AppBarLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.anim.TopBarAnimator;
 import com.reactnativenavigation.anim.TopBarCollapseBehavior;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
@@ -45,9 +48,10 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     private final TopBarCollapseBehavior collapsingBehavior;
     private TopBarAnimator animator;
     private TopTabs topTabs;
-    private RelativeLayout root;
+    private FrameLayout root;
     private StackLayout parentView;
     private TopBarBackgroundViewController topBarBackgroundViewController;
+    private View border;
 
     public TopBar(final Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener onClickListener, StackLayout parentView) {
         super(context);
@@ -60,13 +64,26 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     }
 
     private void createLayout(ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
+        setId(CompatUtils.generateViewId());
         topTabs = new TopTabs(getContext());
         titleBar = createTitleBar(getContext(), buttonCreator, titleBarReactViewCreator, onClickListener);
         titleBar.setId(CompatUtils.generateViewId());
-        root = new RelativeLayout(getContext());
+        root = new FrameLayout(getContext());
+        root.setId(CompatUtils.generateViewId());
         root.addView(titleBar, MATCH_PARENT, WRAP_CONTENT);
+        border = createBorder();
+        root.addView(border);
         addView(root, MATCH_PARENT, WRAP_CONTENT);
-        setContentDescription("TopBar");
+        if (BuildConfig.DEBUG) setContentDescription("TopBar");
+    }
+
+    private View createBorder() {
+        View border = new View(getContext());
+        border.setBackgroundColor(android.graphics.Color.TRANSPARENT);
+        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(MATCH_PARENT, 0);
+        lp.gravity = Gravity.BOTTOM;
+        border.setLayoutParams(lp);
+        return border;
     }
 
     protected TitleBar createTitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
@@ -104,7 +121,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setSubtitleTypeface(fontFamily);
     }
 
-    public void setSubtitleFontSize(float size) {
+    public void setSubtitleFontSize(double size) {
         titleBar.setSubtitleFontSize(size);
     }
 
@@ -120,7 +137,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setTitleTextColor(color);
     }
 
-    public void setTitleFontSize(float size) {
+    public void setTitleFontSize(double size) {
         titleBar.setTitleFontSize(size);
     }
 
@@ -266,4 +283,12 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         setRotationY(0);
         setRotation(0);
     }
+
+    public void setBorderHeight(double height) {
+        border.getLayoutParams().height = (int) UiUtils.dpToPx(getContext(), (float) height);
+    }
+
+    public void setBorderColor(int color) {
+        border.setBackgroundColor(color);
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsMergingTest.java

@@ -25,7 +25,7 @@ import java.util.ArrayList;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.anyDouble;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -147,7 +147,7 @@ public class OptionsMergingTest extends BaseTest {
         verify(topBar, times(t)).setTitleComponent(any());
         verify(topBar, times(t)).setBackgroundColor(any());
         verify(topBar, times(t)).setTitleTextColor(anyInt());
-        verify(topBar, times(t)).setTitleFontSize(anyFloat());
+        verify(topBar, times(t)).setTitleFontSize(anyDouble());
         verify(topBar, times(t)).setTitleTypeface(any());
         verify(topBar, times(t)).setSubtitleColor(anyInt());
         verify(topBar, times(t)).setTestId(any());

playground/src/screens/OptionsScreen.js

@@ -52,6 +52,8 @@ class OptionsScreen extends Component {
         _height: TOPBAR_HEIGHT,
         visible: true,
         testID: testIDs.TOP_BAR_ELEMENT,
+        borderColor: 'red',
+        borderHeight: 1,
         rightButtons: [
           // {
           //   id: CUSTOM_BUTTON,