Set button testID (#2660)

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

@@ -19,7 +19,8 @@ public class Button {
 	@ColorInt public int buttonColor;
 	public int buttonFontSize;
 	public Text buttonFontWeight;
-	public Text icon;
+	public Text icon = new NullText();
+	public Text testId;
 
 	private static Button parseJson(JSONObject json)  {
 		Button button = new Button();
@@ -31,6 +32,7 @@ public class Button {
 		button.buttonColor = json.optInt("buttonColor", NO_INT_VALUE);
 		button.buttonFontSize = json.optInt("buttonFontSize", NO_INT_VALUE);
 		button.buttonFontWeight = TextParser.parse(json, "buttonFontWeight");
+        button.testId = TextParser.parse(json, "testID");
 
 		if (json.has("icon")) {
 			button.icon = TextParser.parse(json.optJSONObject("icon"), "uri");

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

@@ -0,0 +1,15 @@
+package com.reactnativenavigation.utils;
+
+public class ArraryUtils {
+    public static boolean isNullOrEmpty(Object[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean containes(Object[] array, Object item) {
+        if (isNullOrEmpty(array)) return false;
+        for (Object o : array) {
+            if (o == item) return true;
+        }
+        return false;
+    }
+}

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

@@ -4,6 +4,9 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ViewUtils {
     @Nullable
     public static <T> T findChildByClass(ViewGroup root, Class clazz) {
@@ -22,4 +25,15 @@ public class ViewUtils {
         }
         return null;
     }
+
+    public static <T> List<T> findChildrenByClass(ViewGroup root, Class clazz) {
+        List<T> ret = new ArrayList<>();
+        for (int i = 0; i < root.getChildCount(); i++) {
+            View view = root.getChildAt(i);
+            if (clazz.isAssignableFrom(view.getClass())) {
+                ret.add((T) view);
+            }
+        }
+        return ret;
+    }
 }

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

@@ -5,6 +5,7 @@ import android.content.Context;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.reactnativenavigation.parse.BottomTabsOptions;
+import com.reactnativenavigation.parse.Text;
 import com.reactnativenavigation.utils.CompatUtils;
 
 @SuppressLint("ViewConstructor")
@@ -12,6 +13,10 @@ public class BottomTabs extends AHBottomNavigation {
     public BottomTabs(Context context, BottomTabsOptions bottomTabsOptions) {
         super(context);
         setId(CompatUtils.generateViewId());
-        setTag(bottomTabsOptions.testId.get(""));
+        setTestId(bottomTabsOptions.testId);
+    }
+
+    private void setTestId(Text testId) {
+        if (testId.hasValue()) setTag(testId.get());
     }
 }

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.Toolbar;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -12,14 +13,19 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 import com.reactnativenavigation.parse.Button;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.Text;
+import com.reactnativenavigation.utils.ArraryUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.UiUtils;
+import com.reactnativenavigation.utils.ViewUtils;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
     public interface OnClickListener {
@@ -49,9 +55,11 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 			setTextColor();
 			setFontSize(menuItem);
 		}
-	}
 
-	void applyNavigationIcon(Context context) {
+        setTestId(button.testId);
+    }
+
+    void applyNavigationIcon(Context context) {
 		if (!hasIcon()) {
 			Log.w("RNN", "Left button needs to have an icon");
 			return;
@@ -64,7 +72,8 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
                 setIconColor();
                 setNavigationClickListener();
                 toolbar.setNavigationIcon(icon);
-			}
+                setLeftButtonTestId();
+            }
 
 			@Override
 			public void onError(Throwable error) {
@@ -73,7 +82,17 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 		});
 	}
 
-	private void applyIcon(Context context, final MenuItem menuItem) {
+    private void setLeftButtonTestId() {
+        if (!button.testId.hasValue()) return;
+        toolbar.post(() -> {
+            ImageButton leftButton = ViewUtils.findChildByClass(toolbar, ImageButton.class);
+            if (leftButton != null) {
+                leftButton.setTag(button.testId.get());
+            }
+        });
+    }
+
+    private void applyIcon(Context context, final MenuItem menuItem) {
         new ImageLoader().loadIcon(context, button.icon.get(), new ImageLoader.ImageLoadingListener() {
 			@Override
 			public void onComplete(@NonNull Drawable drawable) {
@@ -104,7 +123,7 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
 	private void setTextColor() {
 		UiUtils.runOnPreDrawOnce(this.toolbar, () -> {
-            ArrayList<View> outViews = findActualTextViewInMenuByLabel();
+            ArrayList<View> outViews = findActualTextViewInMenuByText();
             setTextColorForFoundButtonViews(outViews);
         });
 	}
@@ -125,13 +144,6 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 		return true;
 	}
 
-	@NonNull
-	private ArrayList<View> findActualTextViewInMenuByLabel() {
-		ArrayList<View> outViews = new ArrayList<>();
-		this.toolbar.findViewsWithText(outViews, button.title.get(), View.FIND_VIEWS_WITH_TEXT);
-		return outViews;
-	}
-
 	private void setTextColorForFoundButtonViews(ArrayList<View> buttons) {
 		for (View button : buttons) {
 			((TextView) button).setTextColor(this.button.buttonColor);
@@ -139,6 +151,28 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 	}
 
 	private boolean hasIcon() {
-		return button.icon != null;
+		return button.icon.hasValue();
 	}
+
+    private void setTestId(Text testId) {
+        if (!testId.hasValue()) return;
+        UiUtils.runOnPreDrawOnce(this.toolbar, () -> {
+            ActionMenuView buttonsLayout = ViewUtils.findChildByClass(toolbar, ActionMenuView.class);
+            List<TextView> buttons = ViewUtils.findChildrenByClass(buttonsLayout, TextView.class);
+            for (TextView view : buttons) {
+                if (button.title.hasValue() && button.title.get().equals(view.getText())) {
+                    view.setTag(testId.get());
+                } else if (button.icon.hasValue() && ArraryUtils.containes(view.getCompoundDrawables(), icon)) {
+                    view.setTag(testId.get());
+                }
+            }
+        });
+    }
+
+    @NonNull
+    private ArrayList<View> findActualTextViewInMenuByText() {
+        ArrayList<View> outViews = new ArrayList<>();
+        this.toolbar.findViewsWithText(outViews, button.title.get(), View.FIND_VIEWS_WITH_TEXT);
+        return outViews;
+    }
 }