stack refactor

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

@@ -51,7 +51,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager, store);
 				final ViewController rootView = factory.createAndSaveToStore(layoutTree);
-				store.getViewController(onContainerId).getParentStackController().push(rootView);
+				store.getViewController(onContainerId).getStackController().push(rootView);
 			}
 		});
 	}
@@ -62,7 +62,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			@Override
 			public void run() {
 				ViewController layout = store.getViewController(onContainerId);
-				layout.getParentStackController().pop(layout);
+				layout.getStackController().pop(layout);
 			}
 		});
 	}

lib/android/app/src/main/java/com/reactnativenavigation/utils/Stack.java

@@ -1,17 +0,0 @@
-package com.reactnativenavigation.utils;
-
-public interface Stack<E> extends Iterable<E> {
-
-	void push(E element);
-
-	E pop();
-
-	E peek();
-
-	boolean remove(E element);
-
-	int size();
-
-	boolean isEmpty();
-
-}

lib/android/app/src/main/java/com/reactnativenavigation/utils/StackImpl.java

@@ -1,6 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import java.util.ArrayDeque;
-
-public class StackImpl<E> extends ArrayDeque<E> implements Stack<E> {
-}

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

@@ -1,38 +1,23 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.reactnativenavigation.utils.Stack;
-import com.reactnativenavigation.utils.StackImpl;
+import java.util.ArrayDeque;
 
 public class StackController extends ViewController {
-	private Stack<ViewController> childControllers = new StackImpl<>();
+	private final ArrayDeque<ViewController> childControllers = new ArrayDeque<>();
 
 	public StackController(final Activity activity) {
 		super(activity);
 	}
 
-	@Override
-	public ViewGroup getView() {
-		return (ViewGroup) super.getView();
-	}
-
-	public Stack<ViewController> getChildControllers() {
-		return childControllers;
-	}
-
-	public void setChildControllers(ViewController... childControllers) {
-		for (ViewController childController : childControllers) {
-			push(childController);
-		}
-	}
-
 	public void push(final ViewController child) {
 		ViewController previousTop = peek();
 
-		child.setParentStackController(this);
+		child.setStackController(this);
 		childControllers.push(child);
 		getView().addView(child.getView());
 
@@ -86,8 +71,23 @@ public class StackController extends ViewController {
 		}
 	}
 
+	@Override
+	public ViewGroup getView() {
+		return (ViewGroup) super.getView();
+	}
+
 	@Override
 	protected ViewGroup onCreateView() {
 		return new FrameLayout(getActivity());
 	}
+
+	@Nullable
+	@Override
+	public StackController getStackController() {
+		return this;
+	}
+
+	ArrayDeque<ViewController> getStack() {
+		return childControllers;
+	}
 }

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

@@ -24,11 +24,11 @@ public abstract class ViewController {
 	}
 
 	@Nullable
-	public StackController getParentStackController() {
+	public StackController getStackController() {
 		return stackController;
 	}
 
-	void setParentStackController(final StackController stackController) {
+	void setStackController(final StackController stackController) {
 		this.stackController = stackController;
 	}
 

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

@@ -36,26 +36,28 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void holdsAStackOfViewControllers() throws Exception {
-		assertThat(uut.getChildControllers()).isEmpty();
-		uut.setChildControllers(child1, child2, child3);
-		assertThat(uut.getChildControllers()).containsOnly(child3, child2, child1);
+		assertThat(uut.getStack()).isEmpty();
+		uut.push(child1);
+		uut.push(child2);
+		uut.push(child3);
+		assertThat(uut.getStack()).containsOnly(child3, child2, child1);
 		assertThat(uut.peek()).isEqualTo(child3);
 	}
 
 	@Test
 	public void push() throws Exception {
-		assertThat(uut.getChildControllers()).isEmpty();
+		assertThat(uut.getStack()).isEmpty();
 		uut.push(child1);
-		assertThat(uut.getChildControllers()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1);
 	}
 
 	@Test
 	public void pop() throws Exception {
 		uut.push(child1);
 		uut.push(child2);
-		assertThat(uut.getChildControllers()).containsOnly(child2, child1);
+		assertThat(uut.getStack()).containsOnly(child2, child1);
 		uut.pop();
-		assertThat(uut.getChildControllers()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1);
 	}
 
 	@Test
@@ -71,13 +73,13 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void pushAssignsRefToSelfOnPushedController() throws Exception {
-		assertThat(child1.getParentStackController()).isNull();
+		assertThat(child1.getStackController()).isNull();
 		uut.push(child1);
-		assertThat(child1.getParentStackController()).isEqualTo(uut);
+		assertThat(child1.getStackController()).isEqualTo(uut);
 
 		StackController anotherNavController = new StackController(activity);
-		anotherNavController.setChildControllers(child2);
-		assertThat(child2.getParentStackController()).isEqualTo(anotherNavController);
+		anotherNavController.push(child2);
+		assertThat(child2.getStackController()).isEqualTo(anotherNavController);
 	}
 
 	@Test
@@ -98,24 +100,24 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void popDoesNothingWhenZeroOrOneChild() throws Exception {
-		assertThat(uut.getChildControllers()).isEmpty();
+		assertThat(uut.getStack()).isEmpty();
 		uut.pop();
-		assertThat(uut.getChildControllers()).isEmpty();
+		assertThat(uut.getStack()).isEmpty();
 
 		uut.push(child1);
 		uut.pop();
-		assertThat(uut.getChildControllers()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1);
 	}
 
 	@Test
 	public void canPopWhenSizeIsMoreThanOne() throws Exception {
-		assertThat(uut.getChildControllers()).isEmpty();
+		assertThat(uut.getStack()).isEmpty();
 		assertThat(uut.canPop()).isFalse();
 		uut.push(child1);
-		assertThat(uut.getChildControllers()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1);
 		assertThat(uut.canPop()).isFalse();
 		uut.push(child2);
-		assertThat(uut.getChildControllers()).containsOnly(child1, child2);
+		assertThat(uut.getStack()).containsOnly(child1, child2);
 		assertThat(uut.canPop()).isTrue();
 	}
 
@@ -157,7 +159,7 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child1);
 		uut.push(child2);
 		uut.pop(child2);
-		assertThat(uut.getChildControllers()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1);
 		assertHasSingleChildViewOfController(child1);
 	}
 
@@ -168,10 +170,15 @@ public class StackControllerTest extends BaseTest {
 		assertHasSingleChildViewOfController(child2);
 
 		uut.pop(child1);
-		assertThat(uut.getChildControllers()).containsOnly(child2);
+		assertThat(uut.getStack()).containsOnly(child2);
 		assertHasSingleChildViewOfController(child2);
 	}
 
+	@Test
+	public void getStackControllerReturnsSelf() throws Exception {
+		assertThat(uut.getStackController()).isEqualTo(uut);
+	}
+
 	private void assertHasSingleChildViewOfController(ViewController childController) {
 		assertThat(uut.getView().getChildCount()).isEqualTo(1);
 		assertThat(uut.getView().getChildAt(0)).isEqualTo(childController.getView());

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.getParentStackController()).isNull();
+		assertThat(uut.getStackController()).isNull();
 		StackController nav = new StackController(activity);
 		nav.push(uut);
-		assertThat(uut.getParentStackController()).isEqualTo(nav);
+		assertThat(uut.getStackController()).isEqualTo(nav);
 	}
 
 	@Test