removing layout interface so that we can better control individual containers

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

@@ -1,9 +1,7 @@
-package com.reactnativenavigation.controllers;
+package com.reactnativenavigation;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.react.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 
@@ -61,7 +59,7 @@ public class ActivityLifecycleDelegate {
 
 	private void emitAppLaunchedOnceIfNeeded() {
 		if (appLaunchEmitted.compareAndSet(false, true)) {
-			new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)).appLaunched();
+			new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).appLaunched();
 		}
 	}
 

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

@@ -6,7 +6,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.reactnativenavigation.layout.StackLayout;
+import com.reactnativenavigation.layout.containers.ContainerStack;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
 	private View contentView;
@@ -53,7 +53,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void onBackPressed() {
-		if (!(contentView instanceof StackLayout) || !((StackLayout) contentView).onBackPressed()) {
+		if (!(contentView instanceof ContainerStack) || !((ContainerStack) contentView).onBackPressed()) {
 			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.ActivityLifecycleDelegate;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {

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

@@ -1,11 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import com.reactnativenavigation.layout.containers.Container;
-
-public interface StackLayout {
-	void push(Container view);
-
-	void pop();
-
-	boolean onBackPressed();
-}

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

@@ -7,7 +7,6 @@ import android.widget.FrameLayout;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 
 public class Container extends FrameLayout {
@@ -54,11 +53,11 @@ public class Container extends FrameLayout {
 	}
 
 	private void onStart() {
-		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)).containerStart(id);
+		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).containerStart(id);
 	}
 
 	private void onStop() {
-		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)).containerStop(id);
+		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).containerStop(id);
 	}
 
 }

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

@@ -3,11 +3,9 @@ package com.reactnativenavigation.layout.containers;
 import android.content.Context;
 import android.widget.FrameLayout;
 
-import com.reactnativenavigation.layout.StackLayout;
-
 import java.util.Stack;
 
-public class ContainerStack extends FrameLayout implements StackLayout {
+public class ContainerStack extends FrameLayout {
 
 	private Stack<Container> stack = new Stack<>();
 
@@ -15,8 +13,6 @@ public class ContainerStack extends FrameLayout implements StackLayout {
 		super(context);
 	}
 
-
-	@Override
 	public void push(Container view) {
 		stack.push(view);
 		addView(view);
@@ -26,7 +22,6 @@ public class ContainerStack extends FrameLayout implements StackLayout {
 		}
 	}
 
-	@Override
 	public void pop() {
 		Container top = stack.pop();
 		removeView(top);
@@ -37,7 +32,6 @@ public class ContainerStack extends FrameLayout implements StackLayout {
 		}
 	}
 
-	@Override
 	public boolean onBackPressed() {
 		if (stack.isEmpty()) {
 			return false;

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

@@ -1,7 +1,9 @@
 package com.reactnativenavigation.react;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
@@ -12,8 +14,8 @@ public class NavigationEventEmitter {
 
 	private final RCTDeviceEventEmitter emitter;
 
-	public NavigationEventEmitter(final RCTDeviceEventEmitter emitter) {
-		this.emitter = emitter;
+	public NavigationEventEmitter(ReactContext reactContext) {
+		this.emitter = reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
 	}
 
 	public void appLaunched() {

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

@@ -10,8 +10,8 @@ import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
-import com.reactnativenavigation.layout.StackLayout;
 import com.reactnativenavigation.layout.containers.Container;
+import com.reactnativenavigation.layout.containers.ContainerStack;
 import com.reactnativenavigation.utils.UiThread;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
@@ -49,7 +49,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 				final LayoutNode layoutNode = LayoutNode.parse(ArgsParser.parse(layoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
 				final View rootView = factory.create(layoutNode);
-				((StackLayout) activity().getContentView()).push((Container) rootView);
+				((ContainerStack) activity().getContentView()).push((Container) rootView);
 			}
 		});
 	}
@@ -59,7 +59,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				((StackLayout) activity().getContentView()).pop();
+				((ContainerStack) activity().getContentView()).pop();
 			}
 		});
 	}