ParentController

lib/android/app/src/main/java/com/reactnativenavigation/layout/impl/BottomTabsLayout.java

@@ -1,83 +0,0 @@
-package com.reactnativenavigation.layout.impl;
-
-public class BottomTabsLayout {
-
-//public class BottomTabsLayout implements Layout, BottomNavigationView.OnNavigationItemSelectedListener {
-
-//	private StackLayout stackLayout;
-//
-//	public static class TooManyTabs extends RuntimeException {
-//		//
-//	}
-//
-//	private final RelativeLayout view;
-//	private final BottomNavigationView bottomNavigationView;
-//	private final List<Layout> tabs = new ArrayList<>();
-//	private int currentTab;
-//
-//	public BottomTabsLayout(Activity activity) {
-//		view = new RelativeLayout(activity);
-//		view.setId(CompatUtils.generateViewId());
-//
-//		bottomNavigationView = new BottomNavigationView(view.getContext());
-//		bottomNavigationView.setId(CompatUtils.generateViewId());
-//		bottomNavigationView.setBackgroundColor(Color.DKGRAY);
-//		bottomNavigationView.setOnNavigationItemSelectedListener(this);
-//		LayoutParams lp = new LayoutParams(MATCH_PARENT, WRAP_CONTENT);
-//		lp.addRule(ALIGN_PARENT_BOTTOM);
-//		bottomNavigationView.setLayoutParams(lp);
-//		view.addView(bottomNavigationView, lp);
-//	}
-//
-//	@Override
-//	public View getView() {
-//		return view;
-//	}
-//
-//	@Override
-//	public void destroy() {
-//		//
-//	}
-//
-//	@Override
-//	public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
-//		hideTab(currentTab);
-//		currentTab = item.getItemId();
-//		showTab(currentTab);
-//		return true;
-//	}
-//
-//	public void addTab(String label, Layout tabLayout) {
-//		if (tabs.size() >= 5) {
-//			throw new TooManyTabs();
-//		}
-//		int tabId = bottomNavigationView.getMenu().size();
-//		bottomNavigationView.getMenu().add(0, tabId, Menu.NONE, label);
-//		LayoutParams tabParams = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-//		tabParams.addRule(ABOVE, bottomNavigationView.getId());
-//		view.addView(tabLayout.getView(), tabParams);
-//		tabs.add(tabLayout);
-//
-//		if (tabs.size() > 1) {
-//			tabLayout.getView().setVisibility(View.GONE);
-//		}
-//	}
-//
-//	private void showTab(int tabId) {
-//		tabs.get(tabId).getView().setVisibility(View.VISIBLE);
-//	}
-//
-//	private void hideTab(int tabId) {
-//		tabs.get(tabId).getView().setVisibility(View.GONE);
-//	}
-//
-//	@Override
-//	public void setParentStackLayout(final StackLayout stackLayout) {
-//		this.stackLayout = stackLayout;
-//	}
-//
-//	@Override
-//	public StackLayout getParentStackLayout() {
-//		return stackLayout;
-//	}
-}

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

@@ -11,6 +11,7 @@ import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.utils.CompatUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -18,10 +19,10 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import static android.widget.RelativeLayout.ABOVE;
 import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 
-public class BottomTabsController extends ViewController implements BottomNavigationView.OnNavigationItemSelectedListener {
+public class BottomTabsController extends ParentController implements BottomNavigationView.OnNavigationItemSelectedListener {
 	private BottomNavigationView bottomNavigationView;
 	private int selectedIndex = 0;
-	private List<ViewController> tabs;
+	private List<ViewController> tabs = new ArrayList<>();
 
 	public BottomTabsController(final Activity activity, final String id) {
 		super(activity, id);
@@ -73,11 +74,12 @@ public class BottomTabsController extends ViewController implements BottomNaviga
 		}
 	}
 
-	public List<ViewController> getTabs() {
-		return tabs;
-	}
-
 	public int getSelectedIndex() {
 		return selectedIndex;
 	}
+
+	@Override
+	public Iterable<ViewController> getChildControllers() {
+		return tabs;
+	}
 }

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import com.reactnativenavigation.utils.StringUtils;
 
 import java.util.ArrayDeque;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -71,4 +72,9 @@ public class IndexedStack<E> implements Iterable<String> {
 	public Iterator<String> iterator() {
 		return deque.iterator();
 	}
+
+
+	public Collection<E> values() {
+		return map.values();
+	}
 }

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

@@ -0,0 +1,25 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+
+public abstract class ParentController extends ViewController {
+	public ParentController(final Activity activity, final String id) {
+		super(activity, id);
+	}
+
+	public abstract Iterable<ViewController> getChildControllers();
+
+	public ViewController findControllerById(final String id) {
+		ViewController fromSuper = super.findControllerById(id);
+		if (fromSuper != null) {
+			return fromSuper;
+		}
+
+		for (ViewController child : getChildControllers()) {
+			ViewController found = child.findControllerById(id);
+			if (found != null) return found;
+		}
+
+		return null;
+	}
+}

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

