Don't keep activities in history stack + enable resources in release mode

From now on, calling start*Application will clear the activity stack and the new activity as
the root of an empty stack. This means we don't support "Modal" or opening screens in new activity.

Enabled resources (Toolbar icons) in release mode.

android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java

@@ -58,7 +58,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
      * e.g. "index.android.bundle"
      */
     @Nullable
-    protected String getBundleAssetName() {
+    public String getBundleAssetName() {
         return "index.android.bundle";
     }
 
@@ -69,7 +69,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
      * e.g. "file://sdcard/myapp_cache/index.android.bundle"
      */
     @Nullable
-    protected String getJSBundleFile() {
+    public String getJSBundleFile() {
         return null;
     }
 
@@ -79,7 +79,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
      * This is the first file to be executed once the {@link ReactInstanceManager} is created.
      * e.g. "index.android"
      */
-    protected String getJSMainModuleName() {
+    public String getJSMainModuleName() {
         return "index.android";
     }
 
@@ -107,7 +107,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     /**
      * Returns whether dev mode should be enabled. This enables e.g. the dev menu.
      */
-    protected boolean getUseDeveloperSupport() {
+    public boolean getUseDeveloperSupport() {
         return BuildConfig.DEBUG;
     }
 
@@ -117,7 +117,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
      * If your app uses additional views or modules besides the default ones,
      * you'll want to include more packages here.
      */
-    protected List<ReactPackage> getPackages() {
+    public List<ReactPackage> getPackages() {
         return Arrays.asList(
                 new MainReactPackage(),
                 new RnnPackage()
@@ -148,7 +148,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     protected ReactInstanceManager getReactInstanceManager() {
         RctManager rctManager = RctManager.getInstance();
         if (!rctManager.isInitialized()) {
-            rctManager.init(getApplicationContext(), getMainComponentName(), getPackages());
+            rctManager.init(this);
         }
         return rctManager.getReactInstanceManager();
     }

android/app/src/main/java/com/reactnativenavigation/core/RctManager.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.core;
 
 import android.app.Application;
-import android.content.Context;
 
 import com.facebook.react.LifecycleState;
 import com.facebook.react.ReactInstanceManager;
@@ -9,10 +8,9 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.WritableMap;
+import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.objects.Screen;
 
-import java.util.List;
-
 import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
 /**
@@ -23,7 +21,6 @@ public class RctManager {
     private static RctManager sInstance;
 
     private ReactInstanceManager mReactManager;
-    private boolean mUseLocalDevServer = true;
 
     private RctManager() {
         // Singleton
@@ -44,38 +41,30 @@ public class RctManager {
         return mReactManager != null;
     }
 
-    public void init(Context context, String componentName, List<ReactPackage> packages) {
-        createReactInstanceManager(context, componentName, packages);
+    public void init(BaseReactActivity context) {
+        createReactInstanceManager(context);
     }
 
     /**
      * Creates a React Instance Manager associated with this component name
-     * @param context
-     * @param jsBundleName
-     * @param packages
      */
-    public ReactInstanceManager createReactInstanceManager(Context context, String jsBundleName, List<ReactPackage> packages) {
-        // Get component name
+    public ReactInstanceManager createReactInstanceManager(BaseReactActivity reactActivity) {
         ReactInstanceManager.Builder builder = ReactInstanceManager.builder()
-                .setApplication((Application) context.getApplicationContext())
-                .setUseDeveloperSupport(true)
+                .setApplication((Application) reactActivity.getApplicationContext())
+                .setJSMainModuleName(reactActivity.getJSMainModuleName())
+                .setUseDeveloperSupport(reactActivity.getUseDeveloperSupport())
                 .setInitialLifecycleState(LifecycleState.BEFORE_RESUME);
-        for (ReactPackage reactPackage : packages) {
+
+        for (ReactPackage reactPackage : reactActivity.getPackages()) {
             builder.addPackage(reactPackage);
         }
-        if (mUseLocalDevServer) {
-            // Set module name to be loaded from local node server
-            builder.setJSMainModuleName("index.android");
-            builder.setBundleAssetName("index.android.bundle");
+
+        String jsBundleFile = reactActivity.getJSBundleFile();
+
+        if (jsBundleFile != null) {
+            builder.setJSBundleFile(jsBundleFile);
         } else {
-            throw new RuntimeException("Implement me!");
-            //            // Get the bundle uri
-            //            String confResourceName = AssetManager.getConfUrlResourceName(jsBundleName);
-            //            Context context = AppDelegate.sharedApplication().getApplicationContext();
-            //            Uri uri =
-            //                    AssetManager.sharedAssetManager().getConfResourceUrl(confResourceName, context);
-            //            // Load bundled jsBundle
-            //            builder.setJSBundleFile(uri.getPath());
+            builder.setBundleAssetName(reactActivity.getBundleAssetName());
         }
 
         mReactManager = builder.build();

android/app/src/main/java/com/reactnativenavigation/core/objects/Button.java

@@ -24,12 +24,13 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class Button extends JsonObject implements Serializable {
     private static final long serialVersionUID = -570145217281069067L;
 
-    private static ResourceDrawableIdHelper sResDrawableIdHelper = new ResourceDrawableIdHelper();
-
+    public static final String LOCAL_RESOURCE_URI_SCHEME = "res";
     private static final String KEY_ID = "id";
     private static final String KEY_TITLE = "title";
     private static final String KEY_ICON = "icon";
 
+    private static ResourceDrawableIdHelper sResDrawableIdHelper = new ResourceDrawableIdHelper();
+
     public String id;
     public String title;
     private String mIconSource;
@@ -53,10 +54,17 @@ public class Button extends JsonObject implements Serializable {
         }
 
         try {
-            Uri icon = getIconUri(ctx);
-            URL url = new URL(icon.toString());
-            Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
-            return new BitmapDrawable(bitmap);
+            Drawable icon;
+            Uri iconUri = getIconUri(ctx);
+
+            if (LOCAL_RESOURCE_URI_SCHEME.equals(iconUri.getScheme())) {
+                icon = sResDrawableIdHelper.getResourceDrawable(ctx, mIconSource);
+            } else {
+                URL url = new URL(iconUri.toString());
+                Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
+                icon = new BitmapDrawable(bitmap);
+            }
+            return icon;
         } catch (Exception e) {
             if (BuildConfig.DEBUG) {
                 e.printStackTrace();
@@ -75,7 +83,7 @@ public class Button extends JsonObject implements Serializable {
                     ret = null;
                 }
             } catch (Exception e) {
-                // ignore malformed uri, then attempt to extract resource ID.
+                // Ignore malformed uri, then attempt to extract resource ID.
             }
             if (ret == null) {
                 ret = sResDrawableIdHelper.getResourceDrawableUri(context, mIconSource);

android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java

@@ -37,9 +37,12 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
         Activity context = ContextProvider.getActivityContext();
         if (context != null && !context.isFinishing()) {
             Intent intent = new Intent(context, TabActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+
             Bundle extras = new Bundle();
             extras.putSerializable(TabActivity.EXTRA_SCREENS, createScreens(screens));
             intent.putExtras(extras);
+            
             context.startActivity(intent);
         }
     }
@@ -57,9 +60,12 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
         BaseReactActivity context = ContextProvider.getActivityContext();
         if (context != null && !context.isFinishing()) {
             Intent intent = new Intent(context, SingleScreenActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+
             Bundle extras = new Bundle();
             extras.putSerializable(SingleScreenActivity.EXTRA_SCREEN, new Screen(screen));
             intent.putExtras(extras);
+
             context.startActivity(intent);
         }
     }

android/app/src/main/java/com/reactnativenavigation/utils/ContextProvider.java

@@ -1,7 +1,5 @@
 package com.reactnativenavigation.utils;
 
-import android.support.annotation.Nullable;
-
 import com.reactnativenavigation.activities.BaseReactActivity;
 
 import java.lang.ref.WeakReference;
@@ -18,7 +16,9 @@ public class ContextProvider {
         }
     }
 
-    @Nullable
+    /**
+     * Returns the currently resumed activity or {@code null} if there is none.
+     */
     public static BaseReactActivity getActivityContext() {
         return sActivityWR != null ? sActivityWR.get() : null;
     }