indexed stack

lib/android/app/src/main/java/com/reactnativenavigation/utils/IdStack.java → lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/IndexedStack.java

@@ -1,12 +1,12 @@
-package com.reactnativenavigation.utils;
+package com.reactnativenavigation.viewcontrollers;
+
+import com.reactnativenavigation.utils.StringUtils;
 
 import java.util.ArrayDeque;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 
-public class IdStack<E> implements Iterable<String> {
+public class IndexedStack<E> implements Iterable<String> {
 
 	private final ArrayDeque<String> deque = new ArrayDeque<>();
 	private final HashMap<String, E> map = new HashMap<>();
@@ -63,16 +63,12 @@ public class IdStack<E> implements Iterable<String> {
 		return map.remove(id);
 	}
 
+	public boolean isTop(final String id) {
+		return StringUtils.isEqual(id, peekId());
+	}
+
 	@Override
 	public Iterator<String> iterator() {
 		return deque.iterator();
 	}
-
-	public Deque<String> getIds() {
-		return deque;
-	}
-
-	public Map<String, E> getMap() {
-		return map;
-	}
 }

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

@@ -6,15 +6,8 @@ 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<String> idStack = new ArrayDeque<>();
-	private final Map<String, ViewController> controllersById = new HashMap<>();
+	private final IndexedStack<ViewController> stack = new IndexedStack<>();
 
 	public StackController(final Activity activity, String id) {
 		super(activity, id);
@@ -24,8 +17,7 @@ public class StackController extends ViewController {
 		final ViewController previousTop = peek();
 
 		child.setStackController(this);
-		idStack.push(child.getId());
-		controllersById.put(child.getId(), child);
+		stack.push(child.getId(), child);
 
 		getView().addView(child.getView());
 		if (previousTop != null) {
@@ -34,15 +26,14 @@ public class StackController extends ViewController {
 	}
 
 	public boolean canPop() {
-		return idStack.size() > 1;
+		return stack.size() > 1;
 	}
 
 	public void pop() {
 		if (!canPop()) {
 			return;
 		}
-		String poppedId = idStack.pop();
-		ViewController poppedController = controllersById.remove(poppedId);
+		ViewController poppedController = stack.pop();
 		getView().removeView(poppedController.getView());
 
 		ViewController previousTop = peek();
@@ -50,28 +41,23 @@ public class StackController extends ViewController {
 	}
 
 	public void pop(final ViewController childController) {
-		if (StringUtils.isEqual(peekId(), childController.getId())) {
+		if (stack.isTop(childController.getId())) {
 			pop();
 		} else {
-			idStack.remove(childController.getId());
-			controllersById.remove(childController.getId());
+			stack.remove(childController.getId());
 		}
 	}
 
 	public ViewController peek() {
-		return controllersById.get(peekId());
-	}
-
-	public String peekId() {
-		return idStack.peek();
+		return stack.peek();
 	}
 
 	public int size() {
-		return idStack.size();
+		return stack.size();
 	}
 
 	public boolean isEmpty() {
-		return idStack.isEmpty();
+		return stack.isEmpty();
 	}
 
 	@Override
@@ -103,10 +89,10 @@ public class StackController extends ViewController {
 	}
 
 	public void popTo(final ViewController viewController) {
-		if (!idStack.contains(viewController.getId())) {
+		if (!stack.containsId(viewController.getId())) {
 			return;
 		}
-		while (!StringUtils.isEqual(peekId(), viewController.getId())) {
+		while (!stack.isTop(viewController.getId())) {
 			pop();
 		}
 	}
@@ -118,10 +104,10 @@ public class StackController extends ViewController {
 	}
 
 	public ViewController getChildById(final String id) {
-		return controllersById.get(id);
+		return stack.get(id);
 	}
 
-	ArrayDeque<String> getStack() {
-		return idStack;
+	boolean containsId(String id) {
+		return stack.containsId(id);
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/utils/IndexedStackTest.java → lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/IndexedStackTest.java

@@ -1,22 +1,20 @@
-package com.reactnativenavigation.utils;
+package com.reactnativenavigation.viewcontrollers;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.viewcontrollers.IndexedStack;
 
 import org.junit.Test;
 
-import java.util.Deque;
-import java.util.Map;
-
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class IndexedStackTest extends BaseTest {
 
-	private IdStack<Integer> uut;
+	private IndexedStack<Integer> uut;
 
 	@Override
 	public void beforeEach() {
 		super.beforeEach();
-		uut = new IdStack<>();
+		uut = new IndexedStack<>();
 	}
 
 	@Test
@@ -99,12 +97,11 @@ public class IndexedStackTest extends BaseTest {
 	}
 
 	@Test
-	public void getIdDeque() throws Exception {
-		assertThat(uut.getIds()).isNotNull().isInstanceOf(Deque.class).isEmpty();
-	}
-
-	@Test
-	public void getMap() throws Exception {
-		assertThat(uut.getMap()).isNotNull().isInstanceOf(Map.class).isEmpty();
+	public void isTop() throws Exception {
+		assertThat(uut.isTop("123")).isFalse();
+		uut.push("123", 123);
+		assertThat(uut.isTop("123")).isTrue();
+		uut.push("456", 456);
+		assertThat(uut.isTop("123")).isFalse();
 	}
 }

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

@@ -41,23 +41,23 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child2);
 		uut.push(child3);
 		assertThat(uut.peek()).isEqualTo(child3);
-		assertThat(uut.getStack()).containsOnly(child1.getId(), child2.getId(), child3.getId());
+		assertContainsOnlyId(child1.getId(), child2.getId(), child3.getId());
 	}
 
 	@Test
 	public void push() throws Exception {
 		assertThat(uut.isEmpty()).isTrue();
 		uut.push(child1);
-		assertThat(uut.getStack()).containsOnly(child1.getId());
+		assertContainsOnlyId(child1.getId());
 	}
 
 	@Test
 	public void pop() throws Exception {
 		uut.push(child1);
 		uut.push(child2);
-		assertThat(uut.getStack()).containsOnly(child2.getId(), child1.getId());
+		assertContainsOnlyId(child2.getId(), child1.getId());
 		uut.pop();
-		assertThat(uut.getStack()).containsOnly(child1.getId());
+		assertContainsOnlyId(child1.getId());
 	}
 
 	@Test
@@ -100,24 +100,24 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void popDoesNothingWhenZeroOrOneChild() throws Exception {
-		assertThat(uut.getStack()).isEmpty();
+		assertThat(uut.isEmpty()).isTrue();
 		uut.pop();
-		assertThat(uut.getStack()).isEmpty();
+		assertThat(uut.isEmpty()).isTrue();
 
 		uut.push(child1);
 		uut.pop();
-		assertThat(uut.getStack()).containsOnly(child1.getId());
+		assertContainsOnlyId(child1.getId());
 	}
 
 	@Test
 	public void canPopWhenSizeIsMoreThanOne() throws Exception {
-		assertThat(uut.getStack()).isEmpty();
+		assertThat(uut.isEmpty()).isTrue();
 		assertThat(uut.canPop()).isFalse();
 		uut.push(child1);
-		assertThat(uut.getStack()).containsOnly(child1.getId());
+		assertContainsOnlyId(child1.getId());
 		assertThat(uut.canPop()).isFalse();
 		uut.push(child2);
-		assertThat(uut.getStack()).containsOnly(child1.getId(), child2.getId());
+		assertContainsOnlyId(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.getId());
+		assertContainsOnlyId(child1.getId());
 		assertHasSingleChildViewOfController(child1);
 	}
 
@@ -170,7 +170,7 @@ public class StackControllerTest extends BaseTest {
 		assertHasSingleChildViewOfController(child2);
 
 		uut.pop(child1);
-		assertThat(uut.getStack()).containsOnly(child2.getId());
+		assertContainsOnlyId(child2.getId());
 		assertHasSingleChildViewOfController(child2);
 	}
 
@@ -236,4 +236,11 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.getView().getChildCount()).isEqualTo(1);
 		assertThat(uut.getView().getChildAt(0)).isEqualTo(childController.getView());
 	}
+
+	private void assertContainsOnlyId(String... ids) {
+		assertThat(uut.size()).isEqualTo(ids.length);
+		for (String id : ids) {
+			assertThat(uut.containsId(id));
+		}
+	}
 }