Rename NavigationIconResolver to IconResolver

New class name is 54% shorter, thus better.

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

@@ -20,7 +20,7 @@ import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsAttacher;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentViewController;
 import com.reactnativenavigation.viewcontrollers.sidemenu.SideMenuController;
@@ -187,7 +187,7 @@ public class LayoutFactory {
                         new TitleBarReactViewCreator(reactInstanceManager),
                         new TopBarBackgroundViewCreator(reactInstanceManager),
                         new TitleBarButtonCreator(reactInstanceManager),
-                        new NavigationIconResolver(activity, new ImageLoader()),
+                        new IconResolver(activity, new ImageLoader()),
                         new RenderChecker(),
                         defaultOptions
                 ))

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

@@ -29,7 +29,7 @@ import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TitleBarButtonController;
 import com.reactnativenavigation.viewcontrollers.TitleBarReactViewController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
@@ -74,13 +74,13 @@ public class StackPresenter {
     private Map<View, TopBarBackgroundViewController> backgroundControllers = new HashMap();
     private Map<View, Map<String, TitleBarButtonController>> componentRightButtons = new HashMap();
     private Map<View, Map<String, TitleBarButtonController>> componentLeftButtons = new HashMap();
-    private NavigationIconResolver iconResolver;
+    private IconResolver iconResolver;
 
     public StackPresenter(Activity activity,
                           TitleBarReactViewCreator titleViewCreator,
                           TopBarBackgroundViewCreator topBarBackgroundViewCreator,
                           ReactViewCreator buttonCreator,
-                          NavigationIconResolver iconResolver,
+                          IconResolver iconResolver,
                           RenderChecker renderChecker,
                           Options defaultOptions) {
         this.activity = activity;

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

@@ -19,7 +19,7 @@ import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.views.titlebar.TitleBarReactButtonView;
 
 import java.util.List;
@@ -34,7 +34,7 @@ public class TitleBarButtonController extends ViewController<TitleBarReactButton
         void onPress(String buttonId);
     }
 
-    private final NavigationIconResolver navigationIconResolver;
+    private final IconResolver navigationIconResolver;
     private ButtonPresenter optionsPresenter;
     private final Button button;
     private final ReactViewCreator viewCreator;
@@ -51,7 +51,7 @@ public class TitleBarButtonController extends ViewController<TitleBarReactButton
     }
 
     public TitleBarButtonController(Activity activity,
-                                    NavigationIconResolver navigationIconResolver,
+                                    IconResolver navigationIconResolver,
                                     ButtonPresenter optionsPresenter,
                                     Button button,
                                     ReactViewCreator viewCreator,

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/button/NavigationIconResolver.java → lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/button/IconResolver.java

@@ -12,12 +12,12 @@ import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
 
 import androidx.annotation.NonNull;
 
-public class NavigationIconResolver {
+public class IconResolver {
 
     private Activity context;
     private ImageLoader imageLoader;
 
-    public NavigationIconResolver(Activity context, ImageLoader imageLoader) {
+    public IconResolver(Activity context, ImageLoader imageLoader) {
         this.context = context;
         this.imageLoader = imageLoader;
     }

lib/android/app/src/test/java/com/reactnativenavigation/TestUtils.java

@@ -17,7 +17,7 @@ import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.viewcontrollers.stack.StackControllerBuilder;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.StackLayout;
@@ -39,7 +39,7 @@ public class TestUtils {
                 .setId("stack")
                 .setChildRegistry(new ChildControllersRegistry())
                 .setTopBarController(topBarController)
-                .setStackPresenter(new StackPresenter(activity, new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), new TopBarButtonCreatorMock(), new NavigationIconResolver(activity, new ImageLoader()), new RenderChecker(), new Options()))
+                .setStackPresenter(new StackPresenter(activity, new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), new TopBarButtonCreatorMock(), new IconResolver(activity, new ImageLoader()), new RenderChecker(), new Options()))
                 .setInitialOptions(new Options());
     }
 

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

@@ -8,7 +8,7 @@ import com.reactnativenavigation.parse.Component;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.viewcontrollers.TitleBarButtonController;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.views.titlebar.TitleBar;
 
 import androidx.appcompat.view.menu.ActionMenuItemView;
@@ -45,7 +45,7 @@ public class TitleBarHelper {
 
     public static TitleBarButtonController createButtonController(Activity activity, TitleBar titleBar, Button button) {
         return new TitleBarButtonController(activity,
-                new NavigationIconResolver(activity, ImageLoaderMock.mock()),
+                new IconResolver(activity, ImageLoaderMock.mock()),
                 new ButtonPresenter(titleBar, button),
                 button,
                 new TopBarButtonCreatorMock(),

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

@@ -32,7 +32,7 @@ import com.reactnativenavigation.presentation.StackPresenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.TitleBarHelper;
 import com.reactnativenavigation.utils.UiUtils;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.StackLayout;
@@ -86,7 +86,7 @@ public class StackPresenterTest extends BaseTest {
     private Button componentBtn2 = TitleBarHelper.reactViewButton("btn2_");
     private TopBarController topBarController;
     private ChildControllersRegistry childRegistry;
-    private NavigationIconResolver iconResolver;
+    private IconResolver iconResolver;
 
     @Override
     public void beforeEach() {
@@ -98,7 +98,7 @@ public class StackPresenterTest extends BaseTest {
             }
         };
         renderChecker = spy(new RenderChecker());
-        iconResolver = new NavigationIconResolver(activity, ImageLoaderMock.mock());
+        iconResolver = new IconResolver(activity, ImageLoaderMock.mock());
         uut = spy(new StackPresenter(activity, titleViewCreator, new TopBarBackgroundViewCreatorMock(), new TopBarButtonCreatorMock(), iconResolver, renderChecker, new Options()));
         createTopBarController();
 

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

@@ -16,7 +16,7 @@ import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.ButtonPresenter;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
 import org.junit.Test;
@@ -51,7 +51,7 @@ public class TopBarButtonControllerTest extends BaseTest {
         getTitleBar().layout(0, 0, 1080, 200);
 
         optionsPresenter = spy(new ButtonPresenter(getTitleBar(), button));
-        uut = new TitleBarButtonController(activity, new NavigationIconResolver(activity, ImageLoaderMock.mock()), optionsPresenter, button, buttonCreatorMock, (buttonId) -> {});
+        uut = new TitleBarButtonController(activity, new IconResolver(activity, ImageLoaderMock.mock()), optionsPresenter, button, buttonCreatorMock, (buttonId) -> {});
 
         stackController.ensureViewIsCreated();
     }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/button/NavigationIconResolverTest.java

@@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify;
 
 public class NavigationIconResolverTest extends BaseTest {
     private static final String ICON_URI = "someIconUri";
-    private NavigationIconResolver uut;
+    private IconResolver uut;
     private ImageLoader imageLoader;
     private Activity context;
 
@@ -31,7 +31,7 @@ public class NavigationIconResolverTest extends BaseTest {
     public void beforeEach() {
         imageLoader = ImageLoaderMock.mock();
         context = newActivity();
-        uut = new NavigationIconResolver(context, imageLoader);
+        uut = new IconResolver(context, imageLoader);
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java

@@ -32,7 +32,7 @@ import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
+import com.reactnativenavigation.viewcontrollers.button.IconResolver;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.StackLayout;
 import com.reactnativenavigation.views.element.ElementTransitionManager;
@@ -96,7 +96,7 @@ public class StackControllerTest extends BaseTest {
         StatusBarUtils.saveStatusBarHeight(63);
         animator = spy(new NavigationAnimator(activity, Mockito.mock(ElementTransitionManager.class)));
         childRegistry = new ChildControllersRegistry();
-        presenter = spy(new StackPresenter(activity, new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), new TopBarButtonCreatorMock(), new NavigationIconResolver(activity, ImageLoaderMock.mock()), new RenderChecker(), new Options()));
+        presenter = spy(new StackPresenter(activity, new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), new TopBarButtonCreatorMock(), new IconResolver(activity, ImageLoaderMock.mock()), new RenderChecker(), new Options()));
         child1 = spy(new SimpleViewController(activity, childRegistry, "child1", new Options()));
         child1a = spy(new SimpleViewController(activity, childRegistry, "child1", new Options()));
         child2 = spy(new SimpleViewController(activity, childRegistry, "child2", new Options()));