refactor android

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

@@ -83,11 +83,11 @@ public class LayoutFactory {
 		NavigationOptions navigationOptions = NavigationOptions.parse(node.data.optJSONObject("navigationOptions"));
 		ContainerViewController.ContainerViewCreator viewCreator = new ContainerViewController.ContainerViewCreator() {
 			@Override
-			public ContainerViewController.ContainerView create(final Activity activity, final String containerName, final String containerId) {
-				return new ReactContainerView(activity, reactInstanceManager, containerName, containerId);
+			public ContainerViewController.ContainerView create(final Activity activity, final String containerId, final String containerName) {
+				return new ReactContainerView(activity, reactInstanceManager, containerId, containerName);
 			}
 		};
-		return new ContainerViewController(activity, id, name, viewCreator);
+		return new ContainerViewController(activity, id, name, viewCreator, navigationOptions);
 	}
 
 	private ViewController createContainerStack(LayoutNode node) {

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

@@ -15,11 +15,11 @@ public class ReactContainerView extends ReactRootView implements ContainerViewCo
 	private final String containerName;
 	private boolean attachedToReactInstance = false;
 
-	public ReactContainerView(final Context context, ReactInstanceManager reactInstanceManager, String containerName, String containerId) {
+	public ReactContainerView(final Context context, ReactInstanceManager reactInstanceManager, String containerId, String containerName) {
 		super(context);
 		this.reactInstanceManager = reactInstanceManager;
-		this.containerName = containerName;
 		this.containerId = containerId;
+		this.containerName = containerName;
 		start();
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java

@@ -4,10 +4,12 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.view.View;
 
+import com.reactnativenavigation.parse.NavigationOptions;
+
 public class ContainerViewController extends ViewController {
 
 	public interface ContainerViewCreator {
-		ContainerView create(Activity activity, String containerName, String containerId);
+		ContainerView create(Activity activity, String containerId, String containerName);
 	}
 
 	public interface ContainerView {
@@ -24,15 +26,19 @@ public class ContainerViewController extends ViewController {
 
 	private final String containerName;
 	private final ContainerViewCreator viewCreator;
+	private final NavigationOptions initialNavigationOptions;
+
 	private ContainerView containerView;
 
 	public ContainerViewController(final Activity activity,
 	                               final String id,
 	                               final String containerName,
-	                               final ContainerViewCreator viewCreator) {
+	                               final ContainerViewCreator viewCreator,
+	                               final NavigationOptions initialNavigationOptions) {
 		super(activity, id);
 		this.containerName = containerName;
 		this.viewCreator = viewCreator;
+		this.initialNavigationOptions = initialNavigationOptions;
 	}
 
 	@Override
@@ -62,7 +68,7 @@ public class ContainerViewController extends ViewController {
 	@NonNull
 	@Override
 	protected View createView() {
-		containerView = viewCreator.create(getActivity(), containerName, getId());
+		containerView = viewCreator.create(getActivity(), getId(), containerName);
 		return containerView.asView();
 	}
 }