\#1605

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

@@ -1,11 +1,15 @@
 package com.reactnativenavigation;
 
 import android.app.Application;
+import android.support.annotation.Nullable;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
 import com.reactnativenavigation.react.ReactGateway;
 
+import java.util.List;
+
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
 	private ReactGateway reactGateway;
@@ -13,7 +17,7 @@ public abstract class NavigationApplication extends Application implements React
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		reactGateway = new ReactGateway(this, isDebug());
+		reactGateway = new ReactGateway(this, isDebug(), createAdditionalReactPackages());
 	}
 
 	public ReactGateway getReactGateway() {
@@ -26,4 +30,7 @@ public abstract class NavigationApplication extends Application implements React
 	}
 
 	public abstract boolean isDebug();
+
+	@Nullable
+	public abstract List<ReactPackage> createAdditionalReactPackages();
 }

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

@@ -10,6 +10,7 @@ import android.view.KeyEvent;
 import com.facebook.react.ReactInstanceManager;
 
 public class JsDevReloadHandler {
+	private static final String RELOAD_BROADCAST = "com.reactnativenavigation.broadcast.RELOAD";
 	private final BroadcastReceiver reloadReceiver = new BroadcastReceiver() {
 		@Override
 		public void onReceive(final Context context, final Intent intent) {
@@ -24,7 +25,7 @@ public class JsDevReloadHandler {
 	}
 
 	public void onActivityResumed(Activity activity) {
-		activity.registerReceiver(reloadReceiver, new IntentFilter("com.reactnativenavigation.broadcast.RELOAD"));
+		activity.registerReceiver(reloadReceiver, new IntentFilter(RELOAD_BROADCAST));
 	}
 
 	public void onActivityPaused(Activity activity) {

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

@@ -6,16 +6,18 @@ import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
 public class NavigationReactNativeHost extends ReactNativeHost {
 
 	private final boolean isDebug;
+	private final List<ReactPackage> additionalReactPackages;
 
-	public NavigationReactNativeHost(Application application, boolean isDebug) {
+	public NavigationReactNativeHost(Application application, boolean isDebug, final List<ReactPackage> additionalReactPackages) {
 		super(application);
 		this.isDebug = isDebug;
+		this.additionalReactPackages = additionalReactPackages;
 	}
 
 	@Override
@@ -25,9 +27,16 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 
 	@Override
 	protected List<ReactPackage> getPackages() {
-		return Arrays.<ReactPackage>asList(
-				new MainReactPackage(),
-				new NavigationPackage(this)
-		);
+		List<ReactPackage> packages = new ArrayList<>();
+		packages.add(new MainReactPackage());
+		packages.add(new NavigationPackage(this));
+		if (additionalReactPackages != null) {
+			for (ReactPackage p : additionalReactPackages) {
+				if (!(p instanceof MainReactPackage || p instanceof NavigationPackage)) {
+					packages.add(p);
+				}
+			}
+		}
+		return packages;
 	}
 }

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

@@ -1,21 +1,27 @@
 package com.reactnativenavigation.react;
 
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.soloader.SoLoader;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.NavigationApplication;
 
+import java.util.List;
+
 public class ReactGateway {
 
 	private final NavigationReactNativeHost reactNativeHost;
 	private final NavigationReactInitializer initializer;
 	private final JsDevReloadHandler jsDevReloadHandler;
 
-	public ReactGateway(final NavigationApplication application, final boolean isDebug) {
-		reactNativeHost = new NavigationReactNativeHost(application, isDebug);
+	public ReactGateway(final NavigationApplication application, final boolean isDebug, final List<ReactPackage> additionalReactPackages) {
+		SoLoader.init(application, false);
+		reactNativeHost = new NavigationReactNativeHost(application, isDebug, additionalReactPackages);
 		initializer = new NavigationReactInitializer(reactNativeHost.getReactInstanceManager(), isDebug);
 		jsDevReloadHandler = new JsDevReloadHandler(reactNativeHost.getReactInstanceManager());
 	}
 
-	public NavigationReactNativeHost getReactNativeHost() {
+	public ReactNativeHost getReactNativeHost() {
 		return reactNativeHost;
 	}
 

lib/android/app/src/test/java/com/reactnativenavigation/react/NavigationReactNativeHostTest.java

@@ -0,0 +1,42 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+import com.reactnativenavigation.BaseTest;
+
+import org.junit.Test;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class NavigationReactNativeHostTest extends BaseTest {
+
+	@Test
+	public void getPackagesDefaults() throws Exception {
+		NavigationReactNativeHost uut = new NavigationReactNativeHost(RuntimeEnvironment.application, false, null);
+		assertThat(uut.getPackages()).hasSize(2).extracting("class").containsOnly(MainReactPackage.class, NavigationPackage.class);
+	}
+
+	@Test
+	public void getPackagesAddsAdditionalPackages() throws Exception {
+		ReactPackage myPackage = mock(ReactPackage.class);
+		NavigationReactNativeHost uut = new NavigationReactNativeHost(RuntimeEnvironment.application, false, Collections.singletonList(myPackage));
+		assertThat(uut.getPackages()).hasSize(3).containsOnlyOnce(myPackage);
+	}
+
+	@Test
+	public void getPackages_DoesNotAddDefaultTwice() throws Exception {
+		NavigationReactNativeHost uut = new NavigationReactNativeHost(
+				RuntimeEnvironment.application,
+				false,
+				Arrays.<ReactPackage>asList(
+						new MainReactPackage(),
+						new MainReactPackage(),
+						new MainReactPackage()));
+		assertThat(uut.getPackages()).hasSize(2).extracting("class").containsOnly(MainReactPackage.class, NavigationPackage.class);
+	}
+}

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

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