Merge branch 'navigator' into v2

lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -3,43 +3,36 @@ package com.reactnativenavigation;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
-import android.widget.FrameLayout;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.viewcontrollers.Navigator;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
-	private ViewController viewController;
+	private Navigator navigator;
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(new FrameLayout(this));
-		app().getInitializer().onActivityCreated(this);
+		navigator = new Navigator(this);
+		navigator.onActivityCreated();
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
-		app().getInitializer().onActivityResumed(this);
+		navigator.onActivityResumed();
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		app().getInitializer().onActivityPaused(this);
+		navigator.onActivityPaused();
 	}
 
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		app().getInitializer().onActivityDestroyed(this);
-	}
-
-
-	public void setViewController(ViewController viewController) {
-		this.viewController = viewController;
-		setContentView(viewController.getView());
+		navigator.onActivityDestroyed();
 	}
 
 	@Override
@@ -49,12 +42,12 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void onBackPressed() {
-		if (!viewController.handleBack()) {
+		if (!navigator.handleBack()) {
 			super.onBackPressed();
 		}
 	}
 
-	private NavigationApplication app() {
-		return ((NavigationApplication) getApplication());
+	public Navigator getNavigator() {
+		return navigator;
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -1,24 +1,25 @@
 package com.reactnativenavigation;
 
+import android.app.Activity;
 import android.app.Application;
+import android.os.Bundle;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.react.NavigationReactInitializer;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
-public abstract class NavigationApplication extends Application implements ReactApplication {
+public abstract class NavigationApplication extends Application implements ReactApplication, Application.ActivityLifecycleCallbacks {
 
-	private Store store;
 	private NavigationReactNativeHost reactNativeHost;
 	private NavigationReactInitializer initializer;
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		store = new Store();
-		reactNativeHost = new NavigationReactNativeHost(this, isDebug(), store);
+		reactNativeHost = new NavigationReactNativeHost(this, isDebug());
 		initializer = new NavigationReactInitializer(reactNativeHost.getReactInstanceManager(), isDebug());
+		registerActivityLifecycleCallbacks(this);
 	}
 
 	@Override
@@ -28,7 +29,43 @@ public abstract class NavigationApplication extends Application implements React
 
 	public abstract boolean isDebug();
 
-	NavigationReactInitializer getInitializer() {
-		return initializer;
+	@Override
+	public void onActivityCreated(final Activity activity, final Bundle savedInstanceState) {
+		if (activity instanceof NavigationActivity) {
+			initializer.onActivityCreated((NavigationActivity) activity);
+		}
+	}
+
+	@Override
+	public void onActivityStarted(final Activity activity) {
+	}
+
+	@Override
+	public void onActivityResumed(final Activity activity) {
+		if (activity instanceof NavigationActivity) {
+			initializer.onActivityResumed((NavigationActivity) activity);
+		}
+	}
+
+	@Override
+	public void onActivityPaused(final Activity activity) {
+		if (activity instanceof NavigationActivity) {
+			initializer.onActivityPaused((NavigationActivity) activity);
+		}
+	}
+
+	@Override
+	public void onActivityStopped(final Activity activity) {
+	}
+
+	@Override
+	public void onActivitySaveInstanceState(final Activity activity, final Bundle outState) {
+	}
+
+	@Override
+	public void onActivityDestroyed(final Activity activity) {
+		if (activity instanceof NavigationActivity) {
+			initializer.onActivityDestroyed((NavigationActivity) activity);
+		}
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/Store.java

@@ -1,18 +0,0 @@
-package com.reactnativenavigation;
-
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class Store {
-	private Map<String, ViewController> viewControllersById = new HashMap<>();
-
-	public void setViewController(String id, ViewController viewController) {
-		viewControllersById.put(id, viewController);
-	}
-
-	public ViewController getViewController(String id) {
-		return viewControllersById.get(id);
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/layout/LayoutFactory.java

@@ -3,38 +3,33 @@ package com.reactnativenavigation.layout;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.Store;
 import com.reactnativenavigation.layout.impl.ReactRootViewController;
+import com.reactnativenavigation.viewcontrollers.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class LayoutFactory {
 
 	private final Activity activity;
 	private final ReactInstanceManager reactInstanceManager;
-	private final Store store;
 
-	public LayoutFactory(Activity activity, final ReactInstanceManager reactInstanceManager, final Store store) {
+	public LayoutFactory(Activity activity, final ReactInstanceManager reactInstanceManager) {
 		this.activity = activity;
 		this.reactInstanceManager = reactInstanceManager;
-		this.store = store;
-	}
-
-	public ViewController createAndSaveToStore(LayoutNode node) {
-		ViewController viewController = create(node);
-		store.setViewController(node.id, viewController);
-		return viewController;
 	}
 
-	private ViewController create(final LayoutNode node) {
+	public ViewController create(final LayoutNode node) {
 		switch (node.type) {
 			case Container:
 				return createContainer(node);
 			case ContainerStack:
 			default:
 				return createContainerStack(node);
-//			case BottomTabs:
-//				return createBottomTabs(node);
+			case BottomTabs:
+				return createBottomTabs(node);
 //			case SideMenuRoot:
 //				return createSideMenuRoot(node);
 //			case SideMenuCenter:
@@ -86,19 +81,20 @@ public class LayoutFactory {
 	}
 
 	private ViewController createContainerStack(LayoutNode node) {
-		StackController stackController = new StackController(activity);
+		StackController stackController = new StackController(activity, node.id);
 		for (LayoutNode child : node.children) {
-			stackController.push(createAndSaveToStore(child));
+			stackController.push(create(child));
 		}
 		return stackController;
 	}
 
-//	private Layout createBottomTabs(LayoutNode node) {
-//		final BottomTabsLayout tabsContainer = new BottomTabsLayout(activity);
-//		for (int i = 0; i < node.children.size(); i++) {
-//			final Layout tabLayout = createAndSaveToStore(node.children.get(i));
-//			tabsContainer.addTab("#" + i, tabLayout);
-//		}
-//		return tabsContainer;
-//	}
+	private ViewController createBottomTabs(LayoutNode node) {
+		final BottomTabsController tabsContainer = new BottomTabsController(activity, node.id);
+		List<ViewController> tabs = new ArrayList<>();
+		for (int i = 0; i < node.children.size(); i++) {
+			tabs.add(create(node.children.get(i)));
+		}
+		tabsContainer.setTabs(tabs);
+		return tabsContainer;
+	}
 }

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/layout/impl/ReactRootViewController.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.layout.impl;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.view.View;
 
 import com.facebook.react.ReactInstanceManager;
@@ -10,13 +11,12 @@ import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class ReactRootViewController extends ViewController {
 
-	private final String id;
 	private final String name;
 	private final ReactInstanceManager reactInstanceManager;
+	private boolean attachedToReactInstance = false;
 
 	public ReactRootViewController(final Activity activity, final String id, final String name, final ReactInstanceManager reactInstanceManager) {
-		super(activity);
-		this.id = id;
+		super(activity, id);
 		this.name = name;
 		this.reactInstanceManager = reactInstanceManager;
 	}
@@ -44,17 +44,28 @@ public class ReactRootViewController extends ViewController {
 //		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStop(id);
 //	}
 
+//	@Override
+//	public void onStart() {
+//		super.onStart();
+//		if (attachedToReactInstance) {
+//			new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStart(id);
+//		} else {
+//			throw new RuntimeException("Not yet attached to react");
+//		}
+//	}
+
+	@NonNull
 	@Override
 	protected View createView() {
 		ReactRootView reactRootView = new ReactRootView(getActivity());
 		Bundle opts = new Bundle();
-		opts.putString("id", this.id);
+		opts.putString("id", getId());
 		reactRootView.startReactApplication(this.reactInstanceManager, this.name, opts);
 		reactRootView.setEventListener(new ReactRootView.ReactRootViewEventListener() {
 			@Override
 			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
 				reactRootView.setEventListener(null);
-				onStart();
+				attachedToReactInstance = true;
 			}
 		});
 		return reactRootView;

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

@@ -8,23 +8,21 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.NavigationActivity;
-import com.reactnativenavigation.Store;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
 import com.reactnativenavigation.parse.JSONParser;
 import com.reactnativenavigation.parse.LayoutNodeParser;
 import com.reactnativenavigation.utils.UiThread;
+import com.reactnativenavigation.viewcontrollers.Navigator;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
 	private final ReactInstanceManager reactInstanceManager;
-	private final Store store;
 
-	public NavigationModule(final ReactApplicationContext reactContext, final ReactInstanceManager reactInstanceManager, final Store store) {
+	public NavigationModule(final ReactApplicationContext reactContext, final ReactInstanceManager reactInstanceManager) {
 		super(reactContext);
 		this.reactInstanceManager = reactInstanceManager;
-		this.store = store;
 	}
 
 	@Override
@@ -38,8 +36,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			@Override
 			public void run() {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
-				final ViewController viewController = newLayoutFactory().createAndSaveToStore(layoutTree);
-				activity().setViewController(viewController);
+				final ViewController viewController = newLayoutFactory().create(layoutTree);
+				navigator().setRoot(viewController);
 			}
 		});
 	}
@@ -50,8 +48,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			@Override
 			public void run() {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
-				final ViewController viewController = newLayoutFactory().createAndSaveToStore(layoutTree);
-				store.getViewController(onContainerId).getStackController().push(viewController);
+				final ViewController viewController = newLayoutFactory().create(layoutTree);
+//				store.getViewController(onContainerId).getStackController().push(viewController);
 			}
 		});
 	}
@@ -61,7 +59,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				store.getViewController(onContainerId).getStackController().pop(store.getViewController(onContainerId));
+//				store.getViewController(onContainerId).getStackController().pop(store.getViewController(onContainerId));
 			}
 		});
 	}
@@ -71,7 +69,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				store.getViewController(onContainerId).getStackController().popTo(store.getViewController(toContainerId));
+//				store.getViewController(onContainerId).getStackController().popTo(store.getViewController(toContainerId));
 			}
 		});
 	}
@@ -81,7 +79,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				store.getViewController(onContainerId).getStackController().popToRoot();
+//				store.getViewController(onContainerId).getStackController().popToRoot();
 			}
 		});
 	}
