Support selectedIcon options on Android

lib/android/app/build.gradle

@@ -97,7 +97,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.material:material:1.1.0-alpha08'
 
-    implementation 'com.github.wix-playground:ahbottomnavigation:3.0.2'
+    implementation 'com.github.wix-playground:ahbottomnavigation:3.0.5'
     implementation 'com.github.wix-playground:reflow-animator:1.0.4'
     implementation 'com.github.clans:fab:1.6.4'
 

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

@@ -30,6 +30,7 @@ public static BottomTabOptions parse(TypefaceLoader typefaceManager, JSONObject
         options.textColor = ColorParser.parse(json, "textColor");
         options.selectedTextColor = ColorParser.parse(json, "selectedTextColor");
         if (json.has("icon")) options.icon = TextParser.parse(json.optJSONObject("icon"), "uri");
+        if (json.has("selectedIcon")) options.selectedIcon = TextParser.parse(json.optJSONObject("selectedIcon"), "uri");
         options.iconColor = ColorParser.parse(json, "iconColor");
         options.selectedIconColor = ColorParser.parse(json, "selectedIconColor");
         options.badge = TextParser.parse(json, "badge");
@@ -47,6 +48,7 @@ public static BottomTabOptions parse(TypefaceLoader typefaceManager, JSONObject
     public Colour textColor = new NullColor();
     public Colour selectedTextColor = new NullColor();
     public Text icon = new NullText();
+    public Text selectedIcon = new NullText();
     public Colour iconColor = new NullColor();
     public Colour selectedIconColor = new NullColor();
     public Text testId = new NullText();
@@ -64,6 +66,7 @@ void mergeWith(final BottomTabOptions other) {
         if (other.textColor.hasValue()) textColor = other.textColor;
         if (other.selectedTextColor.hasValue()) selectedTextColor = other.selectedTextColor;
         if (other.icon.hasValue()) icon = other.icon;
+        if (other.selectedIcon.hasValue()) selectedIcon = other.selectedIcon;
         if (other.iconColor.hasValue()) iconColor = other.iconColor;
         if (other.selectedIconColor.hasValue()) selectedIconColor = other.selectedIconColor;
         if (other.badge.hasValue()) badge = other.badge;
@@ -81,6 +84,7 @@ void mergeWithDefault(final BottomTabOptions defaultOptions) {
         if (!textColor.hasValue()) textColor = defaultOptions.textColor;
         if (!selectedTextColor.hasValue()) selectedTextColor = defaultOptions.selectedTextColor;
         if (!icon.hasValue()) icon = defaultOptions.icon;
+        if (!selectedIcon.hasValue()) selectedIcon = defaultOptions.selectedIcon;
         if (!iconColor.hasValue()) iconColor = defaultOptions.iconColor;
         if (!selectedIconColor.hasValue()) selectedIconColor = defaultOptions.selectedIconColor;
         if (!badge.hasValue()) badge = defaultOptions.badge;

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

@@ -89,6 +89,12 @@ public void onComplete(@NonNull Drawable drawable) {
                         bottomTabs.setIcon(index, drawable);
                     }
                 });
+                if (tab.selectedIcon.hasValue()) imageLoader.loadIcon(context, tab.selectedIcon.get(), new ImageLoadingListenerAdapter() {
+                    @Override
+                    public void onComplete(@NonNull Drawable drawable) {
+                        bottomTabs.setSelectedIcon(index, drawable);
+                    }
+                });
                 if (tab.testId.hasValue()) bottomTabs.setTag(index, tab.testId.get());
                 if (shouldApplyDot(tab)) mergeDotIndicator(index, tab.dotIndicator); else mergeBadge(index, tab);
             }

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

@@ -7,8 +7,6 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.StrictMode;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 import com.reactnativenavigation.NavigationApplication;
@@ -20,6 +18,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class ImageLoader {
 
     public interface ImagesLoadingListener {
@@ -33,7 +34,8 @@ public interface ImagesLoadingListener {
     private static final String FILE_SCHEME = "file";
 
     @Nullable
-    public Drawable loadIcon(Context context, String uri) {
+    public Drawable loadIcon(Context context, @Nullable String uri) {
+        if (uri == null) return null;
         try {
             return getDrawable(context, uri);
         } catch (IOException e) {
@@ -64,7 +66,7 @@ public void loadIcons(final Context context, List<String> uris, ImagesLoadingLis
     }
 
     @NonNull
-    private Drawable getDrawable(Context context, String source) throws IOException {
+    private Drawable getDrawable(Context context, @NonNull String source) throws IOException {
         Drawable drawable;
         if (isLocalFile(Uri.parse(source))) {
             drawable = loadFile(source);

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -159,6 +159,7 @@ private List<AHBottomNavigationItem> createTabs() {
             return new AHBottomNavigationItem(
                     options.text.get(""),
                     imageLoader.loadIcon(getActivity(), options.icon.get()),
+                    imageLoader.loadIcon(getActivity(), options.selectedIcon.get(null)),
                     options.testId.get("")
             );
         });

lib/android/app/src/main/java/com/reactnativenavigation/views/BottomTabs.java

@@ -75,7 +75,15 @@ public void setText(int index, String text) {
     public void setIcon(int index, Drawable icon) {
         AHBottomNavigationItem item = getItem(index);
         if (!item.getDrawable(getContext()).equals(icon)) {
-            item.setDrawable(icon);
+            item.setIcon(icon);
+            refresh();
+        }
+    }
+
+    public void setSelectedIcon(int index, Drawable icon) {
+        AHBottomNavigationItem item = getItem(index);
+        if (!item.getDrawable(getContext()).equals(icon)) {
+            item.setSelectedIcon(icon);
             refresh();
         }
     }

playground/src/app.js

@@ -49,7 +49,7 @@ function start() {
                   bottomTab: {
                     text: 'Layouts',
                     icon: require('../img/layouts.png'),
-                    fontSize: 10,
+                    selectedIcon: require('../img/layouts_selected.png'),
                     testID: testIDs.LAYOUTS_TAB
                   }
                 }
@@ -73,6 +73,7 @@ function start() {
                   bottomTab: {
                     text: 'Options',
                     icon: require('../img/options.png'),
+                    selectedIcon: require('../img/options_selected.png'),
                     testID: testIDs.OPTIONS_TAB
                   }
                 }