trying to pop

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ScreenStackTest.java

@@ -25,7 +25,7 @@ public class ScreenStackTest extends BaseTest {
 		assertExists(By.text("Stack Position: 1"));
 		elementByText("PUSH").click();
 		assertExists(By.text("Stack Position: 2"));
-		elementByText("Pop Previous").click();
+		elementByText("POP PREVIOUS").click();
 		assertExists(By.text("Stack Position: 2"));
 		elementByText("Pop").click();
 		assertMainShown();

e2e/app.test.js

@@ -50,7 +50,7 @@ describe('screen stack', () => {
 
   it('pop screen deep in the stack', async () => {
     await elementByLabel('Push').tap();
-    await expect(elementByLabel('Stack Position: 1')).toBeVisible();
+    await expect(elementByLabel('Stack Position: 1')).t\oBeVisible();
     await elementByLabel('Push').tap();
     await expect(elementByLabel('Stack Position: 2')).toBeVisible();
     await elementByLabel('Pop Previous').tap();

lib/android/app/build.gradle

@@ -55,6 +55,7 @@ dependencies {
     compile 'com.facebook.react:react-native:+'
 
     // third party
+    compile 'com.bluelinelabs:conductor:2.1.1'
     compile 'com.aurelhubert:ahbottomnavigation:1.3.3'
     compile 'com.balysv.materialmenu:material-menu-toolbar:1.5.4'
 

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import android.widget.FrameLayout;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.layout.Layout;
@@ -16,6 +17,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setContentView(new FrameLayout(this));
 		app().activityLifecycle.onActivityCreated(this);
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -5,17 +5,20 @@ import android.app.Application;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
+import com.reactnativenavigation.controllers.Store;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
+	private Store store;
 	private NavigationReactNativeHost reactNativeHost;
 	ActivityLifecycleDelegate activityLifecycle;
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		reactNativeHost = new NavigationReactNativeHost(this, isDebug());
+		store = new Store();
+		reactNativeHost = new NavigationReactNativeHost(this, isDebug(), store);
 		activityLifecycle = new ActivityLifecycleDelegate(reactNativeHost.getReactInstanceManager(), isDebug());
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/controllers/Store.java

@@ -0,0 +1,18 @@
+package com.reactnativenavigation.controllers;
+
+import com.reactnativenavigation.layout.Layout;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Store {
+	private Map<String, Layout> layoutsById = new HashMap<>();
+
+	public void setLayout(String id, Layout layout) {
+		layoutsById.put(id, layout);
+	}
+
+	public Layout getLayout(String id) {
+		return layoutsById.get(id);
+	}
+}

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

@@ -2,7 +2,13 @@ package com.reactnativenavigation.layout;
 
 import android.view.View;
 
+import com.reactnativenavigation.layout.impl.StackLayout;
+
 public interface Layout {
+	void setParentStackLayout(StackLayout stackLayout);
+
+	StackLayout getParentStackLayout();
+
 	View getView();
 
 	void destroy();

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.layout;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
+import com.reactnativenavigation.controllers.Store;
 import com.reactnativenavigation.layout.impl.BottomTabsLayout;
 import com.reactnativenavigation.layout.impl.RootLayout;
 import com.reactnativenavigation.layout.impl.SideMenuLayout;
@@ -12,13 +13,21 @@ public class LayoutFactory {
 
 	private final Activity activity;
 	private ReactInstanceManager reactInstanceManager;
+	private Store store;
 
-	public LayoutFactory(Activity activity, final ReactInstanceManager reactInstanceManager) {
+	public LayoutFactory(Activity activity, final ReactInstanceManager reactInstanceManager, final Store store) {
 		this.activity = activity;
 		this.reactInstanceManager = reactInstanceManager;
+		this.store = store;
 	}
 
-	public Layout create(LayoutNode node) {
+	public Layout createAndSaveToStore(LayoutNode node) {
+		Layout layout = createLayout(node);
+		store.setLayout(node.id, layout);
+		return layout;
+	}
+
+	private Layout createLayout(final LayoutNode node) {
 		switch (node.type) {
 			case Container:
 				return createContainer(node);
@@ -42,7 +51,7 @@ public class LayoutFactory {
 	private Layout createSideMenuRoot(LayoutNode node) {
 		SideMenuLayout sideMenuLayout = new SideMenuLayout(activity);
 		for (LayoutNode child : node.children) {
-			Layout childLayout = create(child);
+			Layout childLayout = createAndSaveToStore(child);
 			switch (child.type) {
 				case SideMenuCenter:
 					sideMenuLayout.addCenterLayout(childLayout);
@@ -61,15 +70,15 @@ public class LayoutFactory {
 	}
 
 	private Layout createSideMenuContent(LayoutNode node) {
-		return create(node.children.get(0));
+		return createAndSaveToStore(node.children.get(0));
 	}
 
 	private Layout createSideMenuLeft(LayoutNode node) {
-		return create(node.children.get(0));
+		return createAndSaveToStore(node.children.get(0));
 	}
 
 	private Layout createSideMenuRight(LayoutNode node) {
-		return create(node.children.get(0));
+		return createAndSaveToStore(node.children.get(0));
 	}
 
 	private Layout createContainer(LayoutNode node) {
@@ -79,7 +88,7 @@ public class LayoutFactory {
 	private Layout createContainerStack(LayoutNode node) {
 		final StackLayout layoutStack = new StackLayout(activity);
 		for (LayoutNode child : node.children) {
-			layoutStack.push(create(child));
+			layoutStack.push(createAndSaveToStore(child));
 		}
 		return layoutStack;
 	}
@@ -87,7 +96,7 @@ public class LayoutFactory {
 	private Layout createBottomTabs(LayoutNode node) {
 		final BottomTabsLayout tabsContainer = new BottomTabsLayout(activity);
 		for (int i = 0; i < node.children.size(); i++) {
-			final Layout tabLayout = create(node.children.get(i));
+			final Layout tabLayout = createAndSaveToStore(node.children.get(i));
 			tabsContainer.addTab("#" + i, tabLayout);
 		}
 		return tabsContainer;

lib/android/app/src/main/java/com/reactnativenavigation/layout/impl/BottomTabsLayout.java

@@ -23,6 +23,8 @@ import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 
 public class BottomTabsLayout implements Layout, BottomNavigationView.OnNavigationItemSelectedListener {
 
+	private StackLayout stackLayout;
+
 	public static class TooManyTabs extends RuntimeException {
 		//
 	}
@@ -87,4 +89,14 @@ public class BottomTabsLayout implements Layout, BottomNavigationView.OnNavigati
 	private void hideTab(int tabId) {
 		tabs.get(tabId).getView().setVisibility(View.GONE);
 	}
+
+	@Override
+	public void setParentStackLayout(final StackLayout stackLayout) {
+		this.stackLayout = stackLayout;
+	}
+
+	@Override
+	public StackLayout getParentStackLayout() {
+		return stackLayout;
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/layout/impl/RootLayout.java

@@ -18,6 +18,7 @@ public class RootLayout implements Layout, View.OnAttachStateChangeListener {
 	private final FrameLayout view;
 	private final ReactRootView reactRootView;
 	private final ReactInstanceManager reactInstanceManager;
+	private StackLayout parentStackLayout;
 
 	public RootLayout(Activity activity, String id, String name, final ReactInstanceManager reactInstanceManager) {
 		this.id = id;
@@ -67,4 +68,13 @@ public class RootLayout implements Layout, View.OnAttachStateChangeListener {
 	private void onStop() {
 		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStop(id);
 	}
+
+	public void setParentStackLayout(final StackLayout parentStackLayout) {
+		this.parentStackLayout = parentStackLayout;
+	}
+
+	@Override
+	public StackLayout getParentStackLayout() {
+		return parentStackLayout;
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/layout/impl/SideMenuLayout.java

@@ -14,6 +14,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 public class SideMenuLayout implements Layout {
 
 	private DrawerLayout view;
+	private StackLayout stackLayout;
 
 	public SideMenuLayout(Context context) {
 		view = new DrawerLayout(context);
@@ -50,4 +51,14 @@ public class SideMenuLayout implements Layout {
 		View child = childLayout.getView();
 		view.addView(child);
 	}
+
+	@Override
+	public void setParentStackLayout(final StackLayout stackLayout) {
+		this.stackLayout = stackLayout;
+	}
+
+	@Override
+	public StackLayout getParentStackLayout() {
+		return stackLayout;
+	}
 }

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

@@ -13,6 +13,7 @@ public class StackLayout implements Layout {
 
 	private final Stack<Layout> stack = new Stack<>();
 	private final FrameLayout view;
+	private StackLayout stackLayout;
 
 	public StackLayout(Context context) {
 		view = new FrameLayout(context);
@@ -20,6 +21,7 @@ public class StackLayout implements Layout {
 	}
 
 	public void push(Layout child) {
+		child.setParentStackLayout(this);
 		stack.push(child);
 		view.addView(child.getView());
 		if (stack.size() > 1) {
@@ -38,8 +40,14 @@ public class StackLayout implements Layout {
 		}
 	}
 
-	public void pop(String containerId) {
-
+	public void pop(Layout layout) {
+		if (stack.peek() == layout) {
+			pop();
+		} else {
+			stack.remove(layout);
+			view.removeView(layout.getView());
+			layout.destroy();
+		}
 	}
 
 	public boolean onBackPressed() {
@@ -60,4 +68,14 @@ public class StackLayout implements Layout {
 	public void destroy() {
 		//
 	}
+
+	@Override
+	public void setParentStackLayout(final StackLayout stackLayout) {
+		this.stackLayout = stackLayout;
+	}
+
+	@Override
+	public StackLayout getParentStackLayout() {
+		return stackLayout;
+	}
 }

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

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.controllers.Store;
 import com.reactnativenavigation.layout.Layout;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
@@ -17,10 +18,12 @@ import com.reactnativenavigation.utils.UiThread;
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
 	private final ReactInstanceManager reactInstanceManager;
+	private Store store;
 
-	public NavigationModule(final ReactApplicationContext reactContext, final ReactInstanceManager reactInstanceManager) {
+	public NavigationModule(final ReactApplicationContext reactContext, final ReactInstanceManager reactInstanceManager, final Store store) {
 		super(reactContext);
 		this.reactInstanceManager = reactInstanceManager;
+		this.store = store;
 	}
 
 	@Override
@@ -34,8 +37,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			@Override
 			public void run() {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
-				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
-				final Layout rootView = factory.create(layoutTree);
+				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager, store);
+				final Layout rootView = factory.createAndSaveToStore(layoutTree);
 				activity().setContentView(rootView.getView());
 				activity().setLayout(rootView);
 			}
@@ -48,8 +51,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			@Override
 			public void run() {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
-				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
-				final Layout rootView = factory.create(layoutTree);
+				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager, store);
+				final Layout rootView = factory.createAndSaveToStore(layoutTree);
 				((StackLayout) activity().getLayout()).push(rootView);
 			}
 		});
@@ -60,8 +63,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-
-				((StackLayout) activity().getLayout()).pop();
+				Layout layout = store.getLayout(onContainerId);
+				layout.getParentStackLayout().pop(layout);
 			}
 		});
 	}

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationPackage.java

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
+import com.reactnativenavigation.controllers.Store;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,15 +15,17 @@ import java.util.List;
 public class NavigationPackage implements ReactPackage {
 
 	private ReactNativeHost reactNativeHost;
+	private Store store;
 
-	public NavigationPackage(final ReactNativeHost reactNativeHost) {
+	public NavigationPackage(final ReactNativeHost reactNativeHost, final Store store) {
 		this.reactNativeHost = reactNativeHost;
+		this.store = store;
 	}
 
 	@Override
 	public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
 		return Arrays.<NativeModule>asList(
-				new NavigationModule(reactContext, reactNativeHost.getReactInstanceManager())
+				new NavigationModule(reactContext, reactNativeHost.getReactInstanceManager(), store)
 		);
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -5,6 +5,7 @@ import android.app.Application;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
+import com.reactnativenavigation.controllers.Store;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,10 +13,12 @@ import java.util.List;
 public class NavigationReactNativeHost extends ReactNativeHost {
 
 	private final boolean isDebug;
+	private Store store;
 
-	public NavigationReactNativeHost(Application application, boolean isDebug) {
+	public NavigationReactNativeHost(Application application, boolean isDebug, final Store store) {
 		super(application);
 		this.isDebug = isDebug;
+		this.store = store;
 	}
 
 	@Override
@@ -27,7 +30,7 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 	protected List<ReactPackage> getPackages() {
 		return Arrays.<ReactPackage>asList(
 				new MainReactPackage(),
-				new NavigationPackage(this)
+				new NavigationPackage(this, store)
 		);
 	}
 }

playground/android/build.gradle

@@ -20,5 +20,6 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../../node_modules/react-native/android"
         }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }