refactor

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

@@ -9,7 +9,7 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
-	private ViewController layout;
+	private ViewController viewController;
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -37,13 +37,13 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	}
 
 
-	public void setLayout(ViewController layout) {
-		this.layout = layout;
-		setContentView(layout.getView());
+	public void setViewController(ViewController viewController) {
+		this.viewController = viewController;
+		setContentView(viewController.getView());
 	}
 
-	public ViewController getLayout() {
-		return layout;
+	public ViewController getViewController() {
+		return viewController;
 	}
 
 	@Override
@@ -53,7 +53,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void onBackPressed() {
-		if (!layout.handleBack()) {
+		if (!viewController.handleBack()) {
 			super.onBackPressed();
 		}
 	}

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

@@ -4,7 +4,6 @@ import android.app.Application;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
-import com.reactnativenavigation.controllers.Store;
 import com.reactnativenavigation.react.NavigationReactInitializer;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 

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

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

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.layout;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.controllers.Store;
+import com.reactnativenavigation.Store;
 import com.reactnativenavigation.layout.impl.RootLayout;
 import com.reactnativenavigation.viewcontrollers.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
@@ -11,8 +11,8 @@ import com.reactnativenavigation.viewcontrollers.ViewController;
 public class LayoutFactory {
 
 	private final Activity activity;
-	private ReactInstanceManager reactInstanceManager;
-	private Store store;
+	private final ReactInstanceManager reactInstanceManager;
+	private final Store store;
 
 	public LayoutFactory(Activity activity, final ReactInstanceManager reactInstanceManager, final Store store) {
 		this.activity = activity;

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

@@ -6,7 +6,7 @@ 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.controllers.Store;
+import com.reactnativenavigation.Store;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
 import com.reactnativenavigation.parse.JSONParser;
@@ -38,7 +38,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager, store);
 				final ViewController rootView = factory.createAndSaveToStore(layoutTree);
-				activity().setLayout(rootView);
+				activity().setViewController(rootView);
 			}
 		});
 	}

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

@@ -6,7 +6,7 @@ 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.controllers.Store;
+import com.reactnativenavigation.Store;
 
 import java.util.Arrays;
 import java.util.Collections;

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

@@ -5,7 +5,7 @@ import android.app.Application;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
-import com.reactnativenavigation.controllers.Store;
+import com.reactnativenavigation.Store;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -0,0 +1,31 @@
+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);
+	}
+}