Support default button options on Android

Related to #3054

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.parse;
 import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.utils.CollectionUtils;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
@@ -38,8 +39,20 @@ public class TopBarButtons {
     }
 
     void mergeWithDefault(TopBarButtons defaultOptions) {
-        if (left == null) left = defaultOptions.left;
-        if (right == null) right = defaultOptions.right;
+        if (left == null) {
+            left = defaultOptions.left;
+        } else if (!CollectionUtils.isNullOrEmpty(defaultOptions.left)){
+            for (Button button : left) {
+                button.mergeWithDefault(defaultOptions.left.get(0));
+            }
+        }
+        if (right == null) {
+            right = defaultOptions.right;
+        } else if (!CollectionUtils.isNullOrEmpty(defaultOptions.right)) {
+            for (Button button : right) {
+                button.mergeWithDefault(defaultOptions.right.get(0));
+            }
+        }
         back.mergeWithDefault(defaultOptions.back);
     }
 }

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

@@ -21,7 +21,7 @@ public class Button {
     public Text text = new NullText();
     public Bool enabled = new NullBool();
     public Bool disableIconTint = new NullBool();
-    public int showAsAction;
+    public Number showAsAction = new NullNumber();
     public Color color = new NullColor();
     public Color disabledColor = new NullColor();
     public Number fontSize = new NullNumber();
@@ -86,22 +86,37 @@ public class Button {
         return icon.hasValue();
     }
 
-    private static int parseShowAsAction(JSONObject json) {
+    private static Number parseShowAsAction(JSONObject json) {
         final Text showAsAction = TextParser.parse(json, "showAsAction");
         if (!showAsAction.hasValue()) {
-            return MenuItem.SHOW_AS_ACTION_IF_ROOM;
+            return new Number(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
 
         switch (showAsAction.get()) {
             case "always":
-                return MenuItem.SHOW_AS_ACTION_ALWAYS;
+                return new Number(MenuItem.SHOW_AS_ACTION_ALWAYS);
             case "never":
-                return MenuItem.SHOW_AS_ACTION_NEVER;
+                return new Number(MenuItem.SHOW_AS_ACTION_NEVER);
             case "withText":
-                return MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+                return new Number(MenuItem.SHOW_AS_ACTION_WITH_TEXT);
             case "ifRoom":
             default:
-                return MenuItem.SHOW_AS_ACTION_IF_ROOM;
+                return new Number(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
     }
+
+    public void mergeWithDefault(Button defaultOptions) {
+        if (!text.hasValue()) text = defaultOptions.text;
+        if (!enabled.hasValue()) enabled = defaultOptions.enabled;
+        if (!disableIconTint.hasValue()) disableIconTint = defaultOptions.disableIconTint;
+        if (!color.hasValue()) color = defaultOptions.color;
+        if (!disabledColor.hasValue()) disabledColor = defaultOptions.disabledColor;
+        if (!fontSize.hasValue()) fontSize = defaultOptions.fontSize;
+        if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
+        if (!fontWeight.hasValue()) fontWeight = defaultOptions.fontWeight;
+        if (!testId.hasValue()) testId = defaultOptions.testId;
+        if (!component.hasValue()) component = defaultOptions.component;
+        if (!showAsAction.hasValue()) showAsAction = defaultOptions.showAsAction;
+        if (!icon.hasValue()) icon = defaultOptions.icon;
+    }
 }

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

@@ -76,7 +76,9 @@ public class ButtonOptionsPresenter {
     @NonNull
     private ArrayList<View> findActualTextViewInMenu() {
         ArrayList<View> outViews = new ArrayList<>();
-        toolbar.findViewsWithText(outViews, button.text.get(), View.FIND_VIEWS_WITH_TEXT);
+        if (button.text.hasValue()) {
+            toolbar.findViewsWithText(outViews, button.text.get(), View.FIND_VIEWS_WITH_TEXT);
+        }
         return outViews;
     }
 

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

@@ -100,7 +100,7 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
 
     public void addToMenu(Toolbar toolbar, int position) {
         MenuItem menuItem = toolbar.getMenu().add(0, position, position, button.text.get(""));
-        menuItem.setShowAsAction(button.showAsAction);
+        if (button.showAsAction.hasValue()) menuItem.setShowAsAction(button.showAsAction.get());
         menuItem.setEnabled(button.enabled.isTrueOrUndefined());
         menuItem.setOnMenuItemClickListener(this);
         if (button.hasComponent()) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/button/NavigationIconResolver.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
+import android.util.Log;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.parse.params.Button;
@@ -38,7 +39,7 @@ public class NavigationIconResolver {
         } else if (Constants.BACK_BUTTON_ID.equals(button.id)) {
             onSuccess.run(ContextCompat.getDrawable(context, R.drawable.ic_arrow_back_black_24dp));
         } else {
-            throw new RuntimeException("Left button needs to have an icon");
+            Log.w("RNN", "Left button needs to have an icon");
         }
     }
 }

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

@@ -161,7 +161,7 @@ public class TopBarButtonControllerTest extends BaseTest {
         button.id = "btn1";
         button.text = new Text("Button");
         button.fontFamily = Typeface.MONOSPACE;
-        button.showAsAction = MenuItem.SHOW_AS_ACTION_ALWAYS;
+        button.showAsAction = new Number(MenuItem.SHOW_AS_ACTION_ALWAYS);
     }
 
     private void setIconButton(boolean enabled) {
@@ -171,7 +171,7 @@ public class TopBarButtonControllerTest extends BaseTest {
         button.component.name = new NullText();
         button.component.componentId = new NullText();
         button.enabled = new Bool(enabled);
-        button.showAsAction = MenuItem.SHOW_AS_ACTION_ALWAYS;
+        button.showAsAction = new Number(MenuItem.SHOW_AS_ACTION_ALWAYS);
     }
 
     private void setReactComponentButton() {

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarTest.java

@@ -12,6 +12,7 @@ import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.TitleBarHelper;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
@@ -73,7 +74,7 @@ public class TopBarTest extends BaseTest {
             Button button = new Button();
             button.id = "rightButtons" + i;
             button.text = new Text("btn" + i);
-            button.showAsAction = MenuItem.SHOW_AS_ACTION_ALWAYS;
+            button.showAsAction = new Number(MenuItem.SHOW_AS_ACTION_ALWAYS);
             result.add(spy(button));
         }
         return result;