Use iOS properties when styling Toolbar on Android

* Use navBarButtonColor to tint Toolbar instead of buttonsTint

* Use navBarTextColor to tint Toolbar instead of titleColor

android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java

@@ -36,8 +36,8 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TOOL_BAR_COLOR = "toolBarColor";
     private static final String KEY_TOOL_BAR_HIDDEN = "navBarHidden";
     private static final String KEY_NAVIGATION_BAR_COLOR = "navigationBarColor";
-    private static final String KEY_BUTTONS_TINT_COLOR = "buttonsTint";
-    private static final String KEY_TITLE_COLOR = "titleColor";
+    private static final String KEY_NAV_BAR_BUTTON_COLOR = "navBarButtonColor";
+    private static final String KEY_NAV_BAR_TEXT_COLOR = "navBarTextColor";
     private static final String KEY_TAB_NORMAL_TEXT_COLOR = "tabNormalTextColor";
     private static final String KEY_TAB_SELECTED_TEXT_COLOR = "tabSelectedTextColor";
     private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
@@ -58,8 +58,8 @@ public class Screen extends JsonObject implements Serializable {
     @Nullable public Boolean toolBarHidden;
     @Nullable @ColorInt public Integer statusBarColor;
     @Nullable @ColorInt public Integer navigationBarColor;
-    @Nullable @ColorInt public Integer buttonsTintColor;
-    @Nullable @ColorInt public Integer titleColor;
+    @Nullable @ColorInt public Integer navBarButtonColor;
+    @Nullable @ColorInt public Integer navBarTextColor;
     @Nullable @ColorInt public Integer tabNormalTextColor;
     @Nullable @ColorInt public Integer tabSelectedTextColor;
     @Nullable @ColorInt public Integer tabIndicatorColor;
@@ -110,8 +110,8 @@ public class Screen extends JsonObject implements Serializable {
             toolBarHidden = getBoolean(style, KEY_TOOL_BAR_HIDDEN);
             statusBarColor = getColor(style, KEY_STATUS_BAR_COLOR);
             navigationBarColor = getColor(style, KEY_NAVIGATION_BAR_COLOR);
-            buttonsTintColor = getColor(style, KEY_BUTTONS_TINT_COLOR);
-            titleColor = getColor(style, KEY_TITLE_COLOR);
+            navBarButtonColor = getColor(style, KEY_NAV_BAR_BUTTON_COLOR);
+            navBarTextColor = getColor(style, KEY_NAV_BAR_TEXT_COLOR);
             tabNormalTextColor = getColor(style, KEY_TAB_NORMAL_TEXT_COLOR);
             tabSelectedTextColor = getColor(style, KEY_TAB_SELECTED_TEXT_COLOR);
             tabIndicatorColor = getColor(style, KEY_TAB_INDICATOR_COLOR);

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

@@ -75,8 +75,8 @@ public class RnnToolBar extends Toolbar {
             resetBackground();
         }
 
-        if (screen.titleColor != null) {
-            setTitleTextColor(screen.titleColor);
+        if (screen.navBarTextColor != null) {
+            setTitleTextColor(screen.navBarTextColor);
         } else {
             resetTitleTextColor();
         }
@@ -138,11 +138,11 @@ public class RnnToolBar extends Toolbar {
     private Drawable setupBackButton(Screen screen) {
         Resources resources = getResources();
         final Drawable backButton;
-        if (screen.buttonsTintColor != null) {
+        if (screen.navBarButtonColor != null) {
             backButton = ResourcesCompat.getDrawable(resources,
                     R.drawable.abc_ic_ab_back_mtrl_am_alpha,
                     null);
-            ImageUtils.tint(backButton, screen.buttonsTintColor);
+            ImageUtils.tint(backButton, screen.navBarButtonColor);
         } else {
             backButton = ResourcesCompat.getDrawable(resources,
                     R.drawable.abc_ic_ab_back_mtrl_am_alpha,
@@ -184,7 +184,7 @@ public class RnnToolBar extends Toolbar {
             mToolbarWR = new WeakReference<>(toolBar);
             mOldButtons = oldScreen == null ? null : oldScreen.getButtons();
             mNewButtons = newScreen.getButtons();
-            mTintColor = newScreen.buttonsTintColor;
+            mTintColor = newScreen.navBarButtonColor;
             mIconDimensions = (int) (toolBar.getHeight() * 0.4f);
         }
 

example-redux/src/screens/FirstTabScreen.js

@@ -16,8 +16,6 @@ class FirstTabScreen extends Component {
     statusBarColor: '#303F9F',
     toolBarColor: '#3F51B5',
     navigationBarColor: '#303F9F',
-    buttonsTint: '#FFFFFF',
-    titleColor: '#FFFFFF',
     tabSelectedTextColor: '#FFA000',
     tabNormalTextColor: '#FFC107',
     tabIndicatorColor: '#FFA000'

example-redux/src/screens/PushedScreen.js

@@ -16,8 +16,6 @@ class PushedScreen extends Component {
     statusBarColor: '#303F9F',
     toolBarColor: '#3F51B5',
     navigationBarColor: '#303F9F',
-    buttonsTint: '#FFFFFF',
-    titleColor: '#FFFFFF',
     tabSelectedTextColor: '#FFA000',
     tabNormalTextColor: '#FFC107',
     tabIndicatorColor: '#FF4081'