IdStack

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/utils/IdStack.java

@@ -0,0 +1,36 @@
+package com.reactnativenavigation.utils;
+
+import java.util.ArrayDeque;
+import java.util.HashMap;
+
+public class IdStack<E> {
+
+	private final ArrayDeque<String> deque = new ArrayDeque<>();
+	private final HashMap<String, E> map = new HashMap<>();
+
+	public void push(String id, E item) {
+		deque.push(id);
+		map.put(id, item);
+	}
+
+	public E peek() {
+		return map.get(deque.peek());
+	}
+
+	public E pop() {
+		if (deque.isEmpty()) {
+			return null;
+		}
+		String popped = deque.pop();
+		E removed = map.remove(popped);
+		return removed;
+	}
+
+	public boolean isEmpty() {
+		return deque.isEmpty();
+	}
+
+	public int size() {
+		return deque.size();
+	}
+}

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

@@ -0,0 +1,12 @@
+package com.reactnativenavigation.utils;
+
+public class StringUtils {
+
+	@SuppressWarnings("StringEquality")
+	public static boolean isEqual(String s1, String s2) {
+		if (s1 == null || s2 == null) {
+			return s1 == s2;
+		}
+		return s1.equals(s2);
+	}
+}

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

@@ -9,6 +9,7 @@ import com.reactnativenavigation.utils.CompatUtils;
 
 public class Navigator extends ViewController {
 	private boolean activityResumed = false;
+	private ViewController child;
 
 	public Navigator(final Activity activity) {
 		super(activity, "navigator" + CompatUtils.generateViewId());
@@ -49,4 +50,12 @@ public class Navigator extends ViewController {
 
 	public void onActivityDestroyed() {
 	}
+
+	public void push(final ViewController onViewController, final ViewController viewController) {
+
+	}
+
+	public ViewController getViewController(final String id) {
+		return null;
+	}
 }

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

@@ -6,10 +6,15 @@ import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import com.reactnativenavigation.utils.StringUtils;
+
 import java.util.ArrayDeque;
+import java.util.HashMap;
+import java.util.Map;
 
 public class StackController extends ViewController {
-	private final ArrayDeque<ViewController> stack = new ArrayDeque<>();
+	private final ArrayDeque<String> idStack = new ArrayDeque<>();
+	private final Map<String, ViewController> controllersById = new HashMap<>();
 
 	public StackController(final Activity activity, String id) {
 		super(activity, id);
@@ -19,7 +24,8 @@ public class StackController extends ViewController {
 		final ViewController previousTop = peek();
 
 		child.setStackController(this);
-		stack.push(child);
+		idStack.push(child.getId());
+		controllersById.put(child.getId(), child);
 
 		getView().addView(child.getView());
 		if (previousTop != null) {
@@ -28,14 +34,15 @@ public class StackController extends ViewController {
 	}
 
 	public boolean canPop() {
-		return stack.size() > 1;
+		return idStack.size() > 1;
 	}
 
 	public void pop() {
 		if (!canPop()) {
 			return;
 		}
-		ViewController poppedController = stack.pop();
+		String poppedId = idStack.pop();
+		ViewController poppedController = controllersById.remove(poppedId);
 		getView().removeView(poppedController.getView());
 
 		ViewController previousTop = peek();
@@ -43,23 +50,28 @@ public class StackController extends ViewController {
 	}
 
 	public void pop(final ViewController childController) {
-		if (peek() == childController) {
+		if (StringUtils.isEqual(peekId(), childController.getId())) {
 			pop();
 		} else {
-			stack.remove(childController);
+			idStack.remove(childController.getId());
+			controllersById.remove(childController.getId());
 		}
 	}
 
 	public ViewController peek() {
-		return stack.peek();
+		return controllersById.get(peekId());
+	}
+
+	public String peekId() {
+		return idStack.peek();
 	}
 
 	public int size() {
-		return stack.size();
+		return idStack.size();
 	}
 
 	public boolean isEmpty() {
-		return stack.isEmpty();
+		return idStack.isEmpty();
 	}
 
 	@Override
@@ -90,15 +102,11 @@ public class StackController extends ViewController {
 		return this;
 	}
 
-	ArrayDeque<ViewController> getStack() {
-		return stack;
-	}
-
 	public void popTo(final ViewController viewController) {
-		if (!stack.contains(viewController)) {
+		if (!idStack.contains(viewController.getId())) {
 			return;
 		}
-		while (peek() != viewController) {
+		while (!StringUtils.isEqual(peekId(), viewController.getId())) {
 			pop();
 		}
 	}
@@ -108,4 +116,12 @@ public class StackController extends ViewController {
 			pop();
 		}
 	}
+
+	public ViewController getChildById(final String id) {
+		return controllersById.get(id);
+	}
+
+	ArrayDeque<String> getStack() {
+		return idStack;
+	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/utils/IdStackTest.java

@@ -0,0 +1,48 @@
+package com.reactnativenavigation.utils;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class IdStackTest extends BaseTest {
+
+	private IdStack<Integer> uut;
+
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		uut = new IdStack<>();
+	}
+
+	@Test
+	public void isEmpty() throws Exception {
+		assertThat(uut.isEmpty()).isTrue();
+		uut.push("123", 123);
+		assertThat(uut.isEmpty()).isFalse();
+	}
+
+	@Test
+	public void size() throws Exception {
+		assertThat(uut.size()).isEqualTo(0);
+		uut.push("123", 123);
+		assertThat(uut.size()).isEqualTo(1);
+	}
+
+	@Test
+	public void peek() throws Exception {
+		assertThat(uut.peek()).isNull();
+		uut.push("123", 123);
+		uut.push("456", 456);
+		assertThat(uut.peek()).isEqualTo(456);
+	}
+
+	@Test
+	public void pop() throws Exception {
+		assertThat(uut.pop()).isNull();
+		uut.push("123", 123);
+		uut.push("456", 456);
+		assertThat(uut.pop()).isEqualTo(456);
+	}
+}

lib/android/app/src/test/java/com/reactnativenavigation/utils/StringUtilsTest.java

@@ -0,0 +1,19 @@
+package com.reactnativenavigation.utils;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class StringUtilsTest extends BaseTest {
+	@Test
+	public void isEqual() throws Exception {
+		assertThat(StringUtils.isEqual(null, "a")).isFalse();
+		assertThat(StringUtils.isEqual("a", null)).isFalse();
+		assertThat(StringUtils.isEqual("a", "b")).isFalse();
+		assertThat(StringUtils.isEqual("a", "A")).isFalse();
+		assertThat(StringUtils.isEqual("a", "a")).isTrue();
+		assertThat(StringUtils.isEqual("", "")).isTrue();
+	}
+}

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

@@ -5,11 +5,10 @@ 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;
 
-import java.util.regex.Pattern;
-
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class NavigatorTest extends BaseTest {
@@ -62,13 +61,29 @@ public class NavigatorTest extends BaseTest {
 
 	@Test
 	public void holdsUniqueId() throws Exception {
-		assertThat(uut.getId()).startsWith("navigator").matches(Pattern.compile("navigator\\d"));
+		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();
 	}
-
 }

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

@@ -36,28 +36,28 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void holdsAStackOfViewControllers() throws Exception {
-		assertThat(uut.getStack()).isEmpty();
+		assertThat(uut.isEmpty()).isTrue();
 		uut.push(child1);
 		uut.push(child2);
 		uut.push(child3);
-		assertThat(uut.getStack()).containsOnly(child3, child2, child1);
 		assertThat(uut.peek()).isEqualTo(child3);
+		assertThat(uut.getStack()).containsOnly(child1.getId(), child2.getId(), child3.getId());
 	}
 
 	@Test
 	public void push() throws Exception {
-		assertThat(uut.getStack()).isEmpty();
+		assertThat(uut.isEmpty()).isTrue();
 		uut.push(child1);
-		assertThat(uut.getStack()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1.getId());
 	}
 
 	@Test
 	public void pop() throws Exception {
 		uut.push(child1);
 		uut.push(child2);
-		assertThat(uut.getStack()).containsOnly(child2, child1);
+		assertThat(uut.getStack()).containsOnly(child2.getId(), child1.getId());
 		uut.pop();
-		assertThat(uut.getStack()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1.getId());
 	}
 
 	@Test
@@ -106,7 +106,7 @@ public class StackControllerTest extends BaseTest {
 
 		uut.push(child1);
 		uut.pop();
-		assertThat(uut.getStack()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1.getId());
 	}
 
 	@Test
@@ -114,10 +114,10 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.getStack()).isEmpty();
 		assertThat(uut.canPop()).isFalse();
 		uut.push(child1);
-		assertThat(uut.getStack()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1.getId());
 		assertThat(uut.canPop()).isFalse();
 		uut.push(child2);
-		assertThat(uut.getStack()).containsOnly(child1, child2);
+		assertThat(uut.getStack()).containsOnly(child1.getId(), child2.getId());
 		assertThat(uut.canPop()).isTrue();
 	}
 
@@ -159,7 +159,7 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child1);
 		uut.push(child2);
 		uut.pop(child2);
-		assertThat(uut.getStack()).containsOnly(child1);
+		assertThat(uut.getStack()).containsOnly(child1.getId());
 		assertHasSingleChildViewOfController(child1);
 	}
 
@@ -170,7 +170,7 @@ public class StackControllerTest extends BaseTest {
 		assertHasSingleChildViewOfController(child2);
 
 		uut.pop(child1);
-		assertThat(uut.getStack()).containsOnly(child2);
+		assertThat(uut.getStack()).containsOnly(child2.getId());
 		assertHasSingleChildViewOfController(child2);
 	}
 
@@ -225,6 +225,13 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.isEmpty()).isTrue();
 	}
 
+	@Test
+	public void holdsChildrenById() throws Exception {
+		assertThat(uut.getChildById(child1.getId())).isNull();
+		uut.push(child1);
+		assertThat(uut.getChildById(child1.getId())).isEqualTo(child1);
+	}
+
 	private void assertHasSingleChildViewOfController(ViewController childController) {
 		assertThat(uut.getView().getChildCount()).isEqualTo(1);
 		assertThat(uut.getView().getChildAt(0)).isEqualTo(childController.getView());