Push pop to BottomTabsLayout

android/app/src/main/java/com/reactnativenavigation/layout/bottomtabs/BottomTabsLayout.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public class BottomTabsLayout extends RelativeLayout implements BottomTabs.BottomTabsSelectionListener, StackLayout {
 
-    private List<View> tabsContent;
+    private List<StackLayout> tabsContent;
     private BottomTabs bottomTabs;
     private int currentTab;
 
@@ -26,7 +26,7 @@ public class BottomTabsLayout extends RelativeLayout implements BottomTabs.Botto
         }
         bottomTabs.add(label);
         attachTabContent(tabContent);
-        tabsContent.add(tabContent);
+        tabsContent.add((StackLayout) tabContent);
 
         if (tabsContent.size() > 1) {
             tabContent.setVisibility(View.GONE);
@@ -55,21 +55,21 @@ public class BottomTabsLayout extends RelativeLayout implements BottomTabs.Botto
     }
 
     private void showTab(int tabId) {
-        tabsContent.get(tabId).setVisibility(View.VISIBLE);
+        tabsContent.get(tabId).asView().setVisibility(View.VISIBLE);
     }
 
     private void hideTab(int tabId) {
-        tabsContent.get(tabId).setVisibility(View.GONE);
+        tabsContent.get(tabId).asView().setVisibility(View.GONE);
     }
 
     @Override
     public void push(View view) {
-
+        tabsContent.get(currentTab).push(view);
     }
 
     @Override
     public void pop() {
-
+        tabsContent.get(currentTab).pop();
     }
 
     @Override

android/app/src/test/java/com/reactnativenavigation/BottomTabsContainerTest.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation;
 import android.app.Activity;
 import android.view.View;
 
+import com.reactnativenavigation.layout.ContainerStackLayout;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabs;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
 import com.reactnativenavigation.layout.bottomtabs.TooManyTabsException;
