BottomTabs refactor

Pass child ViewControllers in constructor and create tabs in constructor as well

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

@@ -152,13 +152,11 @@ public class LayoutFactory {
     }
 
     private ViewController createBottomTabs(LayoutNode node) {
-        final BottomTabsController tabsComponent = new BottomTabsController(activity, childRegistry, eventEmitter, new ImageLoader(), node.id, parseNodeOptions(node));
-		List<ViewController> tabs = new ArrayList<>();
-		for (int i = 0; i < node.children.size(); i++) {
+        List<ViewController> tabs = new ArrayList<>();
+        for (int i = 0; i < node.children.size(); i++) {
             tabs.add(create(node.children.get(i)));
-		}
-		tabsComponent.setTabs(tabs);
-		return tabsComponent;
+        }
+        return new BottomTabsController(activity, tabs, childRegistry, eventEmitter, new ImageLoader(), node.id, parseNodeOptions(node));
 	}
 
     private ViewController createTopTabs(LayoutNode node) {

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

@@ -32,16 +32,18 @@ import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 public class BottomTabsController extends ParentController implements AHBottomNavigation.OnTabSelectedListener, TabSelector {
 
 	private BottomTabs bottomTabs;
-	private List<ViewController> tabs = new ArrayList<>();
+	private List<ViewController> tabs;
     private EventEmitter eventEmitter;
     private ImageLoader imageLoader;
     private BottomTabsOptionsPresenter presenter;
     private final BottomTabFinder bottomTabFinder = new BottomTabFinder();
 
-    public BottomTabsController(Activity activity, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, ImageLoader imageLoader, String id, Options initialOptions) {
+    public BottomTabsController(Activity activity, List<ViewController> tabs, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, ImageLoader imageLoader, String id, Options initialOptions) {
 		super(activity, childRegistry, id, initialOptions);
+        this.tabs = tabs;
         this.eventEmitter = eventEmitter;
         this.imageLoader = imageLoader;
+        createTabs(tabs);
     }
 
 	@NonNull
@@ -102,8 +104,8 @@ public class BottomTabsController extends ParentController implements AHBottomNa
         selectTab(index);
         return true;
 	}
-	
-	public void setTabs(final List<ViewController> tabs) {
+
+	private void createTabs(final List<ViewController> tabs) {
 		if (tabs.size() > 5) {
 			throw new RuntimeException("Too many tabs!");
 		}
@@ -128,9 +130,7 @@ public class BottomTabsController extends ParentController implements AHBottomNa
             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);
-
+                    tabs.add(new AHBottomNavigationItem(bottomTabOptionsList.get(i).title.get(""), drawables.get(i)));
                 }
                 bottomTabs.addItems(tabs);
                 bottomTabs.post(() -> {
@@ -149,11 +149,6 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 
 	}
 
-	private AHBottomNavigationItem createTab(final BottomTabOptions tabOptions, Drawable drawable) {
-        return  new AHBottomNavigationItem(tabOptions.title.get(""), drawable);
-
-	}
-
     public int getSelectedIndex() {
 		return bottomTabs.getCurrentItem();
 	}

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

@@ -31,7 +31,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -61,20 +60,23 @@ public class BottomTabsControllerTest extends BaseTest {
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
         eventEmitter = Mockito.mock(EventEmitter.class);
-        uut = spy(new BottomTabsController(activity, childRegistry, eventEmitter, imageLoaderMock, "uut", new Options()) {
-            @Override
-            public void ensureViewIsCreated() {
-                super.ensureViewIsCreated();
-                uut.getView().layout(0, 0, 1000, 1000);
-                uut.getBottomTabs().layout(0, 0, 1000, 100);
-            }
-        });
+
         child1 = spy(new SimpleViewController(activity, childRegistry, "child1", tabOptions));
         child2 = spy(new SimpleViewController(activity, childRegistry, "child2", tabOptions));
         child3 = spy(new SimpleViewController(activity, childRegistry, "child3", tabOptions));
         child4 = spy(new SimpleViewController(activity, childRegistry, "child4", tabOptions));
         child5 = spy(new SimpleViewController(activity, childRegistry, "child5", tabOptions));
+        when(child5.handleBack(any())).thenReturn(true);
         tabs = createTabs();
+
+        uut = new BottomTabsController(activity, tabs, childRegistry, eventEmitter, imageLoaderMock, "uut", new Options()) {
+            @Override
+            public void ensureViewIsCreated() {
+                super.ensureViewIsCreated();
+                uut.getView().layout(0, 0, 1000, 1000);
+                uut.getBottomTabs().layout(0, 0, 1000, 100);
+            }
+        };
     }
 
     @Test
@@ -85,15 +87,19 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test(expected = RuntimeException.class)
     public void setTabs_ThrowWhenMoreThan5() {
-        List<ViewController> tabs = createTabs();
         tabs.add(new SimpleViewController(activity, childRegistry, "6", tabOptions));
-        uut.setTabs(tabs);
+        new BottomTabsController(activity, tabs, childRegistry, eventEmitter, imageLoaderMock, "uut", new Options()) {
+            @Override
+            public void ensureViewIsCreated() {
+                super.ensureViewIsCreated();
+                uut.getView().layout(0, 0, 1000, 1000);
+                uut.getBottomTabs().layout(0, 0, 1000, 100);
+            }
+        };
     }
 
     @Test
     public void setTab_controllerIsSetAsParent() {
-        List<ViewController> tabs = createTabs();
-        uut.setTabs(tabs);
         for (ViewController tab : tabs) {
             assertThat(tab.getParentController()).isEqualTo(uut);
         }
@@ -101,8 +107,6 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void setTabs_AddAllViews() {
-        List<ViewController> tabs = createTabs();
-        uut.setTabs(tabs);
         uut.onViewAppeared();
         assertThat(uut.getView().getChildCount()).isEqualTo(2);
         assertThat(((ViewController) ((List) uut.getChildControllers()).get(0)).getView().getParent()).isNotNull();
@@ -110,7 +114,6 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void onTabSelected() {
-        uut.setTabs(createTabs());
         assertThat(uut.getSelectedIndex()).isZero();
 
         uut.onTabSelected(3, false);
@@ -122,7 +125,6 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void onTabReSelected() {
-        uut.setTabs(createTabs());
         assertThat(uut.getSelectedIndex()).isZero();
 
         uut.onTabSelected(0, false);
@@ -132,39 +134,19 @@ public class BottomTabsControllerTest extends BaseTest {
         verify(eventEmitter, times(1)).emitBottomTabSelected(0, 0);
     }
 
-    @Test
-    public void findControllerById_ReturnsSelfOrChildren() {
-        assertThat(uut.findControllerById("123")).isNull();
-        assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
-        StackController inner = createStack("inner");
-        inner.push(child1, new CommandListenerAdapter());
-        assertThat(uut.findControllerById(child1.getId())).isNull();
-        uut.setTabs(Collections.singletonList(inner));
-        assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);
-    }
-
     @Test
     public void handleBack_DelegatesToSelectedChild() {
         assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
-
-        List<ViewController> tabs = createTabs();
-        ViewController spy = spy(tabs.get(2));
-        tabs.set(2, spy);
-        when(spy.handleBack(any())).thenReturn(true);
-        uut.setTabs(tabs);
-
-        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
-        uut.selectTab(2);
+        uut.selectTab(4);
         assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
-
-        verify(spy, times(1)).handleBack(any());
+        verify(child5, times(1)).handleBack(any());
     }
 
     @Test
     public void applyOptions_bottomTabsOptionsAreClearedAfterApply() {
-        List<ViewController> tabs = createTabs();
-        child1.options.bottomTabsOptions.tabColor = new Color(android.graphics.Color.RED);
-        uut.setTabs(tabs);
+        Options options = new Options();
+        options.bottomTabsOptions.tabColor = new Color(android.graphics.Color.RED);
+        child1.mergeOptions(options);
         uut.ensureViewIsCreated();
 
         StackController stack = spy(createStack("stack"));
@@ -181,20 +163,18 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void mergeOptions_currentTabIndex() {
-        uut.setTabs(tabs);
         uut.ensureViewIsCreated();
+        assertThat(uut.getSelectedIndex()).isZero();
 
         Options options = new Options();
         options.bottomTabsOptions.currentTabIndex = new Number(1);
         uut.mergeOptions(options);
-        verify(uut, times(1)).selectTab(1);
+        assertThat(uut.getSelectedIndex()).isOne();
         verify(eventEmitter, times(0)).emitBottomTabSelected(any(Integer.class), any(Integer.class));
     }
 
     @Test
     public void mergeOptions_drawBehind() {
-        List<ViewController> tabs = createTabs();
-        uut.setTabs(tabs);
         uut.ensureViewIsCreated();
         child1.onViewAppeared();
         uut.selectTab(0);
@@ -214,8 +194,6 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void child_mergeOptions_currentTabIndex() {
-        List<ViewController> tabs = createTabs();
-        uut.setTabs(tabs);
         uut.ensureViewIsCreated();
 
         assertThat(uut.getSelectedIndex()).isZero();
@@ -229,12 +207,11 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void buttonPressInvokedOnCurrentTab() {
-        uut.setTabs(createTabs());
         uut.ensureViewIsCreated();
-        uut.selectTab(1);
+        uut.selectTab(4);
 
         uut.sendOnNavigationButtonPressed("btn1");
-        verify(child2, times(1)).sendOnNavigationButtonPressed("btn1");
+        verify(child5, times(1)).sendOnNavigationButtonPressed("btn1");
     }
 
     @NonNull

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

@@ -29,6 +29,7 @@ import org.mockito.Mockito;
 import org.robolectric.android.controller.ActivityController;
 
 import java.util.Arrays;
+import java.util.List;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -120,12 +121,11 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void push_OnCorrectStackByFindingChildId() {
-        BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
         stack1.push(child1, new CommandListenerAdapter());
         stack2.push(child2, new CommandListenerAdapter());
-        bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
+        BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter());
 
         SimpleViewController newChild = new SimpleViewController(activity, childRegistry, "new child", tabOptions);
@@ -145,10 +145,9 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void pop_FromCorrectStackByFindingChildId() {
-        BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
+        BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter());
         stack1.push(child1, new CommandListenerAdapter());
         stack2.push(child2, new CommandListenerAdapter());
@@ -169,14 +168,13 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void popSpecific() {
-        BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
         stack1.push(child1, new CommandListenerAdapter());
         stack2.push(child2, new CommandListenerAdapter());
         stack2.push(child3, new CommandListenerAdapter());
         stack2.push(child4, new CommandListenerAdapter());
-        bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
+        BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter());
 
         uut.popSpecific(child2.getId(), new CommandListenerAdapter());
@@ -186,10 +184,9 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void popTo_FromCorrectStackUpToChild() {
-        BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
+        BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter());
 
         stack1.push(child1, new CommandListenerAdapter());
@@ -207,10 +204,9 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void popToRoot() {
-        BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
+        BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter());
 
         stack1.push(child1, new CommandListenerAdapter());
@@ -277,8 +273,8 @@ public class NavigatorTest extends BaseTest {
     }
 
     @NonNull
-    private BottomTabsController newTabs() {
-        return new BottomTabsController(activity, childRegistry, eventEmitter, imageLoaderMock, "tabsController", new Options());
+    private BottomTabsController newTabs(List<ViewController> tabs) {
+        return new BottomTabsController(activity, tabs, childRegistry, eventEmitter, imageLoaderMock, "tabsController", new Options());
     }
 
     @NonNull
@@ -338,10 +334,9 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void pop_FromCorrectStackByFindingChildId_Promise() {
-        BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         final StackController stack2 = newStack();
-        bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
+        BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter());
 
         stack1.push(child1, new CommandListenerAdapter());