Button fontFamily Android

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

@@ -20,19 +20,19 @@ import java.util.ArrayList;
 
 public class TopBarOptions {
 
-    public static TopBarOptions parse(TypefaceLoader typefaceManager, JSONObject json) {
+    public static TopBarOptions parse(TypefaceLoader typefaceLoader, JSONObject json) {
         TopBarOptions options = new TopBarOptions();
         if (json == null) return options;
 
-        options.title = TitleOptions.parse(typefaceManager, json.optJSONObject("title"));
-        options.subtitle = SubtitleOptions.parse(typefaceManager, json.optJSONObject("subtitle"));
+        options.title = TitleOptions.parse(typefaceLoader, json.optJSONObject("title"));
+        options.subtitle = SubtitleOptions.parse(typefaceLoader, json.optJSONObject("subtitle"));
         options.background = TopBarBackgroundOptions.parse(json.optJSONObject("background"));
         options.visible = BoolParser.parse(json, "visible");
         options.animate = BoolParser.parse(json,"animate");
         options.hideOnScroll = BoolParser.parse(json,"hideOnScroll");
         options.drawBehind = BoolParser.parse(json,"drawBehind");
-        options.rightButtons = Button.parseJsonArray(json.optJSONArray("rightButtons"));
-        options.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"));
+        options.rightButtons = Button.parseJsonArray(json.optJSONArray("rightButtons"), typefaceLoader);
+        options.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"), typefaceLoader);
         options.testId = TextParser.parse(json, "testID");
 
         options.validate();

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

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.parse.params;
 
+import android.graphics.Typeface;
+import android.support.annotation.Nullable;
 import android.view.MenuItem;
 
 import com.reactnativenavigation.parse.Component;
@@ -7,6 +9,7 @@ import com.reactnativenavigation.parse.parsers.BoolParser;
 import com.reactnativenavigation.parse.parsers.ColorParser;
 import com.reactnativenavigation.parse.parsers.NumberParser;
 import com.reactnativenavigation.parse.parsers.TextParser;
+import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -21,23 +24,25 @@ public class Button {
     public int showAsAction;
     public Color color = new NullColor();
     public Color disabledColor = new NullColor();
-    public Number buttonFontSize = new NullNumber();
-    private Text buttonFontWeight = new NullText();
+    public Number fontSize = new NullNumber();
+    private Text fontWeight = new NullText();
+    @Nullable public Typeface fontFamily;
     public Text icon = new NullText();
     public Text testId = new NullText();
     public Component component = new Component();
 
-    private static Button parseJson(JSONObject json) {
+    private static Button parseJson(JSONObject json, TypefaceLoader typefaceManager) {
         Button button = new Button();
         button.id = json.optString("id");
         button.title = TextParser.parse(json, "title");
         button.enabled = BoolParser.parse(json, "enabled");
         button.disableIconTint = BoolParser.parse(json, "disableIconTint");
         button.showAsAction = parseShowAsAction(json);
-        button.color = ColorParser.parse(json, "buttonColor");
+        button.color = ColorParser.parse(json, "color");
         button.disabledColor = ColorParser.parse(json, "disabledColor");
-        button.buttonFontSize = NumberParser.parse(json, "buttonFontSize");
-        button.buttonFontWeight = TextParser.parse(json, "buttonFontWeight");
+        button.fontSize = NumberParser.parse(json, "fontSize");
+        button.fontFamily = typefaceManager.getTypeFace(json.optString("fontFamily", ""));
+        button.fontWeight = TextParser.parse(json, "fontWeight");
         button.testId = TextParser.parse(json, "testID");
         button.component = Component.parse(json.optJSONObject("component"));
 
@@ -48,7 +53,7 @@ public class Button {
         return button;
     }
 
-    public static ArrayList<Button> parseJsonArray(JSONArray jsonArray) {
+    public static ArrayList<Button> parseJsonArray(JSONArray jsonArray, TypefaceLoader typefaceLoader) {
         ArrayList<Button> buttons = new ArrayList<>();
 
         if (jsonArray == null) {
@@ -57,7 +62,7 @@ public class Button {
 
         for (int i = 0; i < jsonArray.length(); i++) {
             JSONObject json = jsonArray.optJSONObject(i);
-            Button button = Button.parseJson(json);
+            Button button = Button.parseJson(json, typefaceLoader);
             buttons.add(button);
         }
 

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

@@ -0,0 +1,67 @@
+package com.reactnativenavigation.utils;
+
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.TextView;
+
+import com.reactnativenavigation.parse.params.Button;
+
+import java.util.ArrayList;
+
+public class ButtonOptionsPresenter {
+    private final Toolbar toolbar;
+    private Button button;
+
+    public ButtonOptionsPresenter(Toolbar toolbar, Button button) {
+        this.toolbar = toolbar;
+        this.button = button;
+    }
+
+    public void tint(Drawable drawable, int tint) {
+        drawable.setColorFilter(new PorterDuffColorFilter(tint, PorterDuff.Mode.SRC_IN));
+    }
+
+    public void setTypeFace(Typeface typeface) {
+        UiUtils.runOnPreDrawOnce(toolbar, () -> {
+            ArrayList<View> buttons = findActualTextViewInMenu();
+            for (View btn : buttons) {
+                ((TextView) btn).setTypeface(typeface);
+            }
+        });
+    }
+
+    public void setTextColor() {
+        UiUtils.runOnPreDrawOnce(toolbar, () -> {
+            ArrayList<View> buttons = findActualTextViewInMenu();
+            for (View btn : buttons) {
+                if (button.enabled.isTrueOrUndefined() && button.color.hasValue()) {
+                    setEnabledColor((TextView) btn);
+                } else if (button.enabled.isFalse()) {
+                    setDisabledColor((TextView) btn, button.disabledColor.get(Color.LTGRAY));
+                }
+            }
+        });
+    }
+
+    private void setDisabledColor(TextView btn, int color) {
+        btn.setTextColor(color);
+    }
+
+    private void setEnabledColor(TextView btn) {
+        btn.setTextColor(button.color.get());
+    }
+
+    @NonNull
+    private ArrayList<View> findActualTextViewInMenu() {
+        ArrayList<View> outViews = new ArrayList<>();
+        toolbar.findViewsWithText(outViews, button.title.get(), View.FIND_VIEWS_WITH_TEXT);
+        return outViews;
+    }
+
+}

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

@@ -1,11 +0,0 @@
-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/viewcontrollers/TopBarButtonController.java

@@ -11,7 +11,6 @@ import android.text.SpannableString;
 import android.text.style.AbsoluteSizeSpan;
 import android.util.Log;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
@@ -19,14 +18,13 @@ 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.ButtonOptionsPresenter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.titlebar.TitleBarReactButtonView;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class TopBarButtonController extends ViewController<TitleBarReactButtonView> implements MenuItem.OnMenuItemClickListener {
@@ -35,16 +33,16 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
     }
 
     private final ImageLoader imageLoader;
-    private DrawableTinter drawableTinter;
+    private ButtonOptionsPresenter optionsPresenter;
     private final Button button;
     private final ReactViewCreator viewCreator;
     private TopBarButtonController.OnClickListener onPressListener;
     private Drawable icon;
 
-    public TopBarButtonController(Activity activity, ImageLoader imageLoader, DrawableTinter drawableTinter, Button button, ReactViewCreator viewCreator, OnClickListener onClickListener) {
+    public TopBarButtonController(Activity activity, ImageLoader imageLoader, ButtonOptionsPresenter optionsPresenter, Button button, ReactViewCreator viewCreator, OnClickListener onClickListener) {
         super(activity, button.id, new Options());
         this.imageLoader = imageLoader;
-        this.drawableTinter = drawableTinter;
+        this.optionsPresenter = optionsPresenter;
         this.button = button;
         this.viewCreator = viewCreator;
         this.onPressListener = onClickListener;
@@ -129,8 +127,9 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
                     }
                 });
             } else {
-                setTextColor(toolbar);
+                optionsPresenter.setTextColor();
                 setFontSize(menuItem);
+                optionsPresenter.setTypeFace(button.fontFamily);
             }
         }
         setTestId(toolbar, button.testId);
@@ -143,41 +142,21 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
     private void setIconColor(Drawable icon) {
         if (button.disableIconTint.isTrue()) return;
         if (button.enabled.isTrueOrUndefined() && button.color.hasValue()) {
-            drawableTinter.tint(icon, button.color.get());
+            optionsPresenter.tint(icon, button.color.get());
         } else if (button.enabled.isFalse()) {
-            drawableTinter.tint(icon, button.disabledColor.get(Color.LTGRAY));
-        }
-    }
-
-    private void setTextColor(Toolbar toolbar) {
-        UiUtils.runOnPreDrawOnce(toolbar, () -> {
-            ArrayList<View> outViews = findActualTextViewInMenuByText(toolbar);
-            setTextColorForFoundButtonViews(outViews);
-        });
-    }
-
-    @NonNull
-    private ArrayList<View> findActualTextViewInMenuByText(Toolbar toolbar) {
-        ArrayList<View> outViews = new ArrayList<>();
-        toolbar.findViewsWithText(outViews, button.title.get(), View.FIND_VIEWS_WITH_TEXT);
-        return outViews;
-    }
-
-    private void setTextColorForFoundButtonViews(ArrayList<View> buttons) {
-        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));
-            }
+            optionsPresenter.tint(icon, button.disabledColor.get(Color.LTGRAY));
         }
     }
 
     private void setFontSize(MenuItem menuItem) {
         SpannableString spanString = new SpannableString(button.title.get());
-        if (this.button.buttonFontSize.hasValue())
-            spanString.setSpan(new AbsoluteSizeSpan(button.buttonFontSize.get(), true),
-                    0, button.title.get().length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        if (this.button.fontSize.hasValue())
+            spanString.setSpan(
+                    new AbsoluteSizeSpan(button.fontSize.get(), true),
+                    0,
+                    button.title.get().length(),
+                    Spannable.SPAN_INCLUSIVE_INCLUSIVE
+            );
         menuItem.setTitleCondensed(spanString);
     }
 

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

@@ -13,7 +13,7 @@ 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.ButtonOptionsPresenter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
@@ -192,7 +192,7 @@ public class TitleBar extends Toolbar {
     }
 
     public TopBarButtonController createButtonController(Button button) {
-        return new TopBarButtonController((Activity) getContext(), new ImageLoader(), new DrawableTinter(), button, buttonCreator, onClickListener);
+        return new TopBarButtonController((Activity) getContext(), new ImageLoader(), new ButtonOptionsPresenter(this, button), button, buttonCreator, onClickListener);
     }
 
     public Toolbar.LayoutParams getComponentLayoutParams(Component component) {

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

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

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.graphics.Typeface;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
@@ -15,7 +16,7 @@ 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.utils.ButtonOptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 
@@ -27,14 +28,13 @@ 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());
+    private ButtonOptionsPresenter optionsPresenter;
 
     @Override
     public void beforeEach() {
@@ -42,7 +42,6 @@ public class TopBarButtonControllerTest extends BaseTest {
         final Activity activity = newActivity();
 
         TopBarButtonCreatorMock buttonCreatorMock = new TopBarButtonCreatorMock();
-        uut = new TopBarButtonController(activity, ImageLoaderMock.mock(), drawableTinter, button, buttonCreatorMock, (buttonId) -> {});
         stackController = spy(new StackController(activity,
                 buttonCreatorMock,
                 new TitleBarReactViewCreatorMock(),
@@ -53,7 +52,12 @@ public class TopBarButtonControllerTest extends BaseTest {
         );
         stackController.getView().layout(0, 0, 1080, 1920);
         stackController.getTopBar().layout(0, 0, 1080, 200);
-        stackController.getTopBar().getTitleBar().layout(0, 0, 1080, 200);
+        getTitleBar().layout(0, 0, 1080, 200);
+
+        optionsPresenter = spy(new ButtonOptionsPresenter(getTitleBar(), button));
+        uut = new TopBarButtonController(activity, ImageLoaderMock.mock(), optionsPresenter, button, buttonCreatorMock, (buttonId) -> {});
+
+        stackController.ensureViewIsCreated();
     }
 
     @Test
@@ -66,45 +70,55 @@ public class TopBarButtonControllerTest extends BaseTest {
 
     @Test
     public void setIconColor_enabled() {
-        stackController.ensureViewIsCreated();
-
         setIconButton(true);
-        Toolbar titleBar = stackController.getTopBar().getTitleBar();
-        uut.addToMenu(titleBar, 0);
+        uut.addToMenu(getTitleBar(), 0);
 
-        assertThat(titleBar.getMenu().size()).isOne();
-        verify(drawableTinter, times(1)).tint(any(), eq(android.graphics.Color.RED));
+        assertThat(getTitleBar().getMenu().size()).isOne();
+        verify(optionsPresenter, times(1)).tint(any(), eq(android.graphics.Color.RED));
     }
 
     @Test
     public void setIconColor_disabled() {
-        stackController.ensureViewIsCreated();
-
         setIconButton(false);
-        uut.addToMenu(stackController.getTopBar().getTitleBar(), 0);
+        uut.addToMenu(getTitleBar(), 0);
 
-        verify(drawableTinter, times(1)).tint(any(), eq(android.graphics.Color.LTGRAY));
+        verify(optionsPresenter, 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);
+        uut.addToMenu(getTitleBar(), 0);
 
-        verify(drawableTinter, times(1)).tint(any(), eq(android.graphics.Color.BLACK));
+        verify(optionsPresenter, 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);
+        uut.addToMenu(getTitleBar(), 0);
+        verify(optionsPresenter, times(0)).setTextColor();
+    }
+
+    @Test
+    public void fontFamily() {
+        setTextButton();
+        uut.addToMenu(getTitleBar(), 0);
+        verify(optionsPresenter, times(1)).setTypeFace(Typeface.MONOSPACE);
+    }
+
+    private Toolbar getTitleBar() {
+        return stackController.getTopBar().getTitleBar();
+    }
+
+    private void setTextButton() {
+        button.id = "btn1";
+        button.color = new Color(android.graphics.Color.RED);
+        button.title = new Text("Button");
+        button.fontFamily = Typeface.MONOSPACE;
+        button.showAsAction = MenuItem.SHOW_AS_ACTION_ALWAYS;
     }
 
     private void setIconButton(boolean enabled) {