disabledColor android

lib/android/app/src/main/java/com/reactnativenavigation/parse/params/Button.java

@@ -19,7 +19,8 @@ public class Button {
     public Bool enabled = new NullBool();
     public Bool disableIconTint = new NullBool();
     public int showAsAction;
-    public Color buttonColor = new NullColor();
+    public Color color = new NullColor();
+    public Color disabledColor = new NullColor();
     public Number buttonFontSize = new NullNumber();
     private Text buttonFontWeight = new NullText();
     public Text icon = new NullText();
@@ -33,7 +34,8 @@ public class Button {
         button.enabled = BoolParser.parse(json, "enabled");
         button.disableIconTint = BoolParser.parse(json, "disableIconTint");
         button.showAsAction = parseShowAsAction(json);
-        button.buttonColor = ColorParser.parse(json, "buttonColor");
+        button.color = ColorParser.parse(json, "buttonColor");
+        button.disabledColor = ColorParser.parse(json, "disabledColor");
         button.buttonFontSize = NumberParser.parse(json, "buttonFontSize");
         button.buttonFontWeight = TextParser.parse(json, "buttonFontWeight");
         button.testId = TextParser.parse(json, "testID");

lib/android/app/src/main/java/com/reactnativenavigation/utils/DrawableTinter.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.utils;
+
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
+
+public class DrawableTinter {
+    public void tint(Drawable drawable, int tint) {
+        drawable.setColorFilter(new PorterDuffColorFilter(tint, PorterDuff.Mode.SRC_IN));
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/utils/UiUtils.java

@@ -2,9 +2,6 @@ package com.reactnativenavigation.utils;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
@@ -30,10 +27,6 @@ public class UiUtils {
         });
     }
 
-	public static void tintDrawable(Drawable drawable, int tint) {
-		drawable.setColorFilter(new PorterDuffColorFilter(tint, PorterDuff.Mode.SRC_IN));
-	}
-
 	public static void runOnMainThread(Runnable runnable) {
 		new Handler(Looper.getMainLooper()).post(runnable);
 	}

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

@@ -19,6 +19,7 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.ArrayUtils;
+import com.reactnativenavigation.utils.DrawableTinter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
 import com.reactnativenavigation.utils.UiUtils;
@@ -33,13 +34,17 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
         void onPress(String buttonId);
     }
 
+    private final ImageLoader imageLoader;
+    private DrawableTinter drawableTinter;
     private final Button button;
     private final ReactViewCreator viewCreator;
     private TopBarButtonController.OnClickListener onPressListener;
     private Drawable icon;
 
-    public TopBarButtonController(Activity activity, Button button, ReactViewCreator viewCreator, TopBarButtonController.OnClickListener onClickListener) {
+    public TopBarButtonController(Activity activity, ImageLoader imageLoader, DrawableTinter drawableTinter, Button button, ReactViewCreator viewCreator, OnClickListener onClickListener) {
         super(activity, button.id, new Options());
+        this.imageLoader = imageLoader;
+        this.drawableTinter = drawableTinter;
         this.button = button;
         this.viewCreator = viewCreator;
         this.onPressListener = onClickListener;
@@ -79,7 +84,7 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
             return;
         }
 
-        new ImageLoader().loadIcon(toolbar.getContext(), button.icon.get(), new ImageLoader.ImageLoadingListener() {
+        imageLoader.loadIcon(toolbar.getContext(), button.icon.get(), new ImageLoader.ImageLoadingListener() {
             @Override
             public void onComplete(@NonNull Drawable drawable) {
                 icon = drawable;
@@ -132,18 +137,15 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
     }
 
     private void loadIcon(ImageLoader.ImageLoadingListener callbacks) {
-        new ImageLoader().loadIcon(getActivity(), button.icon.get(), callbacks);
+        imageLoader.loadIcon(getActivity(), button.icon.get(), callbacks);
     }
 
     private void setIconColor(Drawable icon) {
-        if (button.enabled.isTrueOrUndefined() && button.buttonColor.hasValue()) {
-            UiUtils.tintDrawable(icon, button.buttonColor.get());
-            return;
-        }
-        if (button.disableIconTint.isTrue() && button.buttonColor.hasValue()) {
-            UiUtils.tintDrawable(icon, button.buttonColor.get());
-        } else {
-            UiUtils.tintDrawable(icon, Color.LTGRAY);
+        if (button.disableIconTint.isTrue()) return;
+        if (button.enabled.isTrueOrUndefined() && button.color.hasValue()) {
+            drawableTinter.tint(icon, button.color.get());
+        } else if (button.enabled.isFalse()) {
+            drawableTinter.tint(icon, button.disabledColor.get(Color.LTGRAY));
         }
     }
 
@@ -162,9 +164,12 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
     }
 
     private void setTextColorForFoundButtonViews(ArrayList<View> buttons) {
-        for (View button : buttons) {
-            if (this.button.buttonColor.hasValue())
-                ((TextView) button).setTextColor(this.button.buttonColor.get());
+        for (View btn : buttons) {
+            if (button.enabled.isTrueOrUndefined() && button.color.hasValue()) {
+                ((TextView) btn).setTextColor(this.button.color.get());
+            } else if (button.enabled.isFalse()) {
+                ((TextView) btn).setTextColor(button.disabledColor.get(Color.LTGRAY));
+            }
         }
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/views/titlebar/TitleBar.java

@@ -13,6 +13,8 @@ import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.Component;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.utils.DrawableTinter;
+import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
@@ -190,7 +192,7 @@ public class TitleBar extends Toolbar {
     }
 
     public TopBarButtonController createButtonController(Button button) {
-        return new TopBarButtonController((Activity) getContext(), button, buttonCreator, onClickListener);
+        return new TopBarButtonController((Activity) getContext(), new ImageLoader(), new DrawableTinter(), button, buttonCreator, onClickListener);
     }
 
     public Toolbar.LayoutParams getComponentLayoutParams(Component component) {

lib/android/app/src/test/java/com/reactnativenavigation/utils/TitleBarHelper.java

@@ -1,11 +1,11 @@
 package com.reactnativenavigation.utils;
 
+import android.support.v7.view.menu.ActionMenuItemView;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
-import android.widget.TextView;
 
 public class TitleBarHelper {
     public static View getRightButton(Toolbar toolbar, int index) {
-        return (View) ViewUtils.findChildrenByClassRecursive(toolbar, TextView.class).get(toolbar.getMenu().size() - index - 1);
+        return (View) ViewUtils.findChildrenByClassRecursive(toolbar, ActionMenuItemView.class).get(toolbar.getMenu().size() - index - 1);
     }
 }

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

@@ -1,62 +1,125 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.parse.params.Text;
+import com.reactnativenavigation.utils.DrawableTinter;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 public class TopBarButtonControllerTest extends BaseTest {
 
     private TopBarButtonController uut;
     private StackController stackController;
+    private Button button;
+    private DrawableTinter drawableTinter = spy(new DrawableTinter());
 
     @Override
     public void beforeEach() {
-        Button button = createButton();
+        button = new Button();
         final Activity activity = newActivity();
 
         TopBarButtonCreatorMock buttonCreatorMock = new TopBarButtonCreatorMock();
-        uut = spy(new TopBarButtonController(activity, button, buttonCreatorMock, (buttonId) -> {}));
-        stackController = spy(new StackController(activity, buttonCreatorMock, new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stack", new Options()));
-
+        uut = new TopBarButtonController(activity, ImageLoaderMock.mock(), drawableTinter, button, buttonCreatorMock, (buttonId) -> {});
+        stackController = spy(new StackController(activity,
+                buttonCreatorMock,
+                new TitleBarReactViewCreatorMock(),
+                new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()),
+                new TopBarController(),
+                "stack",
+                new Options())
+        );
+        stackController.getView().layout(0, 0, 1080, 1920);
+        stackController.getTopBar().layout(0, 0, 1080, 200);
+        stackController.getTopBar().getTitleBar().layout(0, 0, 1080, 200);
     }
 
     @Test
     public void buttonDoesNotClearStackOptionsOnAppear() {
+        setReactComponentButton();
         uut.ensureViewIsCreated();
         uut.onViewAppeared();
         verify(stackController, times(0)).clearOptions();
     }
 
-    @Test @Ignore
-    public void destroy_buttonIsDestroyedWhenStackIsDestroyed() {
-        uut.ensureViewIsCreated();
-        uut.onViewAppeared();
-        stackController.destroy();
-        verify(uut, times(1)).destroy();
+    @Test
+    public void setIconColor_enabled() {
+        stackController.ensureViewIsCreated();
+
+        setIconButton(true);
+        Toolbar titleBar = stackController.getTopBar().getTitleBar();
+        uut.addToMenu(titleBar, 0);
+
+        assertThat(titleBar.getMenu().size()).isOne();
+        verify(drawableTinter, times(1)).tint(any(), eq(android.graphics.Color.RED));
+    }
+
+    @Test
+    public void setIconColor_disabled() {
+        stackController.ensureViewIsCreated();
+
+        setIconButton(false);
+        uut.addToMenu(stackController.getTopBar().getTitleBar(), 0);
+
+        verify(drawableTinter, times(1)).tint(any(), eq(android.graphics.Color.LTGRAY));
+    }
+
+    @Test
+    public void setIconColor_disabledColor() {
+        stackController.ensureViewIsCreated();
+
+        setIconButton(false);
+        button.disabledColor = new Color(android.graphics.Color.BLACK);
+        uut.addToMenu(stackController.getTopBar().getTitleBar(), 0);
+
+        verify(drawableTinter, times(1)).tint(any(), eq(android.graphics.Color.BLACK));
+    }
+
+    @Test
+    public void disableIconTint() {
+        stackController.ensureViewIsCreated();
+
+        setIconButton(false);
+        button.disableIconTint = new Bool(true);
+        uut.addToMenu(stackController.getTopBar().getTitleBar(), 0);
+        verifyZeroInteractions(drawableTinter);
+    }
+
+    private void setIconButton(boolean enabled) {
+        button.id = "btn1";
+        button.icon = new Text("someIcon");
+        button.color = new Color(android.graphics.Color.RED);
+        button.component.name = new NullText();
+        button.component.componentId = new NullText();
+        button.enabled = new Bool(enabled);
+        button.showAsAction = MenuItem.SHOW_AS_ACTION_ALWAYS;
     }
 
-    @NonNull
-    private Button createButton() {
-        Button button = new Button();
+    private void setReactComponentButton() {
         button.id = "btnId";
         button.component.name = new Text("com.example.customBtn");
         button.component.componentId = new Text("component666");
-        return button;
     }
 }