implemented changes

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

@@ -4,19 +4,22 @@ import android.app.Application;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.react.NavigationReactGateway;
 import com.reactnativenavigation.react.ReactGateway;
+import com.reactnativenavigation.react.ReactGatewayHost;
 
 import java.util.List;
 
-public abstract class NavigationApplication extends Application {
+public abstract class NavigationApplication extends Application implements ReactApplication {
 
     public static NavigationApplication instance;
 
-    private ReactGateway reactGateway;
+    private ReactGatewayHost reactGateway;
     private Handler handler;
 
     @Override
@@ -51,12 +54,9 @@ public abstract class NavigationApplication extends Application {
         // nothing
     }
 
-    public String getJsEntryFileName() {
-        return "index.android";
-    }
-
-    public String getBundleAssetName() {
-        return "index.android.bundle";
+    @Override
+    public ReactNativeHost getReactNativeHost() {
+        return reactGateway;
     }
 
     public abstract boolean isDebug();

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java

@@ -3,7 +3,6 @@ package com.reactnativenavigation.react;
 import android.app.Activity;
 import android.content.Intent;
 
-import com.facebook.react.LifecycleState;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
@@ -16,13 +15,14 @@ import com.reactnativenavigation.bridge.NavigationReactPackage;
 import java.util.ArrayList;
 import java.util.List;
 
-public class NavigationReactGateway implements ReactGateway, ReactInstanceManager.ReactInstanceEventListener {
+public class NavigationReactGateway extends ReactGatewayHost implements ReactInstanceManager.ReactInstanceEventListener {
 
     private OnJsDevReloadListener onJsDevReloadListener;
     private ReactInstanceManager reactInstanceManager;
     private NavigationReactEventEmitter reactEventEmitter;
 
     public NavigationReactGateway() {
+        super(NavigationApplication.instance);
         reactInstanceManager = createReactInstanceManager();
     }
 
@@ -88,29 +88,26 @@ public class NavigationReactGateway implements ReactGateway, ReactInstanceManage
         }).replace();
     }
 
-    private ReactInstanceManager createReactInstanceManager() {
-        ReactInstanceManager.Builder builder = ReactInstanceManager.builder()
-                .setApplication(NavigationApplication.instance)
-                .setJSMainModuleName(NavigationApplication.instance.getJsEntryFileName())
-                .setBundleAssetName(NavigationApplication.instance.getBundleAssetName())
-                .setUseDeveloperSupport(NavigationApplication.instance.isDebug())
-                .setInitialLifecycleState(LifecycleState.BEFORE_RESUME);
-
-        for (ReactPackage reactPackage : createReactPackages()) {
-            builder.addPackage(reactPackage);
-        }
-
-        ReactInstanceManager manager = builder.build();
-
+    @Override
+    protected ReactInstanceManager createReactInstanceManager() {
+        ReactInstanceManager manager = super.createReactInstanceManager();
         if (NavigationApplication.instance.isDebug()) {
             replaceJsDevReloadListener(manager);
         }
-
         manager.addReactInstanceEventListener(this);
-
         return manager;
     }
 
+    @Override
+    protected boolean getUseDeveloperSupport() {
+        return NavigationApplication.instance.isDebug();
+    }
+
+    @Override
+    protected List<ReactPackage> getPackages() {
+        return createReactPackages();
+    }
+
     private List<ReactPackage> createReactPackages() {
         List<ReactPackage> list = new ArrayList<>();
         list.add(new MainReactPackage());

android/app/src/main/java/com/reactnativenavigation/react/ReactGatewayHost.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.react;
+
+import android.app.Application;
+
+import com.facebook.react.ReactNativeHost;
+
+public abstract class ReactGatewayHost extends ReactNativeHost implements ReactGateway {
+    protected ReactGatewayHost(Application application) {
+        super(application);
+    }
+}

example-redux/android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".App"
+        android:name=".MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

example-redux/android/app/src/main/java/com/exampleredux/App.java → example-redux/android/app/src/main/java/com/exampleredux/MainApplication.java

@@ -1,22 +1,23 @@
 package com.exampleredux;
 
-import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.facebook.react.ReactPackage;
 import com.reactnativenavigation.NavigationApplication;
 
-import java.util.Collections;
 import java.util.List;
 
-public class App extends NavigationApplication {
+public class MainApplication extends NavigationApplication {
+
+
     @Override
     public boolean isDebug() {
         return BuildConfig.DEBUG;
     }
 
-    @NonNull
+    @Nullable
     @Override
     public List<ReactPackage> createAdditionalReactPackages() {
-        return Collections.emptyList();
+        return null;
     }
 }