fixed containers

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

@@ -60,7 +60,7 @@ public class ActivityLifecycleDelegate {
 
 	private void emitAppLaunchedOnceIfNeeded() {
 		if (appLaunchEmitted.compareAndSet(false, true)) {
-			NavigationEventEmitter.emit(reactInstanceManager.getCurrentReactContext()).appLaunched();
+			new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).appLaunched();
 		}
 	}
 

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

@@ -1,34 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import java.util.Stack;
-
-public class ContainerStackLayout extends FrameLayout implements StackLayout {
-
-	private Stack<View> backStack = new Stack<>();
-
-	public ContainerStackLayout(Context context) {
-		super(context);
-	}
-
-	@Override
-	public void push(View view) {
-		addView(view);
-		backStack.push(getChildAt(0));
-		removeView(getChildAt(0));
-	}
-
-	@Override
-	public void pop() {
-		addView(backStack.pop());
-		removeView(getChildAt(0));
-	}
-
-	@Override
-	public View asView() {
-		return this;
-	}
-}

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

@@ -1,7 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import android.view.View;
-
-public interface Layout {
-	public View asView();
-}

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

@@ -7,12 +7,13 @@ import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 
 import com.facebook.react.ReactNativeHost;
-import com.reactnativenavigation.layout.bottomtabs.BottomTabs;
-import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
+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.SideMenuLayout;
 import com.reactnativenavigation.utils.CompatUtils;
 
