Modal context menu fix (#1106)

* React Native v0.40.0 fixes

* Implement disableIconTint property on Android TitleBarButtons

* Show contextual menu only on Modal, if showing

* Fix crash if font not set in title bar button parameters

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -347,13 +347,20 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     }
 
     public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
-        layout.showContextualMenu(screenInstanceId, params, onButtonClicked);
-        modalController.showContextualMenu(screenInstanceId, params, onButtonClicked);
+        if (modalController.isShowing()) {
+            modalController.showContextualMenu(screenInstanceId, params, onButtonClicked);
+        } else
+        {
+            layout.showContextualMenu(screenInstanceId, params, onButtonClicked);
+        }
     }
 
     public void dismissContextualMenu(String screenInstanceId) {
-        layout.dismissContextualMenu(screenInstanceId);
-        modalController.dismissContextualMenu(screenInstanceId);
+        if (modalController.isShowing()) {
+            modalController.dismissContextualMenu(screenInstanceId);
+        } else {
+            layout.dismissContextualMenu(screenInstanceId);
+        }
     }
 
     @Override

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

@@ -24,6 +24,7 @@ public class BaseTitleBarButtonParams {
     public StyleParams.Color disabledColor;
     public ShowAsAction showAsAction;
     public boolean enabled = true;
+    public boolean disableIconTint = false;
 
     public void setStyleFromScreen(StyleParams styleParams) {
         setColorFromScreenStyle(styleParams.titleBarButtonColor);

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

@@ -9,4 +9,9 @@ public class TitleBarButtonParams extends BaseTitleBarButtonParams {
         super.setStyleFromScreen(styleParams);
         font = styleParams.titleBarTitleFont;
     }
+
+    public boolean hasFont()
+    {
+        return font != null && font.hasFont();
+    }
 }

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

@@ -32,6 +32,7 @@ public class TitleBarButtonParamsParser extends Parser {
         result.enabled = bundle.getBoolean("enabled", true);
         result.hint = bundle.getString("hint", "");
         result.eventId = bundle.getString("id");
+        result.disableIconTint = bundle.getBoolean("disableIconTint", false);
         return result;
     }
 

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

@@ -42,7 +42,7 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
     }
 
     private MenuItem createMenuItem(int index) {
-        if (!buttonParams.font.hasFont() || TextUtils.isEmpty(buttonParams.label)) {
+        if (!buttonParams.hasFont() || TextUtils.isEmpty(buttonParams.label)) {
             return menu.add(Menu.NONE, Menu.NONE, index, buttonParams.label);
         }
         TypefaceSpan span = new TypefaceSpan(buttonParams.font.get());
@@ -58,7 +58,7 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
     }
 
     private void setColor() {
-        if (!hasColor()) {
+        if (!hasColor() || disableIconTint()) {
             return;
         }
 
@@ -84,7 +84,7 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
     }
 
     private void setFont() {
-        if (!buttonParams.font.hasFont()) {
+        if (!buttonParams.hasFont()) {
             return;
         }
         ArrayList<View> buttons = findActualTextViewInMenuByLabel();
@@ -106,7 +106,7 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     private void setTextFontForFoundButtonViews(ArrayList<View> buttons) {
         for (View button : buttons) {
-            if (buttonParams.font.hasFont()) {
+            if (buttonParams.hasFont()) {
                 ((TextView) button).setTypeface(buttonParams.font.get());
             }
         }
@@ -120,6 +120,10 @@ class TitleBarButton implements MenuItem.OnMenuItemClickListener {
         return buttonParams.color.hasColor();
     }
 
+    private boolean disableIconTint() {
+        return buttonParams.disableIconTint;
+    }
+
     @Override
     public boolean onMenuItemClick(MenuItem item) {
         NavigationApplication.instance.getEventEmitter().sendNavigatorEvent(buttonParams.eventId, navigatorEventId);