migrate to controllers

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

@@ -6,11 +6,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.widget.FrameLayout;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.reactnativenavigation.layout.Layout;
-import com.reactnativenavigation.layout.impl.StackLayout;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
-	private Layout layout;
+	private ViewController layout;
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -38,11 +37,12 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	}
 
 
-	public void setLayout(Layout layout) {
+	public void setLayout(ViewController layout) {
 		this.layout = layout;
+		setContentView(layout.getView());
 	}
 
-	public Layout getLayout() {
+	public ViewController getLayout() {
 		return layout;
 	}
 
@@ -53,9 +53,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void onBackPressed() {
-		if (layout instanceof StackLayout && ((StackLayout) layout).onBackPressed()) {
-			// do nothing, layout pops
-		} else {
+		if (!layout.handleBack()) {
 			super.onBackPressed();
 		}
 	}

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

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

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

@@ -1,16 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import android.view.View;
-
-import com.reactnativenavigation.layout.impl.StackLayout;
-
-//TODO delete
-public interface Layout {
-	void setParentStackLayout(StackLayout stackLayout);
-
-	StackLayout getParentStackLayout();
-
-	View getView();
-
-	void destroy();
-}

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

@@ -5,7 +5,8 @@ import android.app.Activity;
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.controllers.Store;
 import com.reactnativenavigation.layout.impl.RootLayout;
-import com.reactnativenavigation.layout.impl.StackLayout;
+import com.reactnativenavigation.viewcontrollers.StackController;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class LayoutFactory {
 
@@ -19,13 +20,13 @@ public class LayoutFactory {
 		this.store = store;
 	}
 
-	public Layout createAndSaveToStore(LayoutNode node) {
-		Layout layout = createLayout(node);
-		store.setLayout(node.id, layout);
-		return layout;
+	public ViewController createAndSaveToStore(LayoutNode node) {
+		ViewController viewController = create(node);
+		store.setViewController(node.id, viewController);
+		return viewController;
 	}
 
-	private Layout createLayout(final LayoutNode node) {
+	private ViewController create(final LayoutNode node) {
 		switch (node.type) {
 			case Container:
 				return createContainer(node);
@@ -80,16 +81,16 @@ public class LayoutFactory {
 //		return createAndSaveToStore(node.children.get(0));
 //	}
 
-	private Layout createContainer(LayoutNode node) {
+	private ViewController createContainer(LayoutNode node) {
 		return new RootLayout(activity, node.id, node.data.optString("name"), reactInstanceManager);
 	}
 
-	private Layout createContainerStack(LayoutNode node) {
-		final StackLayout layoutStack = new StackLayout(activity);
+	private ViewController createContainerStack(LayoutNode node) {
+		StackController stackController = new StackController(activity);
 		for (LayoutNode child : node.children) {
-			layoutStack.push(createAndSaveToStore(child));
+			stackController.push(createAndSaveToStore(child));
 		}
-		return layoutStack;
+		return stackController;
 	}
 
 //	private Layout createBottomTabs(LayoutNode node) {

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

@@ -3,48 +3,29 @@ package com.reactnativenavigation.layout.impl;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.FrameLayout;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
-import com.reactnativenavigation.layout.Layout;
 import com.reactnativenavigation.react.NavigationEvent;
-import com.reactnativenavigation.utils.CompatUtils;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 
-public class RootLayout implements Layout, View.OnAttachStateChangeListener {
+public class RootLayout extends ViewController implements View.OnAttachStateChangeListener {
 
 	private final String id;
 	private final String name;
-	private final FrameLayout view;
-	private final ReactRootView reactRootView;
 	private final ReactInstanceManager reactInstanceManager;
-	private StackLayout parentStackLayout;
 
-	public RootLayout(Activity activity, String id, String name, final ReactInstanceManager reactInstanceManager) {
+	public RootLayout(final Activity activity, final String id, final String name, final ReactInstanceManager reactInstanceManager) {
+		super(activity);
 		this.id = id;
 		this.name = name;
 		this.reactInstanceManager = reactInstanceManager;
-		reactRootView = new ReactRootView(activity);
-		reactRootView.addOnAttachStateChangeListener(this);
-		Bundle opts = new Bundle();
-		opts.putString("id", this.id);
-		reactRootView.startReactApplication(this.reactInstanceManager, this.name, opts);
-		reactRootView.setEventListener(new ReactRootView.ReactRootViewEventListener() {
-			@Override
-			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
-				reactRootView.setEventListener(null);
-				onStart();
-			}
-		});
-		view = new FrameLayout(activity);
-		view.addView(reactRootView);
-		view.setId(CompatUtils.generateViewId());
 	}
 
-	@Override
-	public void destroy() {
-		reactRootView.unmountReactApplication();
-	}
+//	@Override
+//	public void destroy() {
+//		reactRootView.unmountReactApplication();
+//	}
 
 	@Override
 	public void onViewAttachedToWindow(final View v) {
@@ -56,11 +37,6 @@ public class RootLayout implements Layout, View.OnAttachStateChangeListener {
 		onStop();
 	}
 
-	@Override
-	public View getView() {
-		return view;
-	}
-
 	private void onStart() {
 		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStart(id);
 	}
@@ -69,12 +45,20 @@ public class RootLayout implements Layout, View.OnAttachStateChangeListener {
 		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStop(id);
 	}
 
-	public void setParentStackLayout(final StackLayout parentStackLayout) {
-		this.parentStackLayout = parentStackLayout;
-	}
-
 	@Override
-	public StackLayout getParentStackLayout() {
-		return parentStackLayout;
+	protected View onCreateView() {
+		ReactRootView reactRootView = new ReactRootView(getActivity());
+		reactRootView.addOnAttachStateChangeListener(this);
+		Bundle opts = new Bundle();
+		opts.putString("id", this.id);
+		reactRootView.startReactApplication(this.reactInstanceManager, this.name, opts);
+		reactRootView.setEventListener(new ReactRootView.ReactRootViewEventListener() {
+			@Override
+			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
+				reactRootView.setEventListener(null);
+				onStart();
+			}
+		});
+		return reactRootView;
 	}
 }

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

@@ -1,81 +0,0 @@
-package com.reactnativenavigation.layout.impl;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.reactnativenavigation.layout.Layout;
-import com.reactnativenavigation.utils.CompatUtils;
-
-import java.util.Stack;
-
-public class StackLayout implements Layout {
-
-	private final Stack<Layout> stack = new Stack<>();
-	private final FrameLayout view;
-	private StackLayout stackLayout;
-
-	public StackLayout(Context context) {
-		view = new FrameLayout(context);
-		view.setId(CompatUtils.generateViewId());
-	}
-
-	public void push(Layout child) {
-		child.setParentStackLayout(this);
-		stack.push(child);
-		view.addView(child.getView());
-		if (stack.size() > 1) {
-			Layout previousTop = stack.elementAt(stack.size() - 2);
-			view.removeView(previousTop.getView());
-		}
-	}
-
-	public void pop() {
-		Layout top = stack.pop();
-		view.removeView(top.getView());
-		top.destroy();
-		if (!stack.isEmpty()) {
-			Layout previousTop = stack.peek();
-			view.addView(previousTop.getView());
-		}
-	}
-
-	public void pop(Layout layout) {
-		if (stack.peek() == layout) {
-			pop();
-		} else {
-			stack.remove(layout);
-			view.removeView(layout.getView());
-			layout.destroy();
-		}
-	}
-
-	public boolean onBackPressed() {
-		if (stack.isEmpty()) {
-			return false;
-		} else {
-			pop();
-			return true;
-		}
-	}
-
-	@Override
-	public View getView() {
-		return view;
-	}
-
-	@Override
-	public void destroy() {
-		//
-	}
-
-	@Override
-	public void setParentStackLayout(final StackLayout stackLayout) {
-		this.stackLayout = stackLayout;
-	}
-
-	@Override
-	public StackLayout getParentStackLayout() {
-		return stackLayout;
-	}
-}

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

@@ -7,13 +7,12 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.controllers.Store;
-import com.reactnativenavigation.layout.Layout;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
-import com.reactnativenavigation.layout.impl.StackLayout;
 import com.reactnativenavigation.parse.JSONParser;
 import com.reactnativenavigation.parse.LayoutNodeParser;
 import com.reactnativenavigation.utils.UiThread;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
@@ -38,8 +37,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			public void run() {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager, store);
-				final Layout rootView = factory.createAndSaveToStore(layoutTree);
-				activity().setContentView(rootView.getView());
+				final ViewController rootView = factory.createAndSaveToStore(layoutTree);
 				activity().setLayout(rootView);
 			}
 		});
@@ -52,8 +50,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 			public void run() {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager, store);
-				final Layout rootView = factory.createAndSaveToStore(layoutTree);
-				((StackLayout) activity().getLayout()).push(rootView);
+				final ViewController rootView = factory.createAndSaveToStore(layoutTree);
+				store.getViewController(onContainerId).getParentStackController().push(rootView);
 			}
 		});
 	}
@@ -63,8 +61,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				Layout layout = store.getLayout(onContainerId);
-				layout.getParentStackLayout().pop(layout);
+				ViewController layout = store.getViewController(onContainerId);
+				layout.getParentStackController().pop(layout);
 			}
 		});
 	}