Top bar text color for Android (#1813)

* android oreo overdraw fix

* apply top bar title color

* update readme

* update formatting

* merge v2

* navigation oprtions formatting

* update test

* ci fix

* rm global variable

* remove obsolete method

README.md

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

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.parse;
 
+import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 
 import org.json.JSONObject;
@@ -13,15 +14,19 @@ public class NavigationOptions {
 
 		result.title = json.optString("title");
 		result.topBarBackgroundColor = json.optInt("topBarBackgroundColor");
+		result.topBarTextColor = json.optInt("topBarTextColor");
 
 		return result;
 	}
 
 	public String title = "";
 	public int topBarBackgroundColor = 0;
+	@ColorInt
+	public int topBarTextColor;
 
 	public void mergeWith(final NavigationOptions other) {
 		title = other.title;
 		topBarBackgroundColor = other.topBarBackgroundColor;
+		topBarTextColor = other.topBarTextColor;
 	}
 }

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

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

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

@@ -1,8 +1,13 @@
 package com.reactnativenavigation.views;
 
 import android.app.Activity;
+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;
 
 public class TopBar extends AppBarLayout {
 	private final Toolbar titleBar;
@@ -20,4 +25,26 @@ public class TopBar extends AppBarLayout {
 	public String getTitle() {
 		return titleBar.getTitle() != null ? titleBar.getTitle().toString() : "";
 	}
+
+	public void setTitleTextColor(@ColorInt int color) {
+		titleBar.setTitleTextColor(color);
+	}
+
+	public TextView getTitleTextView() {
+		return findTextView(titleBar);
+	}
+
+	@Nullable
+	public TextView findTextView(ViewGroup root) {
+		for (int i = 0; i < root.getChildCount(); i++) {
+			View view = root.getChildAt(i);
+			if (view instanceof TextView) {
+				return (TextView) view;
+			}
+			if (view instanceof ViewGroup) {
+				return findTextView((ViewGroup) view);
+			}
+		}
+		return null;
+	}
 }

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

@@ -19,10 +19,12 @@ public class NavigationOptionsTest extends BaseTest {
 		JSONObject json = new JSONObject();
 		json.put("title", "the title");
 		json.put("topBarBackgroundColor", 0xff123456);
+		json.put("topBarTextColor", 0xff123456);
 
 		NavigationOptions result = NavigationOptions.parse(json);
 		assertThat(result.title).isEqualTo("the title");
 		assertThat(result.topBarBackgroundColor).isEqualTo(0xff123456);
+		assertThat(result.topBarTextColor).isEqualTo(0xff123456);
 	}
 
 	@Test

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

@@ -126,4 +126,22 @@ public class ContainerViewControllerTest extends BaseTest {
 
 		assertThat(((ColorDrawable) stackController.getTopBar().getBackground()).getColor()).isEqualTo(0xffff0000);
 	}
+
+	@Test
+	public void appliesTopBarTextColor() 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().getCurrentTextColor()).isNotEqualTo(Color.RED);
+
+		NavigationOptions opts = new NavigationOptions();
+		opts.title = "the title";
+		opts.topBarTextColor = Color.RED;
+		uut.mergeNavigationOptions(opts);
+
+		assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
+		assertThat(stackController.getTopBar().getTitleTextView().getCurrentTextColor()).isEqualTo(Color.RED);
+	}
 }

scripts/env/installFbSimCtl.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -e
 
 brew tap facebook/fb
-brew install fbsimctl
+brew install fbsimctl --HEAD