refactor button options

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

@@ -7,6 +7,10 @@ import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.Toolbar;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.AbsoluteSizeSpan;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
@@ -36,6 +40,18 @@ public class ButtonOptionsPresenter {
         });
     }
 
+    public void setFontSize(MenuItem menuItem) {
+        SpannableString spanString = new SpannableString(button.title.get());
+        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);
+    }
+
     public void setTextColor() {
         UiUtils.runOnPreDrawOnce(toolbar, () -> {
             ArrayList<View> buttons = findActualTextViewInMenu();

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

@@ -6,9 +6,6 @@ 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;
-import android.text.style.AbsoluteSizeSpan;
 import android.util.Log;
 import android.view.MenuItem;
 import android.widget.ImageButton;
@@ -128,7 +125,7 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
                 });
             } else {
                 optionsPresenter.setTextColor();
-                setFontSize(menuItem);
+                if (button.fontSize.hasValue()) optionsPresenter.setFontSize(menuItem);
                 optionsPresenter.setTypeFace(button.fontFamily);
             }
         }
@@ -148,18 +145,6 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
         }
     }
 
-    private void setFontSize(MenuItem menuItem) {
-        SpannableString spanString = new SpannableString(button.title.get());
-        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);
-    }
-
     private void setTestId(Toolbar toolbar, Text testId) {
         if (!testId.hasValue()) return;
         UiUtils.runOnPreDrawOnce(toolbar, () -> {

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

@@ -15,6 +15,7 @@ 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.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.ButtonOptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
@@ -109,6 +110,18 @@ public class TopBarButtonControllerTest extends BaseTest {
         verify(optionsPresenter, times(1)).setTypeFace(Typeface.MONOSPACE);
     }
 
+    @Test
+    public void fontSize() {
+        setTextButton();
+        uut.addToMenu(getTitleBar(), 0);
+        verify(optionsPresenter, times(0)).setFontSize(getTitleBar().getMenu().getItem(0));
+
+        getTitleBar().getMenu().clear();
+        button.fontSize = new Number(10);
+        uut.addToMenu(getTitleBar(), 0);
+        verify(optionsPresenter, times(1)).setFontSize(getTitleBar().getMenu().getItem(0));
+    }
+
     private Toolbar getTitleBar() {
         return stackController.getTopBar().getTitleBar();
     }