[V2] Top bar text size (#1849)

* android oreo overdraw fix

* apply top bar title color

* update readme

* update formatting

* merge v2

* navigation oprtions formatting

* font size props

* update test

* ci fix

* rm global variable

* font size

* update readme

* playground

* after merge fix

README.md

@@ -71,7 +71,7 @@ Note:  v1 properties with names beginning with 'navBar' are replaced in v2 with
 |                       | v1  | v2 iOS | v2 Android | Contributors |
 |-----------------------|-----|--------|------------|------------|
 | topBarTextColor |   ✅    |    ✅     |     ✅        | Wix|
-| topBarTextFontSize    |   ✅    |    ✅      |     [Contribute](/docs/docs/CONTRIBUTING.md)        | Wix|
+| topBarTextFontSize    |   ✅    |    ✅      |     ✅        | Wix|
 | topBarTextFontFamily  |  ✅     |      ✅     |     [Contribute](/docs/docs/CONTRIBUTING.md)        | Wix |
 | topBarBackgroundColor |  ✅     |  ✅       |     ✅         | Wix|
 | topBarButtonColor     |  ✅     |    ✅      |     [Contribute](/docs/docs/CONTRIBUTING.md)        | Wix|

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

@@ -15,6 +15,7 @@ public class NavigationOptions {
 		result.title = json.optString("title");
 		result.topBarBackgroundColor = json.optInt("topBarBackgroundColor");
 		result.topBarTextColor = json.optInt("topBarTextColor");
+		result.topBarTextFontSize = (float) json.optDouble("topBarTextFontSize");
 
 		return result;
 	}
@@ -23,10 +24,12 @@ public class NavigationOptions {
 	public int topBarBackgroundColor = 0;
 	@ColorInt
 	public int topBarTextColor;
+	public float topBarTextFontSize;
 
 	public void mergeWith(final NavigationOptions other) {
 		title = other.title;
 		topBarBackgroundColor = other.topBarBackgroundColor;
 		topBarTextColor = other.topBarTextColor;
+		topBarTextFontSize = other.topBarTextFontSize;
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java

@@ -86,7 +86,8 @@ public class ContainerViewController extends ViewController {
 		if (getParentStackController() != null) {
 			getParentStackController().getTopBar().setTitle(navigationOptions.title);
 			getParentStackController().getTopBar().setBackgroundColor(navigationOptions.topBarBackgroundColor);
-      		getParentStackController().getTopBar().setTitleTextColor(navigationOptions.topBarTextColor);
+			getParentStackController().getTopBar().setTitleTextColor(navigationOptions.topBarTextColor);
+			getParentStackController().getTopBar().setTitleFontSize(navigationOptions.topBarTextFontSize);
 		}
 	}
 

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

@@ -1,10 +1,10 @@
 package com.reactnativenavigation.views;
 
 import android.app.Activity;
+import android.support.annotation.ColorInt;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.v7.widget.Toolbar;
-import android.support.annotation.ColorInt;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -30,6 +30,13 @@ public class TopBar extends AppBarLayout {
 		titleBar.setTitleTextColor(color);
 	}
 
+	public void setTitleFontSize(float size) {
+		TextView titleTextView = getTitleTextView();
+		if (titleTextView != null) {
+			titleTextView.setTextSize(size);
+		}
+	}
+
 	public TextView getTitleTextView() {
 		return findTextView(titleBar);
 	}

lib/android/app/src/test/java/com/reactnativenavigation/parse/NavigationOptionsTest.java

@@ -20,11 +20,13 @@ public class NavigationOptionsTest extends BaseTest {
 		json.put("title", "the title");
 		json.put("topBarBackgroundColor", 0xff123456);
 		json.put("topBarTextColor", 0xff123456);
+		json.put("topBarTextFontSize", 18);
 
 		NavigationOptions result = NavigationOptions.parse(json);
 		assertThat(result.title).isEqualTo("the title");
 		assertThat(result.topBarBackgroundColor).isEqualTo(0xff123456);
 		assertThat(result.topBarTextColor).isEqualTo(0xff123456);
+		assertThat(result.topBarTextFontSize).isEqualTo(18);
 	}
 
 	@Test

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

@@ -144,4 +144,22 @@ public class ContainerViewControllerTest extends BaseTest {
 		assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
 		assertThat(stackController.getTopBar().getTitleTextView().getCurrentTextColor()).isEqualTo(Color.RED);
 	}
+
+	@Test
+	public void appliesTopBarTextSize() throws Exception {
+		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		initialNavigationOptions.title = "the title";
+		StackController stackController = new StackController(activity, "stackId");
+		stackController.push(uut);
+		uut.onViewAppeared();
+		assertThat(stackController.getTopBar().getTitleTextView().getTextSize()).isNotEqualTo(18);
+
+		NavigationOptions opts = new NavigationOptions();
+		opts.title = "the title";
+		opts.topBarTextFontSize = 18;
+		uut.mergeNavigationOptions(opts);
+
+		assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
+		assertThat(stackController.getTopBar().getTitleTextView().getTextSize()).isEqualTo(18);
+	}
 }

playground/src/containers/OptionsScreen.js

@@ -14,6 +14,8 @@ class OptionsScreen extends Component {
   static get navigationOptions() {
     return {
       title: 'Static Title',
+      topBarTextColor: 'black',
+      topBarTextFontSize: 16,
       topBarTextFontFamily: 'HelveticaNeue-Italic',
       rightButtons: [{
         id: BUTTON_ONE,