-import java.util.List;
-
 public class LayoutFactory {
 
 	private final Activity activity;
@@ -26,9 +27,9 @@ public class LayoutFactory {
 	public View create(LayoutNode node) {
 		switch (node.type) {
 			case Container:
-				return createContainerView(node);
+				return createContainer(node);
 			case ContainerStack:
-				return createContainerStackView(node);
+				return createContainerStack(node);
 			case BottomTabs:
 				return createBottomTabs(node);
 			case SideMenuRoot:
@@ -74,7 +75,7 @@ public class LayoutFactory {
 		return view;
 	}
 
-	private View createContainerView(LayoutNode node) {
+	private View createContainer(LayoutNode node) {
 		final String name = node.data.optString("name");
 		Container container = new Container(activity, reactNativeHost, node.id, name);
 		container.setId(CompatUtils.generateViewId());
@@ -82,10 +83,12 @@ public class LayoutFactory {
 
 	}
 
-	private View createContainerStackView(LayoutNode node) {
-		final ContainerStackLayout containerStack = new ContainerStackLayout(activity);
+	private View createContainerStack(LayoutNode node) {
+		final ContainerStack containerStack = new ContainerStack(activity);
 		containerStack.setId(CompatUtils.generateViewId());
-		addChildrenNodes(containerStack, node.children);
+		for (LayoutNode child : node.children) {
+			containerStack.addView(create(child));
+		}
 		return containerStack;
 	}
 
@@ -98,9 +101,4 @@ public class LayoutFactory {
 		return tabsContainer;
 	}
 
-	private void addChildrenNodes(ContainerStackLayout containerStack, List<LayoutNode> children) {
-		for (LayoutNode child : children) {
-			containerStack.addView(create(child));
-		}
-	}
 }

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

@@ -16,17 +16,13 @@ public class LayoutNode {
 		SideMenuRoot,
 		SideMenuCenter,
 		SideMenuLeft,
-		SideMenuRight;
-
-		public static Type fromString(String str) {
-			return valueOf(str);
-		}
+		SideMenuRight
 	}
 
 	@SuppressWarnings("unchecked")
 	public static LayoutNode parse(JSONObject layoutTree) {
 		String id = layoutTree.optString("id");
-		LayoutNode.Type type = LayoutNode.Type.fromString(layoutTree.optString("type"));
+		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);

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

@@ -1,36 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import android.content.Context;
-import android.support.v4.widget.DrawerLayout;
-import android.view.View;
-
-public class SideMenuLayout extends DrawerLayout implements StackLayout {
-	private StackLayout stackLayout;
-
-	public SideMenuLayout(Context context) {
-		super(context);
-	}
-
-	@Override
-	public void addView(View child) {
-		super.addView(child);
-		if (child instanceof StackLayout) {
-			stackLayout = (StackLayout) child;
-		}
-	}
-
-	@Override
-	public void push(View view) {
-		stackLayout.push(view);
-	}
-
-	@Override
-	public void pop() {
-		stackLayout.pop();
-	}
-
-	@Override
-	public View asView() {
-		return this;
-	}
-}

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

@@ -2,8 +2,8 @@ package com.reactnativenavigation.layout;
 
 import android.view.View;
 
-public interface StackLayout extends Layout {
-	public void push(View view);
+public interface StackLayout {
+	void push(View view);
 
-	public void pop();
+	void pop();
 }

lib/android/app/src/main/java/com/reactnativenavigation/layout/bottomtabs/TooManyTabsException.java

@@ -1,4 +0,0 @@
-package com.reactnativenavigation.layout.bottomtabs;
-
-public class TooManyTabsException extends RuntimeException {
-}

lib/android/app/src/main/java/com/reactnativenavigation/layout/bottomtabs/BottomTabs.java → lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/BottomTabs.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.layout.bottomtabs;
+package com.reactnativenavigation.layout.containers;
 
 import android.graphics.Color;
 import android.support.annotation.NonNull;
@@ -8,7 +8,8 @@ import android.view.MenuItem;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 
-import static android.view.View.generateViewId;
+import com.reactnativenavigation.utils.CompatUtils;
+
 import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 
 public class BottomTabs implements BottomNavigationView.OnNavigationItemSelectedListener {
@@ -50,7 +51,7 @@ public class BottomTabs implements BottomNavigationView.OnNavigationItemSelected
 
 	private void createBottomNavigation(RelativeLayout parentLayout) {
 		bottomNavigationView = new BottomNavigationView(parentLayout.getContext());
-		bottomNavigationView.setId(generateViewId());
+		bottomNavigationView.setId(CompatUtils.generateViewId());
 		bottomNavigationView.setBackgroundColor(Color.DKGRAY);
 		bottomNavigationView.setOnNavigationItemSelectedListener(this);
 	}

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

@@ -1,17 +1,19 @@
-package com.reactnativenavigation.layout.bottomtabs;
+package com.reactnativenavigation.layout.containers;
 
 import android.app.Activity;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import com.reactnativenavigation.layout.StackLayout;
-
 import java.util.ArrayList;
 import java.util.List;
 
-public class BottomTabsLayout extends RelativeLayout implements BottomTabs.BottomTabsSelectionListener, StackLayout {
+public class BottomTabsLayout extends RelativeLayout implements BottomTabs.BottomTabsSelectionListener {
+
+	public static class TooManyTabs extends RuntimeException {
+	}
+
 
-	private List<StackLayout> tabsContent;
+	private List<View> tabsContent;
 	private BottomTabs bottomTabs;
 	private int currentTab;
 
@@ -21,12 +23,12 @@ public class BottomTabsLayout extends RelativeLayout implements BottomTabs.Botto
 	}
 
 	public void addTabContent(String label, View tabContent) {
-		if (tabsContent.size() == 5) {
-			throw new TooManyTabsException();
+		if (tabsContent.size() >= 5) {
+			throw new TooManyTabs();
 		}
 		bottomTabs.add(label);
 		attachTabContent(tabContent);
-		tabsContent.add((StackLayout) tabContent);
+		tabsContent.add(tabContent);
 
 		if (tabsContent.size() > 1) {
 			tabContent.setVisibility(View.GONE);
@@ -55,25 +57,10 @@ public class BottomTabsLayout extends RelativeLayout implements BottomTabs.Botto
 	}
 
 	private void showTab(int tabId) {
-		tabsContent.get(tabId).asView().setVisibility(View.VISIBLE);
+		tabsContent.get(tabId).setVisibility(View.VISIBLE);
 	}
 
 	private void hideTab(int tabId) {
-		tabsContent.get(tabId).asView().setVisibility(View.GONE);
-	}
-
-	@Override
-	public void push(View view) {
-		tabsContent.get(currentTab).push(view);
-	}
-
-	@Override
-	public void pop() {
-		tabsContent.get(currentTab).pop();
-	}
-
-	@Override
-	public View asView() {
-		return this;
+		tabsContent.get(tabId).setVisibility(View.GONE);
 	}
 }

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

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.layout;
+package com.reactnativenavigation.layout.containers;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -7,6 +7,7 @@ import android.widget.FrameLayout;
 
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactRootView;
+import com.facebook.react.bridge.ReactContext;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 
@@ -42,7 +43,7 @@ public class Container extends FrameLayout {
 	protected void onDetachedFromWindow() {
 		super.onDetachedFromWindow();
 		//TODO this is wrong
-		NavigationEventEmitter.emit(((NavigationApplication) getContext().getApplicationContext()).getReactNativeHost().getReactInstanceManager().getCurrentReactContext())
-				.containerStop(id);
+		ReactContext reactContext = ((NavigationApplication) getContext().getApplicationContext()).getReactNativeHost().getReactInstanceManager().getCurrentReactContext();
+		new NavigationEventEmitter(reactContext).containerStart(id);
 	}
 }

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

@@ -0,0 +1,31 @@
+package com.reactnativenavigation.layout.containers;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.layout.StackLayout;
+
+import java.util.Stack;
+
+public class ContainerStack extends FrameLayout implements StackLayout {
+
+	private Stack<View> stack = new Stack<>();
+
+	public ContainerStack(Context context) {
+		super(context);
+	}
+
+	@Override
+	public void push(View view) {
+		addView(view);
+		stack.push(getChildAt(0));
+		removeView(getChildAt(0));
+	}
+
+	@Override
+	public void pop() {
+		addView(stack.pop());
+		removeView(getChildAt(0));
+	}
+}

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

@@ -0,0 +1,12 @@
+package com.reactnativenavigation.layout.containers;
+
+import android.content.Context;
+import android.support.v4.widget.DrawerLayout;
+
+public class SideMenuLayout extends DrawerLayout {
+
+	public SideMenuLayout(Context context) {
+		super(context);
+	}
+
+}

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

@@ -11,13 +11,9 @@ public class NavigationEventEmitter {
 	private static final String containerStart = "RNN.containerStart";
 	private static final String containerStop = "RNN.containerStop";
 
-	public static NavigationEventEmitter emit(ReactContext context) {
-		return new NavigationEventEmitter(context);
-	}
-
 	private final RCTDeviceEventEmitter emitter;
 
-	private NavigationEventEmitter(ReactContext reactContext) {
+	public NavigationEventEmitter(ReactContext reactContext) {
 		this.emitter = reactContext.getJSModule(RCTDeviceEventEmitter.class);
 	}
 
@@ -25,18 +21,6 @@ public class NavigationEventEmitter {
 		emit(onAppLaunched);
 	}
 
-	private void emit(String eventName) {
-		emit(eventName, Arguments.createMap());
-	}
-
-	private void emit(String eventName, WritableMap data) {
-		emitter.emit(eventName, data);
-	}
-
-	private void emit(String eventName, String param) {
-		emitter.emit(eventName, param);
-	}
-
 	public void containerStop(String id) {
 		WritableMap data = Arguments.createMap();
 		data.putString("id", id);
@@ -50,4 +34,16 @@ public class NavigationEventEmitter {
 //        emit(containerStart, data);
 		emit(containerStart, id);
 	}
+
+	private void emit(String eventName) {
+		emit(eventName, Arguments.createMap());
+	}
+
+	private void emit(String eventName, WritableMap data) {
+		emitter.emit(eventName, data);
+	}
+
+	private void emit(String eventName, String param) {
+		emitter.emit(eventName, param);
+	}
 }

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.layout;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.layout.LayoutNode;
 
 import org.json.JSONObject;
 import org.junit.Test;
@@ -20,12 +19,12 @@ public class LayoutNodeTest extends BaseTest {
 
 	@Test
 	public void parseType() throws Exception {
-		assertThat(LayoutNode.Type.fromString("Container")).isEqualTo(LayoutNode.Type.Container);
+		assertThat(LayoutNode.Type.valueOf("Container")).isEqualTo(LayoutNode.Type.Container);
 	}
 
 	@Test(expected = RuntimeException.class)
 	public void invalidType() throws Exception {
-		LayoutNode.Type.fromString("unknown");
+		LayoutNode.Type.valueOf("some type");
 	}
 
 	@Test