Implement images loader (#3152)

* Implementation of passing multiple arguments to ImageLoader in order to avoid asynchronous issues and for performance as BottomBar re-creates all views every time an item is added

* removed redundant checks for testId

* Implementation of passing multiple arguments to ImageLoader in order to avoid asynchronous issues and for performance as BottomBar re-creates all views every time an item is added

* removed redundant checks for testId

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

@@ -18,21 +18,28 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ImageLoader {
 
-    public interface ImageLoadingListener {
-        void onComplete(@NonNull Drawable drawable);
+    public interface ImagesLoadingListener {
+        void onComplete(@NonNull List<Drawable> drawable);
 
         void onError(Throwable error);
     }
 
     private static final String FILE_SCHEME = "file";
 
-    public void loadIcon(final Context context, final String uri, final ImageLoadingListener listener) {
+
+    public void loadIcons(final Context context, List<String> uris, ImagesLoadingListener listener) {
         try {
-            Drawable drawable = getDrawable(context, uri);
-            listener.onComplete(drawable);
+            List<Drawable> drawables = new ArrayList<>();
+            for (String uri : uris) {
+                Drawable drawable = getDrawable(context, uri);
+                drawables.add(drawable);
+            }
+            listener.onComplete(drawables);
         } catch (IOException e) {
             listener.onError(e);
         }

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

@@ -3,9 +3,11 @@ package com.reactnativenavigation.utils;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 
-public class ImageLoadingListenerAdapter implements ImageLoader.ImageLoadingListener {
+import java.util.List;
+
+public class ImageLoadingListenerAdapter implements ImageLoader.ImagesLoadingListener {
     @Override
-    public void onComplete(@NonNull Drawable drawable) {
+    public void onComplete(@NonNull List<Drawable> drawables) {
 
     }
 

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

@@ -25,6 +25,7 @@ public class NoOpPromise implements Promise {
 
     }
 
+    @Deprecated
     @Override
     public void reject(String message) {
 

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

@@ -22,6 +22,7 @@ import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.titlebar.TitleBarReactButtonView;
 
+import java.util.Collections;
 import java.util.List;
 
 public class TopBarButtonController extends ViewController<TitleBarReactButtonView> implements MenuItem.OnMenuItemClickListener {
@@ -79,11 +80,11 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
             return;
         }
 
-        imageLoader.loadIcon(toolbar.getContext(), button.icon.get(), new ImageLoader.ImageLoadingListener() {
+        imageLoader.loadIcons(toolbar.getContext(), Collections.singletonList(button.icon.get()), new ImageLoader.ImagesLoadingListener() {
             @Override
-            public void onComplete(@NonNull Drawable drawable) {
-                icon = drawable;
-                setIconColor(drawable);
+            public void onComplete(@NonNull List<Drawable> drawables) {
+                icon = drawables.get(0);
+                setIconColor(icon);
                 toolbar.setNavigationOnClickListener(view -> onPressListener.onPress(button.id));
                 toolbar.setNavigationIcon(icon);
                 setLeftButtonTestId(toolbar);
@@ -117,7 +118,8 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
             if (button.hasIcon()) {
                 loadIcon(new ImageLoadingListenerAdapter() {
                     @Override
-                    public void onComplete(@NonNull Drawable icon) {
+                    public void onComplete(@NonNull List<Drawable> icons) {
+                        Drawable icon = icons.get(0);
                         TopBarButtonController.this.icon = icon;
                         setIconColor(icon);
                         menuItem.setIcon(icon);
@@ -132,8 +134,8 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
         setTestId(toolbar, button.testId);
     }
 
-    private void loadIcon(ImageLoader.ImageLoadingListener callbacks) {
-        imageLoader.loadIcon(getActivity(), button.icon.get(), callbacks);
+    private void loadIcon(ImageLoader.ImagesLoadingListener callback) {
+        imageLoader.loadIcons(getActivity(), Collections.singletonList(button.icon.get()), callback);
     }
 
     private void setIconColor(Drawable icon) {

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

@@ -111,23 +111,33 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		this.tabs = tabs;
         bottomTabFinder.setTabs(tabs);
         getView();
-		for (int i = 0; i < tabs.size(); i++) {
-		    tabs.get(i).setParentController(this);
-			createTab(i, tabs.get(i).options.bottomTabOptions);
-		}
-		selectTab(0);
-	}
-
-	private void createTab(int index, final BottomTabOptions tabOptions) {
-	    if (!tabOptions.icon.hasValue()) {
-            throw new RuntimeException("BottomTab must have an icon");
+        List<String> icons = new ArrayList<>();
+        List<BottomTabOptions> bottomTabOptionsList = new ArrayList<>();
+        for (int i = 0; i < tabs.size(); i++) {
+            tabs.get(i).setParentController(this);
+            BottomTabOptions tabOptions = tabs.get(i).options.bottomTabOptions;
+            if (!tabOptions.icon.hasValue()) {
+                throw new RuntimeException("BottomTab must have an icon");
+            }
+            bottomTabOptionsList.add(tabOptions);
+            icons.add(tabOptions.icon.get());
         }
-        imageLoader.loadIcon(getActivity(), tabOptions.icon.get(), new ImageLoader.ImageLoadingListener() {
+
+        imageLoader.loadIcons(getActivity(), icons, new ImageLoader.ImagesLoadingListener() {
+
             @Override
-            public void onComplete(@NonNull Drawable drawable) {
-                AHBottomNavigationItem item = new AHBottomNavigationItem(tabOptions.title.get(""), drawable);
-                bottomTabs.addItem(item);
-                bottomTabs.post(() -> bottomTabs.setTabTag(index, tabOptions.testId));
+            public void onComplete(@NonNull List<Drawable> drawables) {
+                List<AHBottomNavigationItem> tabs = new ArrayList<>();
+                for (int i = 0; i < drawables.size(); i++) {
+                    AHBottomNavigationItem tab = createTab(bottomTabOptionsList.get(i), drawables.get(i));
+                    tabs.add(tab);
+
+                }
+                bottomTabs.addItems(tabs);
+                for (int i = 0; i < bottomTabOptionsList.size(); i++) {
+                    bottomTabs.setTabTag(i, bottomTabOptionsList.get(i).testId);
+                }
+                selectTab(0);
             }
 
             @Override
@@ -135,6 +145,12 @@ public class BottomTabsController extends ParentController implements AHBottomNa
                 error.printStackTrace();
             }
         });
+
+	}
+
+	private AHBottomNavigationItem createTab(final BottomTabOptions tabOptions, Drawable drawable) {
+        return  new AHBottomNavigationItem(tabOptions.title.get(""), drawable);
+
 	}
 
     public int getSelectedIndex() {

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.views;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.support.annotation.IntRange;
+import android.view.View;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.reactnativenavigation.parse.params.Text;
@@ -17,9 +18,10 @@ public class BottomTabs extends AHBottomNavigation {
     }
 
     public void setTabTag(int index, Text testId) {
-        if (!testId.hasValue()) return;
-        if (testId.hasValue()) getViewAtPosition(index).setTag(testId.get());
-        if (testId.hasValue()) getViewAtPosition(index).setContentDescription(testId.get());
+        View view = getViewAtPosition(index);
+        if (!testId.hasValue() || view == null) return;
+        view.setTag(testId.get());
+        view.setContentDescription(testId.get());
     }
 
     public void setBadge(int bottomTabIndex, Text badge) {

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

@@ -10,6 +10,9 @@ import com.reactnativenavigation.anim.FabCollapseBehaviour;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.utils.ImageLoader;
 
+import java.util.Collections;
+import java.util.List;
+
 
 public class Fab extends FloatingActionButton implements FabAnimator {
 
@@ -23,10 +26,10 @@ public class Fab extends FloatingActionButton implements FabAnimator {
     }
 
     public void applyIcon(String icon) {
-        new ImageLoader().loadIcon(getContext(), icon, new ImageLoader.ImageLoadingListener() {
+        new ImageLoader().loadIcons(getContext(), Collections.singletonList(icon), new ImageLoader.ImagesLoadingListener() {
             @Override
-            public void onComplete(@NonNull Drawable drawable) {
-                setImageDrawable(drawable);
+            public void onComplete(@NonNull List<Drawable> drawables) {
+                setImageDrawable(drawables.get(0));
             }
 
             @Override

lib/android/app/src/test/java/com/reactnativenavigation/mocks/ImageLoaderMock.java

@@ -9,8 +9,10 @@ import com.reactnativenavigation.utils.ImageLoader;
 
 import org.mockito.Mockito;
 
+import java.util.Collections;
+import java.util.List;
+
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 
 public class ImageLoaderMock {
@@ -40,10 +42,12 @@ public class ImageLoaderMock {
         ImageLoader imageLoader = Mockito.mock(ImageLoader.class);
         doAnswer(
                 invocation -> {
-                    ((ImageLoader.ImageLoadingListener) invocation.getArguments()[2]).onComplete(mockDrawable);
+                    int urlCount = ((List) invocation.getArguments()[1]).size();
+                    List<Drawable> drawables = Collections.nCopies(urlCount, mockDrawable);
+                    ((ImageLoader.ImagesLoadingListener) invocation.getArguments()[2]).onComplete(drawables);
                     return null;
                 }
-        ).when(imageLoader).loadIcon(any(), anyString(), any());
+        ).when(imageLoader).loadIcons(any(), any(), any());
         return imageLoader;
     }
 }