@@ -6,7 +6,7 @@ import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-public class StackController extends ViewController {
+public class StackController extends ParentController {
 	private final IndexedStack<ViewController> stack = new IndexedStack<>();
 
 	public StackController(final Activity activity, String id) {
@@ -103,11 +103,12 @@ public class StackController extends ViewController {
 		}
 	}
 
-	public ViewController getChildById(final String id) {
-		return stack.get(id);
-	}
-
 	boolean containsId(String id) {
 		return stack.containsId(id);
 	}
+
+	@Override
+	public Iterable<ViewController> getChildControllers() {
+		return stack.values();
+	}
 }

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

@@ -5,6 +5,8 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
 
+import com.reactnativenavigation.utils.StringUtils;
+
 public abstract class ViewController {
 	private final Activity activity;
 	private final String id;
@@ -47,4 +49,8 @@ public abstract class ViewController {
 	public String getId() {
 		return id;
 	}
+
+	public ViewController findControllerById(final String id) {
+		return StringUtils.isEqual(this.id, id) ? this : null;
+	}
 }

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

@@ -10,9 +10,10 @@ import android.widget.RelativeLayout;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 
+import org.assertj.core.api.Condition;
 import org.junit.Test;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -26,6 +27,8 @@ public class BottomTabsControllerTest extends BaseTest {
 	private ViewController child1;
 	private ViewController child2;
 	private ViewController child3;
+	private ViewController child4;
+	private ViewController child5;
 
 	@Override
 	public void beforeEach() {
@@ -35,6 +38,8 @@ public class BottomTabsControllerTest extends BaseTest {
 		child1 = new SimpleViewController(activity, "child1");
 		child2 = new SimpleViewController(activity, "child2");
 		child3 = new SimpleViewController(activity, "child3");
+		child4 = new SimpleViewController(activity, "child4");
+		child5 = new SimpleViewController(activity, "child5");
 	}
 
 	@Test
@@ -72,21 +77,32 @@ public class BottomTabsControllerTest extends BaseTest {
 		assertThat(uut.onNavigationItemSelected(menuItem)).isTrue();
 
 		assertThat(uut.getSelectedIndex()).isEqualTo(3);
-		assertThat(uut.getTabs().get(0).getView().getVisibility()).isEqualTo(View.GONE);
-		assertThat(uut.getTabs().get(1).getView().getVisibility()).isEqualTo(View.GONE);
-		assertThat(uut.getTabs().get(2).getView().getVisibility()).isEqualTo(View.GONE);
-		assertThat(uut.getTabs().get(3).getView().getVisibility()).isEqualTo(View.VISIBLE);
-		assertThat(uut.getTabs().get(4).getView().getVisibility()).isEqualTo(View.GONE);
+		assertThat(uut.getChildControllers()).areExactly(1, new Condition<ViewController>() {
+			@Override
+			public boolean matches(final ViewController value) {
+				return value.getView().getVisibility() == View.VISIBLE;
+			}
+		});
+//		assertThat(uut.getView().getChildAt(1).getVisibility()).isEqualTo(View.GONE);
+//		assertThat(uut.getView().getChildAt(2).getVisibility()).isEqualTo(View.GONE);
+//		assertThat(uut.getView().getChildAt(3).getVisibility()).isEqualTo(View.GONE);
+//		assertThat(uut.getView().getChildAt(4).getVisibility()).isEqualTo(View.VISIBLE);
+//		assertThat(uut.getView().getChildAt(5).getVisibility()).isEqualTo(View.GONE);
+	}
+
+	@Test
+	public void findControllerById_ReturnsSelfOrChildren() throws Exception {
+		assertThat(uut.findControllerById("123")).isNull();
+		assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
+		StackController inner = new StackController(activity, "inner");
+		inner.push(child1);
+		assertThat(uut.findControllerById(child1.getId())).isNull();
+		uut.setTabs(Arrays.<ViewController>asList(inner));
+		assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);
 	}
 
 	@NonNull
 	private List<ViewController> createTabs() {
-		List<ViewController> tabs = new ArrayList<>();
-		tabs.add(new SimpleViewController(activity, "1"));
-		tabs.add(new SimpleViewController(activity, "2"));
-		tabs.add(new SimpleViewController(activity, "3"));
-		tabs.add(new SimpleViewController(activity, "4"));
-		tabs.add(new SimpleViewController(activity, "5"));
-		return tabs;
+		return Arrays.asList(child1, child2, child3, child4, child5);
 	}
 }

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.viewcontrollers.IndexedStack;
 
 import org.junit.Test;
 
@@ -104,4 +103,12 @@ public class IndexedStackTest extends BaseTest {
 		uut.push("456", 456);
 		assertThat(uut.isTop("123")).isFalse();
 	}
+
+	@Test
+	public void values() throws Exception {
+		assertThat(uut.values()).isNotNull().isEmpty();
+		uut.push("123", 123);
+		uut.push("456", 456);
+		assertThat(uut.values()).isNotNull().containsExactlyInAnyOrder(123, 456);
+	}
 }

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

@@ -9,6 +9,8 @@ import com.reactnativenavigation.mocks.SimpleViewController;
 import org.junit.Test;
 import org.robolectric.Shadows;
 
+import java.util.Arrays;
+
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class NavigatorTest extends BaseTest {
@@ -87,6 +89,22 @@ public class NavigatorTest extends BaseTest {
 		assertHasSingleChildViewOf(uut, child1);
 	}
 
+	@Test
+	public void push_OnCorrectStackByFindingChildId() throws Exception {
+		BottomTabsController bottomTabsController = new BottomTabsController(activity, "tabsController");
+		StackController stack1 = new StackController(activity, "stack1");
+		StackController stack2 = new StackController(activity, "stack1");
+		stack1.push(child1);
+		stack2.push(child2);
+		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
+
+		uut.setRoot(bottomTabsController);
+		SimpleViewController newChild = new SimpleViewController(activity, "new child");
+		uut.push(child2.getId(), newChild);
+
+
+	}
+
 	private void assertHasSingleChildViewOf(ViewController parent, ViewController child) {
 		assertThat(((ViewGroup) parent.getView()).getChildCount()).isEqualTo(1);
 		assertThat(((ViewGroup) parent.getView()).getChildAt(0)).isEqualTo(child.getView()).isNotNull();

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

@@ -0,0 +1,74 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleViewController;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class ParentControllerTest extends BaseTest {
+
+	private Activity activity;
+
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		activity = newActivity();
+	}
+
+
+	@Test
+	public void findControllerById_ReturnsSelfIfSameId() throws Exception {
+		ParentController uut = new ParentController(activity, "uut") {
+			@Override
+			public Iterable<ViewController> getChildControllers() {
+				return Collections.emptyList();
+			}
+
+			@NonNull
+			@Override
+			protected View createView() {
+				return new FrameLayout(activity);
+			}
+		};
+
+		assertThat(uut.findControllerById("123")).isNull();
+		assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
+	}
+
+	@Test
+	public void findControllerById_DeeplyInOneOfTheChildren() throws Exception {
+		ViewController child1 = new SimpleViewController(activity, "child1");
+		ViewController child2 = new SimpleViewController(activity, "child2");
+
+		final StackController someInnerStack = new StackController(activity, "stack1");
+		someInnerStack.push(child1);
+		someInnerStack.push(child2);
+
+		ParentController uut = new ParentController(activity, "uut") {
+			@Override
+			public Iterable<ViewController> getChildControllers() {
+				return Arrays.<ViewController>asList(someInnerStack);
+			}
+
+			@NonNull
+			@Override
+			protected View createView() {
+				return new FrameLayout(activity);
+			}
+		};
+
+		assertThat(uut.findControllerById("stack1")).isEqualTo(someInnerStack);
+		assertThat(uut.findControllerById("child1")).isEqualTo(child1);
+		assertThat(uut.findControllerById("child2")).isEqualTo(child2);
+	}
+}

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

@@ -226,10 +226,19 @@ public class StackControllerTest extends BaseTest {
 	}
 
 	@Test
-	public void holdsChildrenById() throws Exception {
-		assertThat(uut.getChildById(child1.getId())).isNull();
+	public void findControllerById_ReturnsSelfOrChildrenById() throws Exception {
+		assertThat(uut.findControllerById("123")).isNull();
+		assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
 		uut.push(child1);
-		assertThat(uut.getChildById(child1.getId())).isEqualTo(child1);
+		assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);
+	}
+
+	@Test
+	public void findControllerById_Deeply() throws Exception {
+		StackController stack = new StackController(activity, "stack2");
+		stack.push(child2);
+		uut.push(stack);
+		assertThat(uut.findControllerById(child2.getId())).isEqualTo(child2);
 	}
 
 	private void assertHasSingleChildViewOfController(ViewController childController) {

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

@@ -61,4 +61,10 @@ public class ViewControllerTest extends BaseTest {
 	public void holdsId() throws Exception {
 		assertThat(uut.getId()).isEqualTo("uut");
 	}
+
+	@Test
+	public void findControllerById_ReturnsSelfIfSameId() throws Exception {
+		assertThat(uut.findControllerById("123")).isNull();
+		assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
+	}
 }