push

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

@@ -47,9 +47,9 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-//				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
-//				final ViewController viewController = newLayoutFactory().create(layoutTree);
-////				store.getViewController(onContainerId).getStackController().push(viewController);
+				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
+				final ViewController viewController = newLayoutFactory().create(layoutTree);
+//				store.getViewController(onContainerId).getStackController().push(viewController);
 			}
 		});
 	}

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

@@ -7,7 +7,10 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.utils.CompatUtils;
 
-public class Navigator extends ViewController {
+import java.util.Collection;
+import java.util.Collections;
+
+public class Navigator extends ParentController {
 
 	private ViewController root;
 	private boolean activityResumed = false;
@@ -22,10 +25,9 @@ public class Navigator extends ViewController {
 		return new FrameLayout(getActivity());
 	}
 
-	@NonNull
 	@Override
-	public FrameLayout getView() {
-		return (FrameLayout) super.getView();
+	public Collection<ViewController> getChildControllers() {
+		return Collections.singletonList(root);
 	}
 
 	/*
@@ -64,8 +66,12 @@ public class Navigator extends ViewController {
 	}
 
 	public void push(final String onId, final ViewController viewController) {
-		if (root instanceof StackController) {
-			((StackController) root).push(viewController);
-		}
+		ViewController found = root.findControllerById(onId);
+		if (found == null) return;
+
+		StackController parentStackController = found.getParentStackController();
+		if (parentStackController == null) return;
+
+		parentStackController.push(viewController);
 	}
 }

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

@@ -18,7 +18,7 @@ public class StackController extends ParentController {
 	public void push(final ViewController child) {
 		final ViewController previousTop = peek();
 
-		child.setStackController(this);
+		child.setParentStackController(this);
 		stack.push(child.getId(), child);
 
 		getView().addView(child.getView());
@@ -80,7 +80,7 @@ public class StackController extends ParentController {
 
 	@Nullable
 	@Override
-	public StackController getStackController() {
+	public StackController getParentStackController() {
 		return this;
 	}
 

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

@@ -11,7 +11,7 @@ public abstract class ViewController {
 	private final Activity activity;
 	private final String id;
 	private View view;
-	private StackController stackController;
+	private StackController parentStackController;
 
 	public ViewController(Activity activity, String id) {
 		this.activity = activity;
@@ -30,12 +30,12 @@ public abstract class ViewController {
 	}
 
 	@Nullable
-	public StackController getStackController() {
-		return stackController;
+	public StackController getParentStackController() {
+		return parentStackController;
 	}
 
-	void setStackController(final StackController stackController) {
-		this.stackController = stackController;
+	void setParentStackController(final StackController parentStackController) {
+		this.parentStackController = parentStackController;
 	}
 
 	@NonNull

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

@@ -93,7 +93,7 @@ public class NavigatorTest extends BaseTest {
 	public void push_OnCorrectStackByFindingChildId() throws Exception {
 		BottomTabsController bottomTabsController = new BottomTabsController(activity, "tabsController");
 		StackController stack1 = new StackController(activity, "stack1");
-		StackController stack2 = new StackController(activity, "stack1");
+		StackController stack2 = new StackController(activity, "stack2");
 		stack1.push(child1);
 		stack2.push(child2);
 		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
@@ -102,7 +102,8 @@ public class NavigatorTest extends BaseTest {
 		SimpleViewController newChild = new SimpleViewController(activity, "new child");
 		uut.push(child2.getId(), newChild);
 
-
+		assertThat(stack1.getChildControllers()).doesNotContain(newChild);
+		assertThat(stack2.getChildControllers()).contains(newChild);
 	}
 
 	private void assertHasSingleChildViewOf(ViewController parent, ViewController child) {

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

@@ -73,13 +73,13 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void pushAssignsRefToSelfOnPushedController() throws Exception {
-		assertThat(child1.getStackController()).isNull();
+		assertThat(child1.getParentStackController()).isNull();
 		uut.push(child1);
-		assertThat(child1.getStackController()).isEqualTo(uut);
+		assertThat(child1.getParentStackController()).isEqualTo(uut);
 
 		StackController anotherNavController = new StackController(activity, "another");
 		anotherNavController.push(child2);
-		assertThat(child2.getStackController()).isEqualTo(anotherNavController);
+		assertThat(child2.getParentStackController()).isEqualTo(anotherNavController);
 	}
 
 	@Test
@@ -176,7 +176,7 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void getStackControllerReturnsSelf() throws Exception {
-		assertThat(uut.getStackController()).isEqualTo(uut);
+		assertThat(uut.getParentStackController()).isEqualTo(uut);
 	}
 
 	@Test

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

@@ -46,10 +46,10 @@ public class ViewControllerTest extends BaseTest {
 
 	@Test
 	public void holdsAReferenceToStackControllerOrNull() throws Exception {
-		assertThat(uut.getStackController()).isNull();
+		assertThat(uut.getParentStackController()).isNull();
 		StackController nav = new StackController(activity, "stack");
 		nav.push(uut);
-		assertThat(uut.getStackController()).isEqualTo(nav);
+		assertThat(uut.getParentStackController()).isEqualTo(nav);
 	}
 
 	@Test