android popTo viewController

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

@@ -0,0 +1,36 @@
+package com.reactnativenavigation.e2e.androide2e;
+
+import android.support.test.uiautomator.By;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class ScreenLifecycleTest extends BaseTest {
+
+	@Test
+	public void onStartOnStop() throws Exception {
+		launchTheApp();
+		assertMainShown();
+		elementByText("PUSH LIFECYCLE SCREEN").click();
+		assertExists(By.text("onStart"));
+		elementByText("PUSH TO TEST ONSTOP").click();
+		assertExists(By.text("onStop"));
+	}
+
+	@Ignore
+	@Test
+	public void unmountIsCalledWhenPopped() throws Exception {
+		launchTheApp();
+		assertMainShown();
+		elementByText("PUSH LIFECYCLE SCREEN").click();
+		assertExists(By.text("onStart"));
+
+		device().pressBack();
+
+		assertExists(By.text("componentWillUnmount"));
+		elementByText("OK").click();
+		assertExists(By.text("onStop"));
+		elementByText("OK").click();
+		assertMainShown();
+	}
+}

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

@@ -30,4 +30,16 @@ public class ScreenStackTest extends BaseTest {
 		elementByText("POP").click();
 		assertMainShown();
 	}
+
+	@Test
+	public void popToId() throws Exception {
+		launchTheApp();
+		assertMainShown();
+		elementByText("PUSH").click();
+		elementByText("PUSH").click();
+		elementByText("PUSH").click();
+		assertExists(By.text("Stack Position: 3"));
+		elementByText("POP TO STACK POSITION 1").click();
+		assertExists(By.text("Stack Position: 1"));
+	}
 }

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

@@ -27,29 +27,4 @@ public class TopLevelApiTest extends BaseTest {
 		swipeRightOpenSideMenu();
 		assertExists(By.text("This is a left side menu screen"));
 	}
-
-	@Test
-	public void screenLifecycle() throws Exception {
-		launchTheApp();
-		assertMainShown();
-		elementByText("PUSH LIFECYCLE SCREEN").click();
-		assertExists(By.text("onStart"));
-		elementByText("PUSH TO TEST ONSTOP").click();
-		assertExists(By.text("onStop"));
-	}
-
-	@Test
-	@Ignore
-	public void unmountIsCalledOnPop() throws Exception {
-		launchTheApp();
-		assertMainShown();
-		elementByText("PUSH LIFECYCLE SCREEN").click();
-		elementByText("onStart");
-		device().pressBack();
-		assertExists(By.text("componentWillUnmount"));
-		elementByText("OK").click();
-		assertExists(By.text("onStop"));
-		elementByText("OK").click();
-		assertMainShown();
-	}
 }

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

@@ -66,6 +66,16 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		});
 	}
 
+	@ReactMethod
+	public void popTo(final String onContainerId, final String toContainerId) {
+		handle(new Runnable() {
+			@Override
+			public void run() {
+				store.getViewController(onContainerId).getStackController().popTo(store.getViewController(toContainerId));
+			}
+		});
+	}
+
 	private NavigationActivity activity() {
 		return (NavigationActivity) getCurrentActivity();
 	}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -8,7 +8,7 @@ import android.widget.FrameLayout;
 import java.util.ArrayDeque;
 
 public class StackController extends ViewController {
-	private final ArrayDeque<ViewController> childControllers = new ArrayDeque<>();
+	private final ArrayDeque<ViewController> stack = new ArrayDeque<>();
 
 	public StackController(final Activity activity) {
 		super(activity);
@@ -18,7 +18,7 @@ public class StackController extends ViewController {
 		ViewController previousTop = peek();
 
 		child.setStackController(this);
-		childControllers.push(child);
+		stack.push(child);
 		getView().addView(child.getView());
 
 		if (previousTop != null) {
@@ -27,14 +27,14 @@ public class StackController extends ViewController {
 	}
 
 	public boolean canPop() {
-		return childControllers.size() > 1;
+		return stack.size() > 1;
 	}
 
 	public void pop() {
 		if (!canPop()) {
 			return;
 		}
-		ViewController poppedController = childControllers.pop();
+		ViewController poppedController = stack.pop();
 		getView().removeView(poppedController.getView());
 
 		ViewController previousTop = peek();
@@ -45,20 +45,20 @@ public class StackController extends ViewController {
 		if (peek() == childController) {
 			pop();
 		} else {
-			childControllers.remove(childController);
+			stack.remove(childController);
 		}
 	}
 
 	public ViewController peek() {
-		return childControllers.peek();
+		return stack.peek();
 	}
 
 	public int size() {
-		return childControllers.size();
+		return stack.size();
 	}
 
 	public boolean isEmpty() {
-		return childControllers.isEmpty();
+		return stack.isEmpty();
 	}
 
 	@Override
@@ -88,6 +88,15 @@ public class StackController extends ViewController {
 	}
 
 	ArrayDeque<ViewController> getStack() {
-		return childControllers;
+		return stack;
+	}
+
+	public void popTo(final ViewController viewController) {
+		if (!stack.contains(viewController)) {
+			return;
+		}
+		while (peek() != viewController) {
+			pop();
+		}
 	}
 }

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

@@ -179,6 +179,30 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.getStackController()).isEqualTo(uut);
 	}
 
+	@Test
+	public void popTo_PopsTopUntilControllerIsNewTop() throws Exception {
+		uut.push(child1);
+		uut.push(child2);
+		uut.push(child3);
+
+		assertThat(uut.size()).isEqualTo(3);
+		assertThat(uut.peek()).isEqualTo(child3);
+
+		uut.popTo(child1);
+
+		assertThat(uut.size()).isEqualTo(1);
+		assertThat(uut.peek()).isEqualTo(child1);
+	}
+
+	@Test
+	public void popTo_NotAChildOfThisStack_DoesNothing() throws Exception {
+		uut.push(child1);
+		uut.push(child3);
+		assertThat(uut.size()).isEqualTo(2);
+		uut.popTo(child2);
+		assertThat(uut.size()).isEqualTo(2);
+	}
+
 	private void assertHasSingleChildViewOfController(ViewController childController) {
 		assertThat(uut.getView().getChildCount()).isEqualTo(1);
 		assertThat(uut.getView().getChildAt(0)).isEqualTo(childController.getView());