@@ -90,9 +88,13 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		return (NavigationActivity) getCurrentActivity();
 	}
 
+	private Navigator navigator() {
+		return activity().getNavigator();
+	}
+
 	@NonNull
 	private LayoutFactory newLayoutFactory() {
-		return new LayoutFactory(activity(), reactInstanceManager, store);
+		return new LayoutFactory(activity(), reactInstanceManager);
 	}
 
 	private void handle(Runnable task) {

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

@@ -6,7 +6,6 @@ import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.reactnativenavigation.Store;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -15,17 +14,15 @@ import java.util.List;
 public class NavigationPackage implements ReactPackage {
 
 	private ReactNativeHost reactNativeHost;
-	private Store store;
 
-	public NavigationPackage(final ReactNativeHost reactNativeHost, final Store store) {
+	public NavigationPackage(final ReactNativeHost reactNativeHost) {
 		this.reactNativeHost = reactNativeHost;
-		this.store = store;
 	}
 
 	@Override
 	public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
 		return Arrays.<NativeModule>asList(
-				new NavigationModule(reactContext, reactNativeHost.getReactInstanceManager(), store)
+				new NavigationModule(reactContext, reactNativeHost.getReactInstanceManager())
 		);
 	}
 

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

@@ -5,7 +5,6 @@ import android.app.Application;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
-import com.reactnativenavigation.Store;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,12 +12,10 @@ import java.util.List;
 public class NavigationReactNativeHost extends ReactNativeHost {
 
 	private final boolean isDebug;
-	private Store store;
 
-	public NavigationReactNativeHost(Application application, boolean isDebug, final Store store) {
+	public NavigationReactNativeHost(Application application, boolean isDebug) {
 		super(application);
 		this.isDebug = isDebug;
-		this.store = store;
 	}
 
 	@Override
@@ -30,7 +27,7 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 	protected List<ReactPackage> getPackages() {
 		return Arrays.<ReactPackage>asList(
 				new MainReactPackage(),
-				new NavigationPackage(this, store)
+				new NavigationPackage(this)
 		);
 	}
 }

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/BottomTabsController.java

@@ -0,0 +1,87 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.support.annotation.NonNull;
+import android.support.design.widget.BottomNavigationView;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.reactnativenavigation.utils.CompatUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+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 ParentController implements BottomNavigationView.OnNavigationItemSelectedListener {
+	private BottomNavigationView bottomNavigationView;
+	private List<ViewController> tabs = new ArrayList<>();
+	private int selectedIndex = 0;
+
+	public BottomTabsController(final Activity activity, final String id) {
+		super(activity, id);
+	}
+
+	@NonNull
+	@Override
+	protected RelativeLayout createView() {
+		RelativeLayout root = new RelativeLayout(getActivity());
+		bottomNavigationView = new BottomNavigationView(getActivity());
+		bottomNavigationView.setId(CompatUtils.generateViewId());
+		bottomNavigationView.setBackgroundColor(Color.DKGRAY);
+		bottomNavigationView.setOnNavigationItemSelectedListener(this);
+		RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+		lp.addRule(ALIGN_PARENT_BOTTOM);
+		root.addView(bottomNavigationView, lp);
+		return root;
+	}
+
+	@Override
+	public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
+		selectTabAtIndex(item.getItemId());
+		return true;
+	}
+
+	public void selectTabAtIndex(final int newIndex) {
+		tabs.get(selectedIndex).getView().setVisibility(View.GONE);
+		selectedIndex = newIndex;
+		tabs.get(selectedIndex).getView().setVisibility(View.VISIBLE);
+	}
+
+	public void setTabs(final List<ViewController> tabs) {
+		if (tabs.size() > 5) {
+			throw new RuntimeException("Too many tabs!");
+		}
+		this.tabs = tabs;
+		getView();
+		for (int i = 0; i < tabs.size(); i++) {
+			String title = String.valueOf(i);
+			createTab(tabs.get(i), i, title);
+		}
+		selectTabAtIndex(0);
+	}
+
+	private void createTab(ViewController tab, final int index, final String title) {
+		bottomNavigationView.getMenu().add(0, index, Menu.NONE, title);
+		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
+		params.addRule(ABOVE, bottomNavigationView.getId());
+		tab.getView().setVisibility(View.GONE);
+		getView().addView(tab.getView(), params);
+	}
+
+	public int getSelectedIndex() {
+		return selectedIndex;
+	}
+
+	@Override
+	public Collection<ViewController> getChildControllers() {
+		return tabs;
+	}
+}

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

@@ -0,0 +1,80 @@
+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;
+
+public class IndexedStack<E> implements Iterable<String> {
+
+	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() {
+		if (isEmpty()) {
+			return null;
+		}
+		return map.get(deque.peek());
+	}
+
+	public E pop() {
+		if (isEmpty()) {
+			return null;
+		}
+		return map.remove(deque.pop());
+	}
+
+	public boolean isEmpty() {
+		return deque.isEmpty();
+	}
+
+	public int size() {
+		return deque.size();
+	}
+
+	public String peekId() {
+		return deque.peek();
+	}
+
+	public void clear() {
+		deque.clear();
+		map.clear();
+	}
+
+	public E get(final String id) {
+		return map.get(id);
+	}
+
+	public boolean containsId(final String id) {
+		return deque.contains(id);
+	}
+
+	public E remove(final String id) {
+		if (!containsId(id)) {
+			return null;
+		}
+		deque.remove(id);
+		return map.remove(id);
+	}
+
+	public boolean isTop(final String id) {
+		return StringUtils.isEqual(id, peekId());
+	}
+
+	@Override
+	public Iterator<String> iterator() {
+		return deque.iterator();
+	}
+
+
+	public Collection<E> values() {
+		return map.values();
+	}
+}

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

@@ -0,0 +1,77 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.utils.CompatUtils;
+
+import java.util.Collection;
+import java.util.Collections;
+
+public class Navigator extends ParentController {
+
+	private ViewController root;
+	private boolean activityResumed = false;
+
+	public Navigator(final Activity activity) {
+		super(activity, "navigator" + CompatUtils.generateViewId());
+	}
+
+	@NonNull
+	@Override
+	protected View createView() {
+		return new FrameLayout(getActivity());
+	}
+
+	@Override
+	public Collection<ViewController> getChildControllers() {
+		return Collections.singletonList(root);
+	}
+
+	/*
+	 * Activity lifecycle
+	 */
+
+	public boolean isActivityResumed() {
+		return activityResumed;
+	}
+
+	public void onActivityCreated() {
+		getActivity().setContentView(getView());
+	}
+
+	public void onActivityResumed() {
+		activityResumed = true;
+	}
+
+	public void onActivityPaused() {
+		activityResumed = false;
+	}
+
+	public void onActivityDestroyed() {
+		//
+	}
+
+	/*
+	 * Navigation methods
+	 */
+
+	public void setRoot(final ViewController viewController) {
+		getView().removeAllViews();
+
+		root = viewController;
+		getView().addView(viewController.getView());
+	}
+
+	public void push(final String onId, final ViewController viewController) {
+		ViewController found = root.findControllerById(onId);
+		if (found == null) return;
+
+		StackController parentStackController = found.getParentStackController();
+		if (parentStackController == null) return;
+
+		parentStackController.push(viewController);
+	}
+}

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

@@ -0,0 +1,40 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.Collection;
+
+public abstract class ParentController extends ViewController {
+	public ParentController(final Activity activity, final String id) {
+		super(activity, id);
+	}
+
+	@NonNull
+	@Override
+	public ViewGroup getView() {
+		return (ViewGroup) super.getView();
+	}
+
+	@NonNull
+	@Override
+	protected abstract View createView();
+
+	public abstract Collection<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

@@ -1,26 +1,27 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import java.util.ArrayDeque;
+import java.util.Collection;
 
-public class StackController extends ViewController {
-	private final ArrayDeque<ViewController> stack = new ArrayDeque<>();
+public class StackController extends ParentController {
+	private final IndexedStack<ViewController> stack = new IndexedStack<>();
 
-	public StackController(final Activity activity) {
-		super(activity);
+	public StackController(final Activity activity, String id) {
+		super(activity, id);
 	}
 
 	public void push(final ViewController child) {
-		ViewController previousTop = peek();
+		final ViewController previousTop = peek();
 
-		child.setStackController(this);
-		stack.push(child);
-		getView().addView(child.getView());
+		child.setParentStackController(this);
+		stack.push(child.getId(), child);
 
+		getView().addView(child.getView());
 		if (previousTop != null) {
 			getView().removeView(previousTop.getView());
 		}
@@ -42,10 +43,10 @@ public class StackController extends ViewController {
 	}
 
 	public void pop(final ViewController childController) {
-		if (peek() == childController) {
+		if (stack.isTop(childController.getId())) {
 			pop();
 		} else {
-			stack.remove(childController);
+			stack.remove(childController.getId());
 		}
 	}
 
@@ -71,11 +72,7 @@ public class StackController extends ViewController {
 		}
 	}
 
-	@Override
-	public ViewGroup getView() {
-		return (ViewGroup) super.getView();
-	}
-
+	@NonNull
 	@Override
 	protected ViewGroup createView() {
 		return new FrameLayout(getActivity());
@@ -83,19 +80,15 @@ public class StackController extends ViewController {
 
 	@Nullable
 	@Override
-	public StackController getStackController() {
+	public StackController getParentStackController() {
 		return this;
 	}
 
-	ArrayDeque<ViewController> getStack() {
-		return stack;
-	}
-
 	public void popTo(final ViewController viewController) {
-		if (!stack.contains(viewController)) {
+		if (!stack.containsId(viewController.getId())) {
 			return;
 		}
-		while (peek() != viewController) {
+		while (!stack.isTop(viewController.getId())) {
 			pop();
 		}
 	}
@@ -105,4 +98,13 @@ public class StackController extends ViewController {
 			pop();
 		}
 	}
+
+	boolean containsId(String id) {
+		return stack.containsId(id);
+	}
+
+	@Override
+	public Collection<ViewController> getChildControllers() {
+		return stack.values();
+	}
 }

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

@@ -1,18 +1,24 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
 
+import com.reactnativenavigation.utils.StringUtils;
+
 public abstract class ViewController {
-	private View view;
 	private final Activity activity;
-	private StackController stackController;
+	private final String id;
+	private View view;
+	private StackController parentStackController;
 
-	public ViewController(Activity activity) {
+	public ViewController(Activity activity, String id) {
 		this.activity = activity;
+		this.id = id;
 	}
 
+	@NonNull
 	protected abstract View createView();
 
 	public boolean handleBack() {
@@ -24,36 +30,27 @@ public abstract class ViewController {
 	}
 
 	@Nullable
-	public StackController getStackController() {
-		return stackController;
+	public StackController getParentStackController() {
+		return parentStackController;
 	}
 
-	void setStackController(final StackController stackController) {
-		this.stackController = stackController;
+	void setParentStackController(final StackController parentStackController) {
+		this.parentStackController = parentStackController;
 	}
 
+	@NonNull
 	public View getView() {
 		if (view == null) {
 			view = createView();
-			onCreate();
 		}
 		return view;
 	}
 
-	public void onCreate() {
-
-	}
-
-	public void onStart() {
-
-	}
-
-	public void onStop() {
-
+	public String getId() {
+		return id;
 	}
 
-	public void onDestroy() {
-
+	public ViewController findControllerById(final String id) {
+		return StringUtils.isEqual(this.id, id) ? this : null;
 	}
-
 }

lib/android/app/src/test/java/com/reactnativenavigation/StoreTest.java

@@ -1,31 +0,0 @@
-package com.reactnativenavigation;
-
-import android.app.Activity;
-
-import com.reactnativenavigation.mocks.SimpleViewController;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-public class StoreTest extends BaseTest {
-
-	private Store uut;
-
-	@Override
-	public void beforeEach() {
-		super.beforeEach();
-		uut = new Store();
-	}
-
-	@Test
-	public void holdsViewControllersById() throws Exception {
-		SimpleViewController viewController = new SimpleViewController(mock(Activity.class), "my controller");
-
-		assertThat(uut.getViewController("the id")).isNull();
-
-		uut.setViewController("the id", viewController);
-		assertThat(uut.getViewController("the id")).isEqualTo(viewController);
-	}
-}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -6,11 +6,8 @@ import android.view.View;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class SimpleViewController extends ViewController {
-	private final String name;
-
-	public SimpleViewController(final Activity activity, String name) {
-		super(activity);
-		this.name = name;
+	public SimpleViewController(final Activity activity, String id) {
+		super(activity, id);
 	}
 
 	@Override
@@ -20,6 +17,6 @@ public class SimpleViewController extends ViewController {
 
 	@Override
 	public String toString() {
-		return "SimpleViewController " + name;
+		return "SimpleViewController " + getId();
 	}
 }

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/BottomTabsControllerTest.java

@@ -0,0 +1,99 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.support.design.widget.BottomNavigationView;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleViewController;
+
+import org.assertj.core.api.iterable.Extractor;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class BottomTabsControllerTest extends BaseTest {
+
+	private Activity activity;
+	private BottomTabsController uut;
+	private ViewController child1;
+	private ViewController child2;
+	private ViewController child3;
+	private ViewController child4;
+	private ViewController child5;
+
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		activity = newActivity();
+		uut = new BottomTabsController(activity, "uut");
+		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
+	public void containsRelativeLayoutView() throws Exception {
+		assertThat(uut.getView()).isInstanceOf(RelativeLayout.class);
+		assertThat(uut.getView().getChildAt(0)).isInstanceOf(BottomNavigationView.class);
+	}
+
+	@Test(expected = RuntimeException.class)
+	public void setTabs_ThrowWhenMoreThan5() throws Exception {
+		List<ViewController> tabs = createTabs();
+		tabs.add(new SimpleViewController(activity, "6"));
+		uut.setTabs(tabs);
+	}
+
+	@Test
+	public void setTabs_AddAllViewsAsGoneExceptFirst() throws Exception {
+		List<ViewController> tabs = createTabs();
+		uut.setTabs(tabs);
+		assertThat(uut.getView().getChildCount()).isEqualTo(6);
+		assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, Integer>() {
+			@Override
+			public Integer extract(final ViewController input) {
+				return input.getView().getVisibility();
+			}
+		}).containsExactly(View.VISIBLE, View.GONE, View.GONE, View.GONE, View.GONE);
+	}
+
+	@Test
+	public void selectTabAtIndex() throws Exception {
+		uut.setTabs(createTabs());
+		assertThat(uut.getSelectedIndex()).isZero();
+
+		uut.selectTabAtIndex(3);
+
+		assertThat(uut.getSelectedIndex()).isEqualTo(3);
+		assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, Integer>() {
+			@Override
+			public Integer extract(final ViewController input) {
+				return input.getView().getVisibility();
+			}
+		}).containsExactly(View.GONE, View.GONE, View.GONE, View.VISIBLE, 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() {
+		return Arrays.asList(child1, child2, child3, child4, child5);
+	}
+}

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

@@ -0,0 +1,114 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class IndexedStackTest extends BaseTest {
+
+	private IndexedStack<Integer> uut;
+
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		uut = new IndexedStack<>();
+	}
+
+	@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);
+	}
+
+	@Test
+	public void peekId() throws Exception {
+		assertThat(uut.peekId()).isNull();
+		uut.push("123", 123);
+		assertThat(uut.peekId()).isEqualTo("123");
+	}
+
+	@Test
+	public void clear() throws Exception {
+		uut.push("123", 123);
+		uut.push("456", 456);
+		uut.clear();
+		assertThat(uut.isEmpty()).isTrue();
+	}
+
+	@Test
+	public void getById() throws Exception {
+		assertThat(uut.get("123")).isNull();
+		uut.push("123", 123);
+		uut.push("456", 456);
+		assertThat(uut.get("123")).isEqualTo(123);
+	}
+
+	@Test
+	public void containsId() throws Exception {
+		assertThat(uut.containsId("123")).isFalse();
+		uut.push("123", 123);
+		assertThat(uut.containsId("123")).isTrue();
+	}
+
+	@Test
+	public void remove() throws Exception {
+		assertThat(uut.remove("123")).isNull();
+
+		uut.push("123", 123);
+		uut.push("456", 456);
+
+		assertThat(uut.remove("123")).isEqualTo(123);
+	}
+
+	@Test
+	public void iterableIds() throws Exception {
+		assertThat(uut).isInstanceOf(Iterable.class);
+		assertThat(uut).isEmpty();
+		uut.push("123", 123);
+		uut.push("456", 456);
+		assertThat(uut).containsExactly("456", "123");
+	}
+
+	@Test
+	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();
+	}
+
+	@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

@@ -0,0 +1,113 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.BaseTest;
+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 {
+	private Activity activity;
+	private Navigator uut;
+	private ViewController child1;
+	private ViewController child2;
+
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		activity = newActivity();
+		uut = new Navigator(activity);
+		child1 = new SimpleViewController(activity, "child1");
+		child2 = new SimpleViewController(activity, "child2");
+	}
+
+
+	@Test
+	public void isActivityResumed() throws Exception {
+		assertThat(uut.isActivityResumed()).isFalse();
+		uut.onActivityCreated();
+		assertThat(uut.isActivityResumed()).isFalse();
+		uut.onActivityResumed();
+		assertThat(uut.isActivityResumed()).isTrue();
+		uut.onActivityPaused();
+		assertThat(uut.isActivityResumed()).isFalse();
+	}
+
+	@Test
+	public void setsItselfAsContentView() throws Exception {
+		assertThat(Shadows.shadowOf(activity).getContentView()).isNull();
+		uut.onActivityCreated();
+		assertThat(Shadows.shadowOf(activity).getContentView()).isNotNull().isEqualTo(uut.getView());
+	}
+
+	@Test
+	public void setRoot_AddsChildControllerView() throws Exception {
+		assertThat(uut.getView().getChildCount()).isZero();
+		uut.setRoot(child1);
+		assertHasSingleChildViewOf(uut, child1);
+	}
+
+	@Test
+	public void setRoot_ReplacesExistingChildControllerViews() throws Exception {
+		uut.setRoot(child1);
+		uut.setRoot(child2);
+		assertHasSingleChildViewOf(uut, child2);
+	}
+
+	@Test
+	public void hasUniqueId() throws Exception {
+		assertThat(uut.getId()).startsWith("navigator");
+		assertThat(new Navigator(activity).getId()).isNotEqualTo(uut.getId());
+	}
+
+	@Test
+	public void push() throws Exception {
+		StackController stackController = new StackController(activity, "stack1");
+		stackController.push(child1);
+		uut.setRoot(stackController);
+
+		assertHasSingleChildViewOf(uut, stackController);
+		assertHasSingleChildViewOf(stackController, child1);
+
+		uut.push(child1.getId(), child2);
+
+		assertHasSingleChildViewOf(uut, stackController);
+		assertHasSingleChildViewOf(stackController, child2);
+	}
+
+	@Test
+	public void push_InvalidPushWithoutAStack_DoesNothing() throws Exception {
+		uut.setRoot(child1);
+		uut.push(child1.getId(), child2);
+		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, "stack2");
+		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);
+
+		assertThat(stack1.getChildControllers()).doesNotContain(newChild);
+		assertThat(stack2.getChildControllers()).contains(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,93 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleViewController;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collection;
+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 holdsViewGroup() throws Exception {
+		ParentController uut = new ParentController(activity, "uut") {
+			@Override
+			public Collection<ViewController> getChildControllers() {
+				return Collections.emptyList();
+			}
+
+			@NonNull
+			@Override
+			protected View createView() {
+				return new FrameLayout(activity);
+			}
+		};
+
+		assertThat(uut.getView()).isInstanceOf(ViewGroup.class);
+	}
+
+	@Test
+	public void findControllerById_ReturnsSelfIfSameId() throws Exception {
+		ParentController uut = new ParentController(activity, "uut") {
+			@Override
+			public Collection<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 Collection<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

@@ -23,7 +23,7 @@ public class StackControllerTest extends BaseTest {
 	public void beforeEach() {
 		super.beforeEach();
 		activity = newActivity();
-		uut = new StackController(activity);
+		uut = new StackController(activity, "uut");
 		child1 = new SimpleViewController(activity, "child1");
 		child2 = new SimpleViewController(activity, "child2");
 		child3 = new SimpleViewController(activity, "child3");
@@ -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);
+		assertContainsOnlyId(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);
+		assertContainsOnlyId(child1.getId());
 	}
 
 	@Test
 	public void pop() throws Exception {
 		uut.push(child1);
 		uut.push(child2);
-		assertThat(uut.getStack()).containsOnly(child2, child1);
+		assertContainsOnlyId(child2.getId(), child1.getId());
 		uut.pop();
-		assertThat(uut.getStack()).containsOnly(child1);
+		assertContainsOnlyId(child1.getId());
 	}
 
 	@Test
@@ -73,13 +73,13 @@ public class StackControllerTest extends BaseTest {
 
 	@Test
 	public void pushAssignsRefToSelfOnPushedController() throws Exception {
-		assertThat(child1.getStackController()).isNull();
+		assertThat(child1.getParentStackController()).isNull();
 		uut.push(child1);
-		assertThat(child1.getStackController()).isEqualTo(uut);
+		assertThat(child1.getParentStackController()).isEqualTo(uut);
 
-		StackController anotherNavController = new StackController(activity);
+		StackController anotherNavController = new StackController(activity, "another");
 		anotherNavController.push(child2);
-		assertThat(child2.getStackController()).isEqualTo(anotherNavController);
+		assertThat(child2.getParentStackController()).isEqualTo(anotherNavController);
 	}
 
 	@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);
+		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);
+		assertContainsOnlyId(child1.getId());
 		assertThat(uut.canPop()).isFalse();
 		uut.push(child2);
-		assertThat(uut.getStack()).containsOnly(child1, child2);
+		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);
+		assertContainsOnlyId(child1.getId());
 		assertHasSingleChildViewOfController(child1);
 	}
 
@@ -170,13 +170,13 @@ public class StackControllerTest extends BaseTest {
 		assertHasSingleChildViewOfController(child2);
 
 		uut.pop(child1);
-		assertThat(uut.getStack()).containsOnly(child2);
+		assertContainsOnlyId(child2.getId());
 		assertHasSingleChildViewOfController(child2);
 	}
 
 	@Test
 	public void getStackControllerReturnsSelf() throws Exception {
-		assertThat(uut.getStackController()).isEqualTo(uut);
+		assertThat(uut.getParentStackController()).isEqualTo(uut);
 	}
 
 	@Test
@@ -225,8 +225,31 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.isEmpty()).isTrue();
 	}
 
+	@Test
+	public void findControllerById_ReturnsSelfOrChildrenById() throws Exception {
+		assertThat(uut.findControllerById("123")).isNull();
+		assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
+		uut.push(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) {
 		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));
+		}
+	}
 }

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

@@ -35,7 +35,7 @@ public class ViewControllerTest extends BaseTest {
 	@Test
 	public void canOverrideViewCreation() throws Exception {
 		final View otherView = new View(activity);
-		ViewController myController = new ViewController(activity) {
+		ViewController myController = new ViewController(activity, "vc") {
 			@Override
 			protected View createView() {
 				return otherView;
@@ -46,14 +46,25 @@ public class ViewControllerTest extends BaseTest {
 
 	@Test
 	public void holdsAReferenceToStackControllerOrNull() throws Exception {
-		assertThat(uut.getStackController()).isNull();
-		StackController nav = new StackController(activity);
+		assertThat(uut.getParentStackController()).isNull();
+		StackController nav = new StackController(activity, "stack");
 		nav.push(uut);
-		assertThat(uut.getStackController()).isEqualTo(nav);
+		assertThat(uut.getParentStackController()).isEqualTo(nav);
 	}
 
 	@Test
 	public void handleBackDefaultFalse() throws Exception {
 		assertThat(uut.handleBack()).isFalse();
 	}
+
+	@Test
+	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);
+	}
 }