Pop from ContainerStack

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.controllers;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
@@ -10,6 +11,7 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.R;
+import com.reactnativenavigation.layout.StackLayout;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 import com.reactnativenavigation.react.NavigationPackage;
 import com.reactnativenavigation.react.ReactDevPermission;
@@ -20,6 +22,7 @@ import java.util.List;
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
     public static NavigationActivity instance;
     private ReactNativeHost host;
+    private StackLayout root;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -81,4 +84,17 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public ReactNativeHost getHost() {
         return host;
     }
+
+    public void setRoot(StackLayout rootView) {
+        this.root = rootView;
+        setContentView(rootView.asView());
+    }
+
+    public void push(View view) {
+        root.push(view);
+    }
+
+    public void pop() {
+        root.pop();
+    }
 }

android/app/src/main/java/com/reactnativenavigation/layout/ContainerStackLayout.java

@@ -4,13 +4,29 @@ import android.content.Context;
 import android.view.View;
 import android.widget.FrameLayout;
 
-public class ContainerStackLayout extends FrameLayout {
+public class ContainerStackLayout extends FrameLayout implements StackLayout {
+
+    private View removedView;
+
     public ContainerStackLayout(Context context) {
         super(context);
     }
 
+    @Override
     public void push(View view) {
         addView(view);
+        removedView = getChildAt(0);
+        removeView(removedView);
+    }
+
+    @Override
+    public void pop() {
+        addView(removedView);
         removeView(getChildAt(0));
     }
+
+    @Override
+    public View asView() {
+        return this;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/layout/Layout.java

@@ -0,0 +1,7 @@
+package com.reactnativenavigation.layout;
+
+import android.view.View;
+
+public interface Layout {
+    public View asView();
+}

android/app/src/main/java/com/reactnativenavigation/layout/StackLayout.java

@@ -0,0 +1,9 @@
+package com.reactnativenavigation.layout;
+
+import android.view.View;
+
+public interface StackLayout extends Layout {
+    public void push(View view);
+
+    public void pop();
+}

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

@@ -4,10 +4,12 @@ import android.app.Activity;
 import android.view.View;
 import android.widget.RelativeLayout;
 
+import com.reactnativenavigation.layout.StackLayout;
+
 import java.util.ArrayList;
 import java.util.List;
 
-public class BottomTabsLayout extends RelativeLayout implements BottomTabs.BottomTabsSelectionListener {
+public class BottomTabsLayout extends RelativeLayout implements BottomTabs.BottomTabsSelectionListener, StackLayout {
 
     private List<View> tabsContent;
     private BottomTabs bottomTabs;
@@ -60,4 +62,18 @@ public class BottomTabsLayout extends RelativeLayout implements BottomTabs.Botto
         tabsContent.get(tabId).setVisibility(View.GONE);
     }
 
+    @Override
+    public void push(View view) {
+
+    }
+
+    @Override
+    public void pop() {
+
+    }
+
+    @Override
+    public View asView() {
+        return this;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -13,6 +13,7 @@ import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.reactnativenavigation.controllers.NavigationActivity;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
+import com.reactnativenavigation.layout.StackLayout;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
 
 import java.util.ArrayList;
@@ -50,7 +51,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
                 final LayoutNode layoutTreeRoot = readableMapToLayoutNode(layoutTree);
                 final View rootView = factory.create(layoutTreeRoot);
-                NavigationActivity.instance.setContentView(rootView);
+                NavigationActivity.instance.setRoot((StackLayout) rootView);
             }
         });
     }
@@ -73,7 +74,17 @@ public class NavigationModule extends ReactContextBaseJavaModule {
                         }, new BottomTabsCreator());
                 final LayoutNode layoutNode = readableMapToLayoutNode(layout);
                 final View rootView = factory.create(layoutNode);
-                NavigationActivity.instance.setContentView(rootView);
+                NavigationActivity.instance.push(rootView);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void pop(String onContainerId) {
+        NavigationActivity.instance.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                NavigationActivity.instance.pop();
             }
         });
     }

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

@@ -173,7 +173,7 @@ public class LayoutFactoryTest {
     }
 
     @Test
-    public void pushAScreenToScreenStack() throws Exception {
+    public void pushScreenToScreenStackLayout() throws Exception {
         when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
         final LayoutNode container = createContainerNode();
         final LayoutNode stackNode = createContainerStackNode(container);
@@ -187,6 +187,22 @@ public class LayoutFactoryTest {
         assertThat(result.getChildAt(0)).isEqualTo(otherMockView);
     }
 
+    @Test
+    public void popScreenFromScreenStackLayout() {
+        when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
+        final LayoutNode container = createContainerNode();
+        final LayoutNode stackNode = createContainerStackNode(container);
+        final ContainerStackLayout containerStackLayout = (ContainerStackLayout) createLayoutFactory().create(stackNode);
+
+        when(reactRootViewCreator.create(eq(OTHER_NODE_ID), eq(OTHER_REACT_ROOT_VIEW_KEY))).thenReturn(otherMockView);
+        final LayoutNode pushedContainer = createContainerNode(OTHER_NODE_ID, OTHER_REACT_ROOT_VIEW_KEY);
+        containerStackLayout.push(createLayoutFactory().create(pushedContainer));
+
+        containerStackLayout.pop();
+        ViewGroup result = (ViewGroup) TestUtils.assertViewChildrenCount(containerStackLayout, 1).get(0);
+        assertThat(result.getChildAt(0)).isEqualTo(mockView);
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void throwsExceptionForUnknownType() throws Exception {
         when(reactRootViewCreator.create(eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);