removed store, viewControllers now have id

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

@@ -11,15 +11,13 @@ import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 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);
 	}

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

@@ -3,7 +3,6 @@ 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.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
@@ -12,21 +11,13 @@ 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);
@@ -86,9 +77,9 @@ 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;
 	}

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

@@ -11,14 +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;
 	}
@@ -61,7 +59,7 @@ public class ReactRootViewController extends ViewController {
 	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

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

@@ -8,7 +8,6 @@ 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;
@@ -20,12 +19,10 @@ 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
@@ -39,7 +36,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			@Override
 			public void run() {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
-				final ViewController viewController = newLayoutFactory().createAndSaveToStore(layoutTree);
+				final ViewController viewController = newLayoutFactory().create(layoutTree);
 				navigator().setRoot(viewController);
 			}
 		});
@@ -51,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);
 			}
 		});
 	}
@@ -62,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));
 			}
 		});
 	}
@@ -72,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));
 			}
 		});
 	}
@@ -82,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();
 			}
 		});
 	}
@@ -97,7 +94,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
 	@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/viewcontrollers/Navigator.java

@@ -9,7 +9,7 @@ public class Navigator extends ViewController {
 	private boolean activityResumed = false;
 
 	public Navigator(final Activity activity) {
-		super(activity);
+		super(activity, "navigator");
 	}
 
 	@NonNull

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

@@ -11,8 +11,8 @@ import java.util.ArrayDeque;
 public class StackController extends ViewController {
 	private final ArrayDeque<ViewController> stack = new ArrayDeque<>();
 
-	public StackController(final Activity activity) {
-		super(activity);
+	public StackController(final Activity activity, String id) {
+		super(activity, id);
 	}
 
 	public void push(final ViewController child) {

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

@@ -9,9 +9,11 @@ public abstract class ViewController {
 	private View view;
 	private final Activity activity;
 	private StackController stackController;
+	private String id;
 
-	public ViewController(Activity activity) {
+	public ViewController(Activity activity, String id) {
 		this.activity = activity;
+		this.id = id;
 	}
 
 	@NonNull
@@ -41,4 +43,8 @@ public abstract class ViewController {
 		}
 		return view;
 	}
+
+	public String getId() {
+		return id;
+	}
 }

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/viewcontrollers/NavigatorTest.java

@@ -58,8 +58,6 @@ public class NavigatorTest extends BaseTest {
 		assertHasSingleChildViewOf(child2);
 	}
 
-
-
 	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

@@ -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");
@@ -77,7 +77,7 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child1);
 		assertThat(child1.getStackController()).isEqualTo(uut);
 
-		StackController anotherNavController = new StackController(activity);
+		StackController anotherNavController = new StackController(activity, "another");
 		anotherNavController.push(child2);
 		assertThat(child2.getStackController()).isEqualTo(anotherNavController);
 	}

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;
@@ -47,7 +47,7 @@ public class ViewControllerTest extends BaseTest {
 	@Test
 	public void holdsAReferenceToStackControllerOrNull() throws Exception {
 		assertThat(uut.getStackController()).isNull();
-		StackController nav = new StackController(activity);
+		StackController nav = new StackController(activity, "stack");
 		nav.push(uut);
 		assertThat(uut.getStackController()).isEqualTo(nav);
 	}
@@ -56,4 +56,9 @@ public class ViewControllerTest extends BaseTest {
 	public void handleBackDefaultFalse() throws Exception {
 		assertThat(uut.handleBack()).isFalse();
 	}
+
+	@Test
+	public void holdsId() throws Exception {
+		assertThat(uut.getId()).isEqualTo("uut");
+	}
 }