@@ -34,7 +35,7 @@ public class BottomTabsContainerTest {
 
     @Test
     public void addsTabToBottomTabs() throws Exception {
-        View tabContent = new View(activity);
+        ContainerStackLayout tabContent = new ContainerStackLayout(activity);
 
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
         bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
@@ -44,19 +45,19 @@ public class BottomTabsContainerTest {
 
     @Test
     public void addsTabContentToLayout() throws Exception {
-        View tabContent = new View(activity);
+        ContainerStackLayout stackLayout = new ContainerStackLayout(activity);
 
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-        bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
+        bottomTabsContainer.addTabContent(TAB_NAME, stackLayout);
 
         verify(bottomTabs).attach(bottomTabsContainer);
-        TestUtils.assertViewChildren(bottomTabsContainer, tabContent);
+        TestUtils.assertViewChildren(bottomTabsContainer, stackLayout);
     }
 
     @Test
     public void addsTwoTabsContentToLayout() throws Exception {
-        View tabContent = new View(activity);
-        View otherTabContent = new View(activity);
+        View tabContent = new ContainerStackLayout(activity);
+        View otherTabContent = new ContainerStackLayout(activity);
 
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
         bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
@@ -69,7 +70,7 @@ public class BottomTabsContainerTest {
     public void throwsExceptionWhenMoreThenFiveTabs() throws Exception {
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
         for (int i = 0; i < 6; i++) {
-            View content = new View(activity);
+            ContainerStackLayout content = new ContainerStackLayout(activity);
             bottomTabsContainer.addTabContent("#" + i, content);
         }
     }
@@ -78,15 +79,15 @@ public class BottomTabsContainerTest {
     public void addFiveTabs() throws Exception {
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
         for (int i = 0; i < 5; i++) {
-            View content = new View(activity);
+            ContainerStackLayout content = new ContainerStackLayout(activity);
             bottomTabsContainer.addTabContent("#" + i, content);
         }
     }
 
     @Test
     public void onlyFirstTabShouldBeVisible() throws Exception {
-        View tabContent = new View(activity);
-        View otherTabContent = new View(activity);
+        ContainerStackLayout tabContent = new ContainerStackLayout(activity);
+        ContainerStackLayout otherTabContent = new ContainerStackLayout(activity);
 
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
         bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
@@ -104,8 +105,8 @@ public class BottomTabsContainerTest {
 
     @Test
     public void switchesBetweenFirstAndSecondTabs() throws Exception {
-        View tabContent = new View(activity);
-        View otherTabContent = new View(activity);
+        ContainerStackLayout tabContent = new ContainerStackLayout(activity);
+        ContainerStackLayout otherTabContent = new ContainerStackLayout(activity);
 
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
         bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
@@ -118,8 +119,8 @@ public class BottomTabsContainerTest {
 
     @Test
     public void switchesBetweenSecondAndFirstTabs() throws Exception {
-        View tabContent = new View(activity);
-        View otherTabContent = new View(activity);
+        ContainerStackLayout tabContent = new ContainerStackLayout(activity);
+        ContainerStackLayout otherTabContent = new ContainerStackLayout(activity);
 
         BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
         bottomTabsContainer.addTabContent(TAB_NAME, tabContent);

android/app/src/test/java/com/reactnativenavigation/LayoutFactoryTest.java

@@ -139,7 +139,7 @@ public class LayoutFactoryTest {
         when(bottomTabsMock.size()).thenReturn(0);
 
         when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-        final LayoutNode containerNode = createContainerNode();
+        final LayoutNode containerNode = createContainerStackNode(createContainerNode());
         final LayoutNode tabNode = createBottomTabNode(containerNode);
 
         final View result = createLayoutFactory(bottomTabsMock).create(tabNode);
@@ -147,7 +147,8 @@ public class LayoutFactoryTest {
         verify(bottomTabsMock).add("#0");
 
         assertThat(result).isInstanceOf(BottomTabsLayout.class);
-        Container container = (Container) TestUtils.assertViewChildrenCount((BottomTabsLayout) result, 1).get(0);
+        ViewGroup containerStack = (ViewGroup) TestUtils.assertViewChildrenCount((BottomTabsLayout) result, 1).get(0);
+        Container container = (Container)  TestUtils.assertViewChildrenCount(containerStack, 1).get(0);
         View view = TestUtils.assertViewChildrenCount(container, 1).get(0);
         assertThat(view).isEqualTo(mockView);
     }
@@ -158,7 +159,7 @@ public class LayoutFactoryTest {
         when(bottomTabsMock.size()).thenReturn(0, 1);
 
         when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-        final LayoutNode firstTabRootNode = createContainerNode(NODE_ID, REACT_ROOT_VIEW_KEY);
+        final LayoutNode firstTabRootNode = createContainerStackNode(createContainerNode(NODE_ID, REACT_ROOT_VIEW_KEY));
 
         when(reactRootViewCreator.create(eq(OTHER_NODE_ID), eq(OTHER_REACT_ROOT_VIEW_KEY))).thenReturn(otherMockView);
         final LayoutNode secondTabRootNode = createContainerStackNode(createContainerNode(OTHER_NODE_ID, OTHER_REACT_ROOT_VIEW_KEY));
@@ -172,6 +173,51 @@ public class LayoutFactoryTest {
         verify(bottomTabsMock).add(eq("#1"));
     }
 
+    @Test
+    public void pushScreenToFirstBottomTab() {
+        BottomTabs bottomTabsMock = mock(BottomTabs.class);
+        when(bottomTabsMock.size()).thenReturn(0, 1);
+
+        when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
+        final LayoutNode firstTabContainerStack = createContainerStackNode(createContainerNode(NODE_ID, REACT_ROOT_VIEW_KEY));
+
+        final LayoutNode tabNode = createBottomTabNode(firstTabContainerStack);
+        final BottomTabsLayout bottomTabsContainer = (BottomTabsLayout) createLayoutFactory(bottomTabsMock).create(tabNode);
+        verify(bottomTabsMock).add(eq("#0"));
+
+        View pushedReactView = new View(activity);
+        when(reactRootViewCreator.create(eq("pushedReactViewId"), eq("pushedReactViewKey"))).thenReturn(pushedReactView);
+        View view = createLayoutFactory().create(createContainerNode("pushedReactViewId", "pushedReactViewKey"));
+        bottomTabsContainer.push(view);
+
+        ViewGroup containerStack = (ViewGroup) TestUtils.assertViewChildrenCount(bottomTabsContainer, 1).get(0);
+        ViewGroup container = (ViewGroup) TestUtils.assertViewChildrenCount(containerStack, 1).get(0);
+        View result = TestUtils.assertViewChildrenCount(container, 1).get(0);
+        assertThat(result).isEqualTo(pushedReactView);
+    }
+
+    @Test
+    public void popScreenFromFirstBottomTab() {
+        BottomTabs bottomTabsMock = mock(BottomTabs.class);
+        when(bottomTabsMock.size()).thenReturn(0, 1);
+
+        when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
+        final LayoutNode firstTabContainerStack = createContainerStackNode(createContainerNode(NODE_ID, REACT_ROOT_VIEW_KEY));
+
+        final LayoutNode tabNode = createBottomTabNode(firstTabContainerStack);
+        final BottomTabsLayout bottomTabsContainer = (BottomTabsLayout) createLayoutFactory(bottomTabsMock).create(tabNode);
+        verify(bottomTabsMock).add(eq("#0"));
+
+        pushContainer(bottomTabsContainer, "pushedReactViewId", "pushedReactViewKey", new View(activity));
+
+        bottomTabsContainer.pop();
+
+        ViewGroup containerStack = (ViewGroup) TestUtils.assertViewChildrenCount(bottomTabsContainer, 1).get(0);
+        ViewGroup container = (ViewGroup) TestUtils.assertViewChildrenCount(containerStack, 1).get(0);
+        View result = TestUtils.assertViewChildrenCount(container, 1).get(0);
+        assertThat(result).isEqualTo(mockView);
+    }
+
     @Test
     public void pushScreenToScreenStackLayout() throws Exception {
         when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
@@ -227,6 +273,12 @@ public class LayoutFactoryTest {
         containerStackLayout.push(pushedContainer);
     }
 
+    private void pushContainer(BottomTabsLayout containerStackLayout, String screenId, String reactRootViewKey, View rootView) {
+        when(reactRootViewCreator.create(eq(screenId), eq(reactRootViewKey))).thenReturn(rootView);
+        View pushedContainer = createLayoutFactory().create(createContainerNode(screenId, reactRootViewKey));
+        containerStackLayout.push(pushedContainer);
+    }
+
     @Test
     public void popScreenFromScreenStackLayout() {
         when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);