Merge branch 'v2.0' of https://github.com/wix/react-native-navigation into v2.0

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

@@ -19,6 +19,7 @@ public class StyleParams {
             return color != null;
         }
 
+        @ColorInt
         public int getColor() {
             if (!hasColor()) {
                 throw new RuntimeException("Color undefined");
@@ -44,6 +45,7 @@ public class StyleParams {
     public boolean titleBarHidden;
     public Color titleBarTitleColor;
     public Color titleBarButtonColor;
+    public Color titleBarDisabledButtonColor;
     public boolean backButtonHidden;
 
     public Color topTabTextColor;

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

@@ -21,6 +21,7 @@ public class TitleBarButtonParams {
     public String label;
     public Drawable icon;
     public StyleParams.Color color;
+    public StyleParams.Color disabledColor;
     public ShowAsAction showAsAction;
     public boolean enabled = true;
 

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.params.parsers;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -26,6 +27,7 @@ public class StyleParamsParser {
         result.titleBarHidden = getBoolean("titleBarHidden", getDefaultTopBarHidden());
         result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
         result.titleBarButtonColor = getColor("titleBarButtonColor", getTitleBarButtonColor());
+        result.titleBarDisabledButtonColor = getColor("titleBarDisabledButtonColor", getTitleBarDisabledButtonColor());
         result.backButtonHidden = getBoolean("backButtonHidden", getDefaultBackButtonHidden());
         result.topTabsHidden = getBoolean("topTabsHidden", getDefaultTopTabsHidden());
 
@@ -40,7 +42,7 @@ public class StyleParamsParser {
 
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
         result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
-                params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
+                                           params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
         result.bottomTabsHiddenOnScroll =
                 getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
         result.bottomTabsColor = getColor("bottomTabsColor", getDefaultBottomTabsColor());
@@ -128,6 +130,11 @@ public class StyleParamsParser {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.titleBarButtonColor;
     }
 
+    @Nullable
+    private StyleParams.Color getTitleBarDisabledButtonColor() {
+        return AppStyle.appStyle == null ? new StyleParams.Color(Color.LTGRAY) : AppStyle.appStyle.titleBarDisabledButtonColor;
+    }
+
     private boolean getDefaultTopBarHidden() {
         return AppStyle.appStyle != null && AppStyle.appStyle.titleBarHidden;
     }

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

@@ -26,15 +26,16 @@ public class TitleBarButtonParamsParser extends Parser {
         if (hasKey(bundle,"icon")) {
             result.icon = ImageLoader.loadImage(bundle.getString("icon"));
         }
-        result.color = getColor(bundle, AppStyle.appStyle.titleBarButtonColor);
+        result.color = getColor(bundle, "color", AppStyle.appStyle.titleBarButtonColor);
+        result.disabledColor = getColor(bundle, "disabledColor", AppStyle.appStyle.titleBarDisabledButtonColor);
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
         result.enabled = bundle.getBoolean("enabled", true);
         result.eventId = bundle.getString("id");
         return result;
     }
 
-    private StyleParams.Color getColor(Bundle bundle, StyleParams.Color defaultColor) {
-        StyleParams.Color color = StyleParams.Color.parse(bundle.getString("color"));
+    private StyleParams.Color getColor(Bundle bundle, String key, StyleParams.Color defaultColor) {
+        StyleParams.Color color = StyleParams.Color.parse(bundle.getString(key));
         return color.hasColor() || defaultColor == null ? color : defaultColor;
     }
 

android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.utils;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
@@ -12,6 +11,7 @@ import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.params.AppStyle;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -33,7 +33,9 @@ public class ViewUtils {
     }
 
     public static void tintDrawable(Drawable drawable, int tint, boolean enabled) {
-        drawable.setColorFilter(new PorterDuffColorFilter(enabled ? tint : Color.LTGRAY, PorterDuff.Mode.SRC_IN));
+        drawable.setColorFilter(new PorterDuffColorFilter(enabled ? tint :
+                AppStyle.appStyle.titleBarDisabledButtonColor.getColor(),
+                PorterDuff.Mode.SRC_IN));
     }
 
     public static float convertDpToPixel(float dp) {

package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/wix/react-native-navigation.git"
   },
-  "version": "2.0.0-experimental.49",
+  "version": "2.0.0-experimental.50",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "nativePackage": true,
   "bugs": {