setRoot

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

@@ -8,8 +8,9 @@ import android.widget.FrameLayout;
 import com.reactnativenavigation.utils.CompatUtils;
 
 public class Navigator extends ViewController {
+
+	private ViewController root;
 	private boolean activityResumed = false;
-	private ViewController child;
 
 	public Navigator(final Activity activity) {
 		super(activity, "navigator" + CompatUtils.generateViewId());
@@ -27,15 +28,14 @@ public class Navigator extends ViewController {
 		return (FrameLayout) super.getView();
 	}
 
+	/*
+	 * Activity lifecycle
+	 */
+
 	public boolean isActivityResumed() {
 		return activityResumed;
 	}
 
-	public void setRoot(final ViewController viewController) {
-		getView().removeAllViews();
-		getView().addView(viewController.getView());
-	}
-
 	public void onActivityCreated() {
 		getActivity().setContentView(getView());
 	}
@@ -49,13 +49,21 @@ public class Navigator extends ViewController {
 	}
 
 	public void onActivityDestroyed() {
+		//
 	}
 
-	public void push(final ViewController onViewController, final ViewController viewController) {
+	/*
+	 * Navigation methods
+	 */
+
+	public void setRoot(final ViewController viewController) {
+		getView().removeAllViews();
 
+		root = viewController;
+		getView().addView(viewController.getView());
 	}
 
-	public ViewController getViewController(final String id) {
-		return null;
+	public void push(final ViewController onViewController, final ViewController viewController) {
+
 	}
 }

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

@@ -5,7 +5,6 @@ import android.app.Activity;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.robolectric.Shadows;
 
@@ -60,28 +59,11 @@ public class NavigatorTest extends BaseTest {
 	}
 
 	@Test
-	public void holdsUniqueId() throws Exception {
+	public void hasUniqueId() throws Exception {
 		assertThat(uut.getId()).startsWith("navigator");
 		assertThat(new Navigator(activity).getId()).isNotEqualTo(uut.getId());
 	}
 
-	@Test
-	@Ignore
-	public void holdsAllViewControllersById() throws Exception {
-		StackController stackController = new StackController(activity, "stack1");
-		stackController.push(child1);
-		stackController.push(child2);
-		assertThat(uut.getViewController(child1.getId())).isNull();
-		uut.setRoot(stackController);
-		assertThat(uut.getViewController(child1.getId())).isEqualTo(child1);
-		assertThat(uut.getViewController(child2.getId())).isEqualTo(child2);
-	}
-
-//	@Test
-//	public void push_OnTopOf() throws Exception {
-//		uut.push(child2, child1);
-//	}
-
 	private void assertHasSingleChildViewOf(ViewController vc) {
 		assertThat(uut.getView().getChildCount()).isEqualTo(1);
 		assertThat(uut.getView().getChildAt(0)).isEqualTo(vc.getView()).isNotNull();