Expose ReactNativeHost creation in NavigationApplication

This commit also consolidates index files in the playground app

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

@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
+import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
 
@@ -36,7 +37,11 @@ public abstract class NavigationApplication extends Application implements React
      * @return a singleton {@link ReactGateway}
      */
 	protected ReactGateway createReactGateway() {
-	    return new ReactGateway(this, isDebug(), createAdditionalReactPackages());
+	    return new ReactGateway(this, isDebug(), createReactNativeHost());
+    }
+
+    protected ReactNativeHost createReactNativeHost() {
+        return new NavigationReactNativeHost(this);
     }
 
 	public ReactGateway getReactGateway() {

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

@@ -5,6 +5,7 @@ import android.app.Application;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
+import com.reactnativenavigation.NavigationApplication;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +19,10 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 	private final boolean isDebug;
 	private final List<ReactPackage> additionalReactPackages;
 
+    public NavigationReactNativeHost(NavigationApplication application) {
+        this(application, application.isDebug(), application.createAdditionalReactPackages());
+    }
+
 	public NavigationReactNativeHost(Application application, boolean isDebug, final List<ReactPackage> additionalReactPackages) {
 		super(application);
 		this.isDebug = isDebug;
@@ -29,10 +34,8 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 		return isDebug;
 	}
 
-	@Override
+    @Override
 	protected List<ReactPackage> getPackages() {
-		// Please note that users may provide their own implementations of ReactNativeHost. Any additional
-		// package requirements should be documented in the changelog.
 		List<ReactPackage> packages = new ArrayList<>();
 		packages.add(new MainReactPackage());
 		packages.add(new NavigationPackage(this));

playground/android/app/src/main/java/com/reactnativenavigation/playground/MainApplication.java

@@ -2,8 +2,10 @@ package com.reactnativenavigation.playground;
 
 import android.support.annotation.Nullable;
 
+import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 import java.util.List;
 
@@ -15,6 +17,16 @@ public class MainApplication extends NavigationApplication {
         registerExternalComponent("RNNCustomComponent", new FragmentCreator());
     }
 
+    @Override
+    protected ReactNativeHost createReactNativeHost() {
+        return new NavigationReactNativeHost(this) {
+            @Override
+            protected String getJSMainModuleName() {
+                return "index";
+            }
+        };
+    }
+
     @Override
     public boolean isDebug() {
         return BuildConfig.DEBUG;

playground/index.ios.js

@@ -1 +0,0 @@
-require('./src/index');

playground/ios/playground/AppDelegate.m

@@ -1,45 +1,21 @@
-#import "AppDelegate.h"
-#import "RNNCustomViewController.h"
-
-// **********************************************
-// *** DON'T MISS: THE NEXT LINE IS IMPORTANT ***
-// **********************************************
 #import <React/RCTBundleURLProvider.h>
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
-
-// IMPORTANT: if you're getting an Xcode error that RCCManager.h isn't found, you've probably ran "npm install"
-// with npm ver 2. You'll need to "npm install" with npm 3 (see https://github.com/wix/react-native-navigation/issues/1)
-
 #import <React/RCTRootView.h>
 
+#import "AppDelegate.h"
+#import "RNNCustomViewController.h"
+
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-	// **********************************************
-	// *** DON'T MISS: THIS IS HOW WE BOOTSTRAP *****
-	// **********************************************
-	NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
+	NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
 	[ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:launchOptions];
 	
 	[ReactNativeNavigation registerExternalComponent:@"RNNCustomComponent" callback:^UIViewController *(NSDictionary *props, RCTBridge *bridge) {
 		return [[RNNCustomViewController alloc] initWithProps:props];
 	}];
 	
-	/*
-	// original RN bootstrap - remove this part
-	RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
-														moduleName:@"com.example.WelcomeScreen"
-												 initialProperties:nil
-													 launchOptions:launchOptions];
-	self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-	UIViewController *rootViewController = [UIViewController new];
-	rootViewController.view = rootView;
-	self.window.rootViewController = rootViewController;
-	[self.window makeKeyAndVisible];
-	*/
-	
-	
 	return YES;
 }