composition of layouts (view controllers)

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

@@ -6,10 +6,12 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.reactnativenavigation.layout.containers.ContainerStack;
+import com.reactnativenavigation.layout.Layout;
+import com.reactnativenavigation.layout.containers.LayoutStack;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
 	private View contentView;
+	private Layout layout;
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -53,7 +55,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void onBackPressed() {
-		if (!(contentView instanceof ContainerStack) || !((ContainerStack) contentView).onBackPressed()) {
+		if (!(contentView instanceof LayoutStack) || !((LayoutStack) contentView).onBackPressed()) {
 			super.onBackPressed();
 		}
 	}

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

@@ -0,0 +1,9 @@
+package com.reactnativenavigation.layout;
+
+import android.view.View;
+
+public interface Layout {
+	View getView();
+
+	void destroy();
+}

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

@@ -1,18 +1,12 @@
 package com.reactnativenavigation.layout;
 
 import android.app.Activity;
-import android.support.v4.widget.DrawerLayout;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.layout.containers.BottomTabs;
 import com.reactnativenavigation.layout.containers.BottomTabsLayout;
-import com.reactnativenavigation.layout.containers.Container;
-import com.reactnativenavigation.layout.containers.ContainerStack;
+import com.reactnativenavigation.layout.containers.LayoutStack;
+import com.reactnativenavigation.layout.containers.RootLayout;
 import com.reactnativenavigation.layout.containers.SideMenuLayout;
-import com.reactnativenavigation.utils.CompatUtils;
 
 public class LayoutFactory {
 
@@ -24,7 +18,7 @@ public class LayoutFactory {
 		this.reactInstanceManager = reactInstanceManager;
 	}
 
-	public View create(LayoutNode node) {
+	public Layout create(LayoutNode node) {
 		switch (node.type) {
 			case Container:
 				return createContainer(node);
@@ -45,57 +39,55 @@ public class LayoutFactory {
 		}
 	}
 
-	private View createSideMenuRoot(LayoutNode node) {
+	private Layout createSideMenuRoot(LayoutNode node) {
 		SideMenuLayout sideMenuLayout = new SideMenuLayout(activity);
 		for (LayoutNode child : node.children) {
-			sideMenuLayout.addView(create(child));
+			Layout childLayout = create(child);
+			switch (child.type) {
+				case SideMenuCenter:
+					sideMenuLayout.addCenterLayout(childLayout);
+					break;
+				case SideMenuLeft:
+					sideMenuLayout.addLeftLayout(childLayout);
+					break;
+				case SideMenuRight:
+					sideMenuLayout.addRightLayout(childLayout);
+					break;
+				default:
+					throw new IllegalArgumentException("Invalid node type in sideMenu: " + node.type);
+			}
 		}
 		return sideMenuLayout;
 	}
 
-	private View createSideMenuContent(LayoutNode node) {
+	private Layout createSideMenuContent(LayoutNode node) {
 		return create(node.children.get(0));
 	}
 
-	private View createSideMenuLeft(LayoutNode node) {
-		View view = create(node.children.get(0));
-		view.setId(CompatUtils.generateViewId());
-		DrawerLayout.LayoutParams lp = new DrawerLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-		lp.gravity = Gravity.LEFT;
-		view.setLayoutParams(lp);
-		return view;
+	private Layout createSideMenuLeft(LayoutNode node) {
+		return create(node.children.get(0));
 	}
 
-	private View createSideMenuRight(LayoutNode node) {
-		View view = create(node.children.get(0));
-		view.setId(CompatUtils.generateViewId());
-		DrawerLayout.LayoutParams lp = new DrawerLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-		lp.gravity = Gravity.RIGHT;
-		view.setLayoutParams(lp);
-		return view;
+	private Layout createSideMenuRight(LayoutNode node) {
+		return create(node.children.get(0));
 	}
 
-	private View createContainer(LayoutNode node) {
-		final String name = node.data.optString("name");
-		Container container = new Container(activity, node.id, name, reactInstanceManager);
-		container.setId(CompatUtils.generateViewId());
-		return container;
-
+	private Layout createContainer(LayoutNode node) {
+		return new RootLayout(activity, node.id, node.data.optString("name"), reactInstanceManager);
 	}
 
-	private View createContainerStack(LayoutNode node) {
-		final ContainerStack containerStack = new ContainerStack(activity);
-		containerStack.setId(CompatUtils.generateViewId());
+	private Layout createContainerStack(LayoutNode node) {
+		final LayoutStack layoutStack = new LayoutStack(activity);
 		for (LayoutNode child : node.children) {
-			containerStack.addView(create(child));
+			layoutStack.push(create(child));
 		}
-		return containerStack;
+		return layoutStack;
 	}
 
-	private View createBottomTabs(LayoutNode node) {
-		final BottomTabsLayout tabsContainer = new BottomTabsLayout(activity, new BottomTabs());
+	private Layout createBottomTabs(LayoutNode node) {
+		final BottomTabsLayout tabsContainer = new BottomTabsLayout(activity);
 		for (int i = 0; i < node.children.size(); i++) {
-			final View tabContent = create(node.children.get(i));
+			final Layout tabContent = create(node.children.get(i));
 			tabsContainer.addTabContent("#" + i, tabContent);
 		}
 		return tabsContainer;

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

@@ -1,8 +1,5 @@
 package com.reactnativenavigation.layout;
 
-import android.support.annotation.NonNull;
-
-import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
@@ -19,31 +16,6 @@ public class LayoutNode {
 		SideMenuRight
 	}
 
-	@SuppressWarnings("unchecked")
-	public static LayoutNode parse(JSONObject layoutTree) {
-		String id = layoutTree.optString("id");
-		LayoutNode.Type type = LayoutNode.Type.valueOf(layoutTree.optString("type"));
-		JSONObject data = parseData(layoutTree);
-		List<LayoutNode> children = parseChildren(layoutTree);
-		return new LayoutNode(id, type, data, children);
-	}
-
-	@NonNull
-	private static List<LayoutNode> parseChildren(JSONObject layoutTree) {
-		List<LayoutNode> children = new ArrayList<>();
-		if (layoutTree.has("children")) {
-			JSONArray rawChildren = layoutTree.optJSONArray("children");
-			for (int i = 0; i < rawChildren.length(); i++) {
-				children.add(LayoutNode.parse(rawChildren.optJSONObject(i)));
-			}
-		}
-		return children;
-	}
-
-	private static JSONObject parseData(JSONObject layoutTree) {
-		return layoutTree.has("data") ? layoutTree.optJSONObject("data") : new JSONObject();
-	}
-
 	public final String id;
 	public final Type type;
 	public final JSONObject data;

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

@@ -4,34 +4,55 @@ import android.app.Activity;
 import android.view.View;
 import android.widget.RelativeLayout;
 
+import com.reactnativenavigation.layout.Layout;
+import com.reactnativenavigation.utils.CompatUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
-public class BottomTabsLayout extends RelativeLayout implements BottomTabs.BottomTabsSelectionListener {
+import static android.widget.RelativeLayout.ABOVE;
+
+public class BottomTabsLayout implements Layout, BottomTabs.BottomTabsSelectionListener {
 
 	public static class TooManyTabs extends RuntimeException {
 	}
 
-
-	private List<View> tabsContent;
-	private BottomTabs bottomTabs;
+	private final RelativeLayout view;
+	private final BottomTabs bottomTabs;
+	private final List<View> tabContentViews = new ArrayList<>();
 	private int currentTab;
 
-	public BottomTabsLayout(Activity activity, BottomTabs bottomTabs) {
-		super(activity);
-		initBottomTabs(bottomTabs);
+	public BottomTabsLayout(Activity activity) {
+		view = new RelativeLayout(activity);
+		view.setId(CompatUtils.generateViewId());
+
+		//TODO inline everything. unneeded complexity
+		bottomTabs = new BottomTabs();
+		bottomTabs.attach(view);
+		bottomTabs.setSelectionListener(this);
+	}
+
+	@Override
+	public View getView() {
+		return view;
+	}
+
+	@Override
+	public void destroy() {
+		//
 	}
 
-	public void addTabContent(String label, View tabContent) {
-		if (tabsContent.size() >= 5) {
+
+	public void addTabContent(String label, Layout tabContent) {
+		if (tabContentViews.size() >= 5) {
 			throw new TooManyTabs();
 		}
 		bottomTabs.add(label);
-		attachTabContent(tabContent);
-		tabsContent.add(tabContent);
+		attachTabContent(tabContent.getView());
+		tabContentViews.add(tabContent.getView());
 
-		if (tabsContent.size() > 1) {
-			tabContent.setVisibility(View.GONE);
+		if (tabContentViews.size() > 1) {
+			tabContent.getView().setVisibility(View.GONE);
 		}
 	}
 
@@ -42,25 +63,17 @@ public class BottomTabsLayout extends RelativeLayout implements BottomTabs.Botto
 		showTab(currentTab);
 	}
 
-	private void initBottomTabs(BottomTabs bottomTabs) {
-		this.bottomTabs = bottomTabs;
-		this.bottomTabs.attach(this);
-		this.bottomTabs.setSelectionListener(this);
-
-		tabsContent = new ArrayList<>();
-	}
-
 	private void attachTabContent(View tabContent) {
-		LayoutParams tabParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+		RelativeLayout.LayoutParams tabParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
 		tabParams.addRule(ABOVE, bottomTabs.getViewId());
-		addView(tabContent, tabParams);
+		view.addView(tabContent, tabParams);
 	}
 
 	private void showTab(int tabId) {
-		tabsContent.get(tabId).setVisibility(View.VISIBLE);
+		tabContentViews.get(tabId).setVisibility(View.VISIBLE);
 	}
 
 	private void hideTab(int tabId) {
-		tabsContent.get(tabId).setVisibility(View.GONE);
+		tabContentViews.get(tabId).setVisibility(View.GONE);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/Container.java

@@ -1,63 +0,0 @@
-package com.reactnativenavigation.layout.containers;
-
-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.react.NavigationEventEmitter;
-
-public class Container extends FrameLayout {
-
-	private final String id;
-	private final String name;
-	private ReactRootView rootView;
-	private final ReactInstanceManager reactInstanceManager;
-
-
-	public Container(Activity activity, String id, String name, final ReactInstanceManager reactInstanceManager) {
-		super(activity);
-
-		this.id = id;
-		this.name = name;
-		this.reactInstanceManager = reactInstanceManager;
-		addView(createReactRootView());
-	}
-
-	@Override
-	protected void onDetachedFromWindow() {
-		super.onDetachedFromWindow();
-		onStop();
-	}
-
-
-	public void destroy() {
-		rootView.unmountReactApplication();
-	}
-
-	private View createReactRootView() {
-		rootView = new ReactRootView(getContext());
-		Bundle opts = new Bundle();
-		opts.putString("id", id);
-		rootView.startReactApplication(reactInstanceManager, name, opts);
-		rootView.setEventListener(new ReactRootView.ReactRootViewEventListener() {
-			@Override
-			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
-				rootView.setEventListener(null);
-				onStart();
-			}
-		});
-		return rootView;
-	}
-
-	private void onStart() {
-		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).containerStart(id);
-	}
-
-	private void onStop() {
-		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).containerStop(id);
-	}
-
-}

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/ContainerStack.java

@@ -1,47 +0,0 @@
-package com.reactnativenavigation.layout.containers;
-
-import android.content.Context;
-import android.widget.FrameLayout;
-
-import java.util.Stack;
-
-public class ContainerStack extends FrameLayout {
-
-	private Stack<Container> stack = new Stack<>();
-
-	public ContainerStack(Context context) {
-		super(context);
-	}
-
-	public void push(Container view) {
-		stack.push(view);
-		addView(view);
-		if (stack.size() > 1) {
-			Container previousTop = stack.elementAt(stack.size() - 2);
-			removeView(previousTop);
-		}
-	}
-
-	public void pop() {
-		Container top = stack.pop();
-		removeView(top);
-		top.destroy();
-		if (!stack.isEmpty()) {
-			Container previousTop = stack.peek();
-			addView(previousTop);
-		}
-	}
-
-	public boolean onBackPressed() {
-		if (stack.isEmpty()) {
-			return false;
-		} else {
-			pop();
-			return true;
-		}
-	}
-
-	public boolean isEmpty() {
-		return stack.isEmpty();
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/LayoutStack.java

@@ -0,0 +1,59 @@
+package com.reactnativenavigation.layout.containers;
+
+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 LayoutStack implements Layout {
+
+	private final Stack<Layout> stack = new Stack<>();
+	private final FrameLayout view;
+
+	public LayoutStack(Context context) {
+		view = new FrameLayout(context);
+		view.setId(CompatUtils.generateViewId());
+	}
+
+	public void push(Layout child) {
+		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 boolean onBackPressed() {
+		if (stack.isEmpty()) {
+			return false;
+		} else {
+			pop();
+			return true;
+		}
+	}
+
+	@Override
+	public View getView() {
+		return view;
+	}
+
+	@Override
+	public void destroy() {
+		//
+	}
+}

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

@@ -0,0 +1,70 @@
+package com.reactnativenavigation.layout.containers;
+
+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.NavigationEventEmitter;
+import com.reactnativenavigation.utils.CompatUtils;
+
+public class RootLayout implements Layout, View.OnAttachStateChangeListener {
+
+	private final String id;
+	private final String name;
+	private final FrameLayout view;
+	private final ReactRootView reactRootView;
+	private final ReactInstanceManager reactInstanceManager;
+
+	public RootLayout(Activity activity, String id, String name, final ReactInstanceManager reactInstanceManager) {
+		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 onViewAttachedToWindow(final View v) {
+		//
+	}
+
+	@Override
+	public void onViewDetachedFromWindow(final View v) {
+		onStop();
+	}
+
+	@Override
+	public View getView() {
+		return view;
+	}
+
+	private void onStart() {
+		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).containerStart(id);
+	}
+
+	private void onStop() {
+		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).containerStop(id);
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/SideMenuLayout.java

@@ -2,11 +2,52 @@ package com.reactnativenavigation.layout.containers;
 
 import android.content.Context;
 import android.support.v4.widget.DrawerLayout;
+import android.view.Gravity;
+import android.view.View;
 
-public class SideMenuLayout extends DrawerLayout {
+import com.reactnativenavigation.layout.Layout;
+import com.reactnativenavigation.utils.CompatUtils;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
+public class SideMenuLayout implements Layout {
+
+	private DrawerLayout view;
 
 	public SideMenuLayout(Context context) {
-		super(context);
+		view = new DrawerLayout(context);
+		view.setId(CompatUtils.generateViewId());
+	}
+
+	@Override
+	public View getView() {
+		return view;
+	}
+
+	@Override
+	public void destroy() {
+		//
+	}
+
+	public void addLeftLayout(final Layout childLayout) {
+		View child = childLayout.getView();
+		DrawerLayout.LayoutParams lp = new DrawerLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+		lp.gravity = Gravity.LEFT;
+		child.setLayoutParams(lp);
+		view.addView(child);
 	}
 
+	public void addRightLayout(final Layout childLayout) {
+		View child = childLayout.getView();
+		DrawerLayout.LayoutParams lp = new DrawerLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+		lp.gravity = Gravity.RIGHT;
+		child.setLayoutParams(lp);
+		view.addView(child);
+	}
+
+	public void addCenterLayout(final Layout childLayout) {
+		View child = childLayout.getView();
+		view.addView(child);
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/ArgsParser.java → lib/android/app/src/main/java/com/reactnativenavigation/parse/JSONParser.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.react;
+package com.reactnativenavigation.parse;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -8,7 +8,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class ArgsParser {
+public class JSONParser {
 	public static JSONObject parse(ReadableMap map) {
 		try {
 			ReadableMapKeySetIterator it = map.keySetIterator();

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutNodeParser.java

@@ -0,0 +1,39 @@
+package com.reactnativenavigation.parse;
+
+import android.support.annotation.NonNull;
+
+import com.reactnativenavigation.layout.LayoutNode;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LayoutNodeParser {
+
+	@SuppressWarnings("unchecked")
+	public static LayoutNode parse(JSONObject layoutTree) {
+		String id = layoutTree.optString("id");
+		LayoutNode.Type type = LayoutNode.Type.valueOf(layoutTree.optString("type"));
+		JSONObject data = parseData(layoutTree);
+		List<LayoutNode> children = parseChildren(layoutTree);
+		return new LayoutNode(id, type, data, children);
+	}
+
+	@NonNull
+	private static List<LayoutNode> parseChildren(JSONObject layoutTree) {
+		List<LayoutNode> children = new ArrayList<>();
+		if (layoutTree.has("children")) {
+			JSONArray rawChildren = layoutTree.optJSONArray("children");
+			for (int i = 0; i < rawChildren.length(); i++) {
+				children.add(parse(rawChildren.optJSONObject(i)));
+			}
+		}
+		return children;
+	}
+
+	private static JSONObject parseData(JSONObject layoutTree) {
+		return layoutTree.has("data") ? layoutTree.optJSONObject("data") : new JSONObject();
+	}
+}

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

@@ -1,17 +1,17 @@
 package com.reactnativenavigation.react;
 
-import android.view.View;
-
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactApplicationContext;
 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.layout.Layout;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
-import com.reactnativenavigation.layout.containers.Container;
-import com.reactnativenavigation.layout.containers.ContainerStack;
+import com.reactnativenavigation.layout.containers.LayoutStack;
+import com.reactnativenavigation.parse.JSONParser;
+import com.reactnativenavigation.parse.LayoutNodeParser;
 import com.reactnativenavigation.utils.UiThread;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
@@ -29,27 +29,27 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 	}
 
 	@ReactMethod
-	public void setRoot(final ReadableMap layoutTree) {
+	public void setRoot(final ReadableMap rawLayoutTree) {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				final LayoutNode layoutTreeRoot = LayoutNode.parse(ArgsParser.parse(layoutTree));
+				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
-				final View rootView = factory.create(layoutTreeRoot);
-				activity().setContentView(rootView);
+				final Layout rootView = factory.create(layoutTree);
+				activity().setContentView(rootView.getView());
 			}
 		});
 	}
 
 	@ReactMethod
-	public void push(final String onContainerId, final ReadableMap layoutTree) {
+	public void push(final String onContainerId, final ReadableMap rawLayoutTree) {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				final LayoutNode layoutNode = LayoutNode.parse(ArgsParser.parse(layoutTree));
+				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
-				final View rootView = factory.create(layoutNode);
-				((ContainerStack) activity().getContentView()).push((Container) rootView);
+				final Layout rootView = factory.create(layoutTree);
+				((LayoutStack) activity().getContentView()).push(rootView);
 			}
 		});
 	}
@@ -59,7 +59,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				((ContainerStack) activity().getContentView()).pop();
+				((LayoutStack) activity().getContentView()).pop();
 			}
 		});
 	}

lib/android/app/src/test/java/com/reactnativenavigation/react/ArgsParserTest.java → lib/android/app/src/test/java/com/reactnativenavigation/parse/JSONParserTest.java

@@ -1,8 +1,9 @@
-package com.reactnativenavigation.react;
+package com.reactnativenavigation.parse;
 
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.JavaOnlyMap;
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.parse.JSONParser;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -10,7 +11,7 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
-public class ArgsParserTest extends BaseTest {
+public class JSONParserTest extends BaseTest {
 	@Test
 	public void parsesMap() throws Exception {
 		JavaOnlyMap input = new JavaOnlyMap();
@@ -22,7 +23,7 @@ public class ArgsParserTest extends BaseTest {
 		input.putMap("keyMap", new JavaOnlyMap());
 		input.putNull("bla");
 
-		JSONObject result = ArgsParser.parse(input);
+		JSONObject result = JSONParser.parse(input);
 
 
 		assertThat(result.keys()).containsOnly(
@@ -52,7 +53,7 @@ public class ArgsParserTest extends BaseTest {
 		input.pushMap(new JavaOnlyMap());
 		input.pushNull();
 
-		JSONArray result = ArgsParser.parse(input);
+		JSONArray result = JSONParser.parse(input);
 		assertThat(result.length()).isEqualTo(6);
 		assertThat(result.get(0)).isEqualTo("Hello");
 		assertThat(result.get(1)).isEqualTo(123);

lib/android/app/src/test/java/com/reactnativenavigation/layout/LayoutNodeTest.java → lib/android/app/src/test/java/com/reactnativenavigation/parse/LayoutNodeParserTest.java

@@ -1,13 +1,14 @@
-package com.reactnativenavigation.layout;
+package com.reactnativenavigation.parse;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.layout.LayoutNode;
 
 import org.json.JSONObject;
 import org.junit.Test;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
-public class LayoutNodeTest extends BaseTest {
+public class LayoutNodeParserTest extends BaseTest {
 	@Test
 	public void dto() throws Exception {
 		LayoutNode node = new LayoutNode("the id", LayoutNode.Type.Container);
@@ -34,7 +35,7 @@ public class LayoutNodeTest extends BaseTest {
 				"data: {dataKey: dataValue}, " +
 				"children: [{id: childId1, type: Container}]}");
 
-		LayoutNode result = LayoutNode.parse(tree);
+		LayoutNode result = LayoutNodeParser.parse(tree);
 
 		assertThat(result).isNotNull();
 		assertThat(result.id).isEqualTo("node1");