work on #965

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

@@ -3,10 +3,12 @@ package com.reactnativenavigation.e2e.androide2e;
 import android.support.test.uiautomator.By;
 
 import org.junit.FixMethodOrder;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Ignore
 public class ApplicationLifecycleTest extends BaseTest {
 
 	@Test

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

@@ -31,10 +31,9 @@ public class TopLevelApiTest extends BaseTest {
 		launchTheApp();
 		assertMainShown();
 		elementByText("PUSH LIFECYCLE SCREEN").click();
-		elementByText("onStart!");
+		assertExists(By.text("onStart"));
 		elementByText("PUSH TO TEST ONSTOP").click();
-		elementByText("Alert");
-		elementByText("onStop").click();
+		assertExists(By.text("onStop"));
 	}
 
 	@Test
@@ -42,9 +41,11 @@ public class TopLevelApiTest extends BaseTest {
 	public void unmountIsCalledOnPop() throws Exception {
 		launchTheApp();
 		assertMainShown();
-		elementByText("Push lifecycle screen").click();
-		elementByText("onStart!");
-		elementByText("BACK").click();
-		elementByText("componentWillUnmount");
+		elementByText("PUSH LIFECYCLE SCREEN").click();
+		elementByText("onStart");
+		device().pressBack();
+		assertMainShown();
+		assertExists(By.text("onStop"));
+		assertExists(By.text("componentWillUnmount"));
 	}
 }

e2e/app.test.js

@@ -21,7 +21,7 @@ describe('top level api', () => {
 
   it('screen lifecycle', async () => {
     await elementByLabel('Push lifecycle screen').tap();
-    await expect(elementByLabel('onStart!')).toBeVisible();
+    await expect(elementByLabel('onStart')).toBeVisible();
     await elementByLabel('Push to test onStop').tap();
     await expect(elementByLabel('Alert')).toBeVisible();
     await expect(elementByLabel('onStop')).toBeVisible();
@@ -29,7 +29,7 @@ describe('top level api', () => {
 
   it('unmount is called on pop', async () => {
     await elementByLabel('Push lifecycle screen').tap();
-    await expect(elementByLabel('onStart!')).toBeVisible();
+    await expect(elementByLabel('onStart')).toBeVisible();
     await element(by.traits(['button']).and(by.label('Back'))).tap();
     await expect(elementByLabel('onStop')).toBeVisible();
     await expect(elementByLabel('componentWillUnmount')).toBeVisible();

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

@@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
+import com.reactnativenavigation.layout.StackLayout;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
 	private View contentView;
@@ -50,6 +51,13 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 		onBackPressed();
 	}
 
+	@Override
+	public void onBackPressed() {
+		if (!(contentView instanceof StackLayout) || !((StackLayout) contentView).onBackPressed()) {
+			super.onBackPressed();
+		}
+	}
+
 	private NavigationApplication app() {
 		return ((NavigationApplication) getApplication());
 	}

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

@@ -7,6 +7,7 @@ import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
 import com.reactnativenavigation.layout.StackLayout;
+import com.reactnativenavigation.layout.containers.Container;
 
 import org.json.JSONObject;
 
@@ -29,7 +30,7 @@ public class CommandsHandler {
 		final LayoutNode layoutNode = LayoutNode.parse(layoutTree);
 		LayoutFactory factory = new LayoutFactory(activity, application.getReactNativeHost());
 		final View rootView = factory.create(layoutNode);
-		((StackLayout) activity.getContentView()).push(rootView);
+		((StackLayout) activity.getContentView()).push((Container) rootView);
 	}
 
 	public void pop(final NavigationActivity activity, String onContainerId) {

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

@@ -1,9 +1,11 @@
 package com.reactnativenavigation.layout;
 
-import android.view.View;
+import com.reactnativenavigation.layout.containers.Container;
 
 public interface StackLayout {
-	void push(View view);
+	void push(Container view);
 
 	void pop();
+
+	boolean onBackPressed();
 }

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/Container.java

@@ -15,6 +15,7 @@ public class Container extends FrameLayout {
 	private final ReactNativeHost reactNativeHost;
 	private final String id;
 	private final String name;
+	private ReactRootView rootView;
 
 	public Container(Activity activity, ReactNativeHost reactNativeHost, String id, String name) {
 		super(activity);
@@ -24,8 +25,18 @@ public class Container extends FrameLayout {
 		addView(createReactRootView());
 	}
 
+	@Override
+	protected void onDetachedFromWindow() {
+		super.onDetachedFromWindow();
+		onStop();
+	}
+
+	public void destroy() {
+		rootView.unmountReactApplication();
+	}
+
 	private View createReactRootView() {
-		final ReactRootView rootView = new ReactRootView(getContext());
+		rootView = new ReactRootView(getContext());
 		Bundle opts = new Bundle();
 		opts.putString("id", id);
 		rootView.startReactApplication(reactNativeHost.getReactInstanceManager(), name, opts);
@@ -39,12 +50,6 @@ public class Container extends FrameLayout {
 		return rootView;
 	}
 
-	@Override
-	protected void onDetachedFromWindow() {
-		super.onDetachedFromWindow();
-		onStop();
-	}
-
 	private void onStart() {
 		new NavigationEventEmitter(reactContext()).containerStart(id);
 	}

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/ContainerStack.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.layout.containers;
 
 import android.content.Context;
-import android.view.View;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.layout.StackLayout;
@@ -10,22 +9,45 @@ import java.util.Stack;
 
 public class ContainerStack extends FrameLayout implements StackLayout {
 
-	private Stack<View> stack = new Stack<>();
+	private Stack<Container> stack = new Stack<>();
 
 	public ContainerStack(Context context) {
 		super(context);
 	}
 
+
 	@Override
-	public void push(View view) {
+	public void push(Container view) {
+		stack.push(view);
 		addView(view);
-		stack.push(getChildAt(0));
-		removeView(getChildAt(0));
+		if (stack.size() > 1) {
+			Container previousTop = stack.elementAt(stack.size() - 2);
+			removeView(previousTop);
+		}
 	}
 
 	@Override
 	public void pop() {
-		addView(stack.pop());
-		removeView(getChildAt(0));
+		Container top = stack.pop();
+		removeView(top);
+		top.destroy();
+		if (!stack.isEmpty()) {
+			Container previousTop = stack.peek();
+			addView(previousTop);
+		}
+	}
+
+	@Override
+	public boolean onBackPressed() {
+		if (stack.isEmpty()) {
+			return false;
+		} else {
+			pop();
+			return true;
+		}
+	}
+
+	public boolean isEmpty() {
+		return stack.isEmpty();
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/layout/ContainerStackTest.java

@@ -0,0 +1,41 @@
+package com.reactnativenavigation.layout;
+
+import android.support.annotation.NonNull;
+
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.layout.containers.Container;
+import com.reactnativenavigation.layout.containers.ContainerStack;
+
+import org.junit.Test;
+import org.robolectric.Robolectric;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class ContainerStackTest extends BaseTest {
+	@Test
+	public void push() throws Exception {
+		NavigationActivity context = Robolectric.setupActivity(NavigationActivity.class);
+		ContainerStack uut = new ContainerStack(context);
+		assertThat(uut.isEmpty()).isTrue();
+		assertThat(uut.getChildCount()).isZero();
+
+		Container container = createContainer(context);
+		uut.push(container);
+		assertThat(uut.isEmpty()).isFalse();
+
+		assertThat(uut.getChildCount()).isEqualTo(1);
+
+	}
+
+	@NonNull
+	private Container createContainer(final NavigationActivity context) {
+		ReactNativeHost reactNativeHost = mock(ReactNativeHost.class);
+		when(reactNativeHost.getReactInstanceManager()).thenReturn(mock(ReactInstanceManager.class));
+		return new Container(context, reactNativeHost, "id", "name");
+	}
+}

playground/src/containers/LifecycleScreen.js

@@ -13,7 +13,7 @@ class LifecycleScreen extends Component {
   }
 
   onStart() {
-    this.setState({ text: 'onStart!' });
+    this.setState({ text: 'onStart' });
   }
 
   onStop() {