Support fontSize and selectedFontSize options on Android

docs/docs/styling.md

@@ -224,7 +224,9 @@ Navigation.mergeOptions(this.props.componentId, {
   },
   bottomTabs: {
     titleDisplayMode: 'alwaysShow' | 'showWhenActive' | 'alwaysHide' // Sets the title state for each tab.
-  }
+  },
+  bottomTab: {
+    selectedFontSize: 19 // Selected tab font size in sp
 }
 ```
 

lib/android/app/build.gradle

@@ -72,7 +72,7 @@ dependencies {
     implementation 'com.android.support:design:26.1.0'
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support:support-v4:26.1.0'
-    implementation 'com.github.wix-playground:ahbottomnavigation:2.4.3'
+    implementation 'com.github.wix-playground:ahbottomnavigation:2.4.5'
 
     implementation 'com.github.clans:fab:1.6.4'
 

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

@@ -5,9 +5,12 @@ import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.NullColor;
+import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.NullText;
+import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.parse.parsers.ColorParser;
+import com.reactnativenavigation.parse.parsers.NumberParser;
 import com.reactnativenavigation.parse.parsers.TextParser;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
@@ -28,6 +31,8 @@ public class BottomTabOptions {
         options.badge = TextParser.parse(json, "badge");
         options.testId = TextParser.parse(json, "testID");
         options.fontFamily = typefaceManager.getTypeFace(json.optString("fontFamily", ""));
+        options.fontSize = NumberParser.parse(json, "fontSize");
+        options.selectedFontSize = NumberParser.parse(json, "selectedFontSize");
         return options;
     }
 
@@ -39,6 +44,8 @@ public class BottomTabOptions {
     public Color selectedIconColor = new NullColor();
     public Text testId = new NullText();
     public Text badge = new NullText();
+    public Number fontSize = new NullNumber();
+    public Number selectedFontSize = new NullNumber();
     @Nullable public Typeface fontFamily;
 
 
@@ -51,6 +58,8 @@ public class BottomTabOptions {
         if (other.selectedIconColor.hasValue()) selectedIconColor = other.selectedIconColor;
         if (other.badge.hasValue()) badge = other.badge;
         if (other.testId.hasValue()) testId = other.testId;
+        if (other.fontSize.hasValue()) fontSize = other.fontSize;
+        if (other.selectedFontSize.hasValue()) selectedFontSize = other.selectedFontSize;
         if (other.fontFamily != null) fontFamily = other.fontFamily;
     }
 
@@ -62,6 +71,8 @@ public class BottomTabOptions {
         if (!iconColor.hasValue()) iconColor = defaultOptions.iconColor;
         if (!selectedIconColor.hasValue()) selectedIconColor = defaultOptions.selectedIconColor;
         if (!badge.hasValue()) badge = defaultOptions.badge;
+        if (!fontSize.hasValue()) fontSize = defaultOptions.fontSize;
+        if (!selectedFontSize.hasValue()) selectedFontSize = defaultOptions.selectedFontSize;
         if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabOptionsPresenter.java

@@ -39,13 +39,15 @@ public class BottomTabOptionsPresenter {
 
     public void present() {
         for (int i = 0; i < tabs.size(); i++) {
-            BottomTabOptions bottomTab = tabs.get(i).options.copy().withDefaultOptions(defaultOptions).bottomTabOptions;
-            bottomTabs.setBadge(i, bottomTab.badge.get(""));
-            bottomTabs.setTitleTypeface(i, bottomTab.fontFamily);
-            bottomTabs.setIconActiveColor(i, bottomTab.selectedIconColor.get(null));
-            bottomTabs.setIconInactiveColor(i, bottomTab.iconColor.get(null));
-            bottomTabs.setTitleActiveColor(i, bottomTab.selectedTextColor.get(null));
-            bottomTabs.setTitleInactiveColor(i, bottomTab.textColor.get(null));
+            BottomTabOptions tab = tabs.get(i).options.copy().withDefaultOptions(defaultOptions).bottomTabOptions;
+            bottomTabs.setBadge(i, tab.badge.get(""));
+            bottomTabs.setTitleTypeface(i, tab.fontFamily);
+            bottomTabs.setIconActiveColor(i, tab.selectedIconColor.get(null));
+            bottomTabs.setIconInactiveColor(i, tab.iconColor.get(null));
+            bottomTabs.setTitleActiveColor(i, tab.selectedTextColor.get(null));
+            bottomTabs.setTitleInactiveColor(i, tab.textColor.get(null));
+            bottomTabs.setTitleInactiveTextSizeInSp(i, tab.fontSize.hasValue() ? Float.valueOf(tab.fontSize.get()) : null);
+            bottomTabs.setTitleActiveTextSizeInSp(i, tab.selectedFontSize.hasValue() ? Float.valueOf(tab.selectedFontSize.get()) : null);
         }
     }