Merge branch 'master' into v2

android/app/src/main/java/com/reactnativenavigation/params/TitleBarButtonParams.java

@@ -12,4 +12,11 @@ public class TitleBarButtonParams extends BaseTitleBarButtonParams {
             color = titleBarButtonColor;
         }
     }
+
+    public StyleParams.Color getColor() {
+        if (enabled) {
+            return color;
+        }
+        return disabledColor.hasColor() ? disabledColor : AppStyle.appStyle.titleBarDisabledButtonColor;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarButtonParamsParser.java

@@ -27,7 +27,7 @@ public class TitleBarButtonParamsParser extends Parser {
         }
         result.color = getColor(bundle, "color", AppStyle.appStyle.titleBarButtonColor);
         result.disabledColor =
-                getColor(bundle, "disabledColor", AppStyle.appStyle.titleBarDisabledButtonColor);
+                getColor(bundle, "titleBarDisabledButtonColor", AppStyle.appStyle.titleBarDisabledButtonColor);
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
         result.enabled = bundle.getBoolean("enabled", true);
         result.hint = bundle.getString("hint", "");

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

@@ -17,7 +17,7 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     protected final Menu menu;
     protected final View parent;
-    protected TitleBarButtonParams buttonParams;
+    TitleBarButtonParams buttonParams;
     @Nullable protected String navigatorEventId;
 
     TitleBarButton(Menu menu, View parent, TitleBarButtonParams buttonParams, @Nullable String navigatorEventId) {
@@ -37,7 +37,6 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
         return item;
     }
 
-
     private void setIcon(MenuItem item) {
         if (hasIcon()) {
             item.setIcon(buttonParams.icon);
@@ -79,7 +78,7 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     private void setTextColorForFoundButtonViews(ArrayList<View> outViews) {
         for (View button : outViews) {
-            ((TextView) button).setTextColor(buttonParams.color.getColor());
+            ((TextView) button).setTextColor(buttonParams.getColor().getColor());
         }
     }