stackController

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
@@ -35,8 +34,14 @@ public class StackController extends ViewController {
 		getView().addView(child.getView());
 	}
 
+	public boolean canPop() {
+		return childControllers.size() > 1;
+	}
+
 	public void pop() {
-		childControllers.pop();
+		if (canPop()) {
+			childControllers.pop();
+		}
 	}
 
 	public ViewController peek() {
@@ -53,7 +58,7 @@ public class StackController extends ViewController {
 
 	@Override
 	public boolean handleBack() {
-		if (size() > 1) {
+		if (canPop()) {
 			pop();
 			return true;
 		} else {
@@ -62,7 +67,7 @@ public class StackController extends ViewController {
 	}
 
 	@Override
-	protected View onCreateView() {
+	protected ViewGroup onCreateView() {
 		return new FrameLayout(getActivity());
 	}
 }

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

@@ -6,12 +6,11 @@ import android.view.View;
 
 public abstract class ViewController {
 	private final Activity activity;
-	private final View view;
+	private View view;
 	private StackController stackController;
 
 	public ViewController(Activity activity) {
 		this.activity = activity;
-		this.view = onCreateView();
 	}
 
 	protected abstract View onCreateView();
@@ -34,6 +33,9 @@ public abstract class ViewController {
 	}
 
 	public View getView() {
+		if (view == null) {
+			view = onCreateView();
+		}
 		return view;
 	}
 }

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

@@ -7,12 +7,10 @@ import android.widget.FrameLayout;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
-@Ignore
 public class StackControllerTest extends BaseTest {
 
 	private Activity activity;
@@ -58,8 +56,6 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.getChildControllers()).containsExactly(child2, child1);
 		uut.pop();
 		assertThat(uut.getChildControllers()).containsExactly(child1);
-		uut.pop();
-		assertThat(uut.getChildControllers()).isEmpty();
 	}
 
 	@Test
@@ -100,6 +96,29 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.handleBack()).isFalse();
 	}
 
+	@Test
+	public void popDoesNothingWhenZeroOrOneChild() throws Exception {
+		assertThat(uut.getChildControllers().size()).isZero();
+		uut.pop();
+		assertThat(uut.getChildControllers().size()).isZero();
+
+		uut.push(child1);
+		uut.pop();
+		assertThat(uut.getChildControllers().size()).isEqualTo(1);
+	}
+
+	@Test
+	public void canPopWhenSizeIsMoreThanOne() throws Exception {
+		assertThat(uut.getChildControllers().size()).isZero();
+		assertThat(uut.canPop()).isFalse();
+		uut.push(child1);
+		assertThat(uut.getChildControllers().size()).isEqualTo(1);
+		assertThat(uut.canPop()).isFalse();
+		uut.push(child2);
+		assertThat(uut.getChildControllers().size()).isEqualTo(2);
+		assertThat(uut.canPop()).isTrue();
+	}
+
 	@Test
 	public void constructsSelfWithFrameLayout() throws Exception {
 		assertThat(uut.getView())