[android] Always reload from manifest expo/expo#6134 honoring bare-expo and :tools:execute

Squashed three commits:
- d8f3fbe
- ae5e396
- 2217620

The first one introduced breaking changes for bare workflow in our React Native fork,
the second one fixed them by integrating with ReactAndroidCodeTransformer used when we
import the code into Expo Client, the third one added usage for `reloadExpoApp`
to debugger UI.

Co-Authored-By: brentvatne <[email protected]>
Co-Authored-By: esamelson <[email protected]>
Co-Authored-By: Kudo Chien <[email protected]>

Author: 4 people

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java

@@ -148,7 +148,7 @@ public boolean shouldShowDevMenuOrReload(int keyCode, KeyEvent event) {
           Assertions.assertNotNull(mDoubleTapReloadRecognizer)
               .didDoubleTapR(keyCode, mActivity.getCurrentFocus());
       if (didDoubleTapR) {
-        getReactNativeHost().getReactInstanceManager().getDevSupportManager().handleReloadJS();
+        getReactNativeHost().getReactInstanceManager().getDevSupportManager().reloadExpoApp();
         return true;
       }
     }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

@@ -107,7 +107,7 @@ public BridgeDevSupportManager(
       }
     }
 
-    addCustomDevOption(
+    expo_transformer_remove: addCustomDevOption(
         mIsSamplingProfilerEnabled ? "Disable Sampling Profiler" : "Enable Sampling Profiler",
         new DevOptionHandler() {
           @Override

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

@@ -84,8 +84,8 @@ public interface CallbackWithBundleLoader {
   private static final String EXOPACKAGE_LOCATION_FORMAT =
       "/data/local/tmp/exopackage/%s//secondary-dex";
 
-  public static final String EMOJI_HUNDRED_POINTS_SYMBOL = " \uD83D\uDCAF";
-  public static final String EMOJI_FACE_WITH_NO_GOOD_GESTURE = " \uD83D\uDE45";
+  public static String EMOJI_HUNDRED_POINTS_SYMBOL = " 💯";
+  public static String EMOJI_FACE_WITH_NO_GOOD_GESTURE = " 🙅";
 
   private final Context mApplicationContext;
   private final ShakeDetector mShakeDetector;
@@ -375,6 +375,25 @@ public void run() {
         });
   }
 
+  private int getExponentActivityId() {
+    return -1;
+  }
+
+  @Override
+  public void reloadExpoApp() {
+    try {
+      Class.forName("host.exp.exponent.ReactNativeStaticHelpers").getMethod("reloadFromManifest", int.class).invoke(null, getExponentActivityId());
+    } catch (Exception expoHandleErrorException) {
+      expoHandleErrorException.printStackTrace();
+
+      // reloadExpoApp replaces handleReloadJS in some places
+      // where in Expo we would like to reload from manifest.
+      // If so, if anything goes wrong here, we can fall back
+      // to plain JS reload.
+      handleReloadJS();
+    }
+  }
+
   @Override
   public void showDevOptionsDialog() {
     if (mDevOptionsDialog != null || !mIsDevSupportEnabled || ActivityManager.isUserAMonkey()) {
@@ -396,7 +415,10 @@ public void onOptionSelected() {
                   .show();
               mDevSettings.setHotModuleReplacementEnabled(false);
             }
-            handleReloadJS();
+            
+            // NOTE(brentvatne): rather than reload just JS we need to reload the entire project from manifest
+            // handleReloadJS();
+            reloadExpoApp();
           }
         });
 
@@ -434,7 +456,8 @@ public void onOptionSelected() {
           });
     }
 
-    options.put(
+    // NOTE(brentvatne): This option does not make sense for Expo
+    expo_transformer_remove: options.put(
         mApplicationContext.getString(R.string.reactandroid_catalyst_change_bundle_location),
         new DevOptionHandler() {
           @Override
@@ -498,7 +521,7 @@ public void onOptionSelected() {
                 mCurrentContext.getJSModule(HMRClient.class).disable();
               }
             }
-            if (nextEnabled && !mDevSettings.isJSDevModeEnabled()) {
+            expo_transformer_remove: if (nextEnabled && !mDevSettings.isJSDevModeEnabled()) {
               Toast.makeText(
                       mApplicationContext,
                       mApplicationContext.getString(R.string.reactandroid_catalyst_hot_reloading_auto_enable),
@@ -529,7 +552,7 @@ public void onOptionSelected() {
             mDevSettings.setFpsDebugEnabled(!mDevSettings.isFpsDebugEnabled());
           }
         });
-    options.put(
+    expo_transformer_remove: options.put(
         mApplicationContext.getString(R.string.reactandroid_catalyst_settings),
         new DevOptionHandler() {
           @Override
@@ -1121,6 +1144,7 @@ public void run() {
         });
   }
 
+  // NOTE(brentvatne): this is confusingly called the first time the app loads!
   private void reload() {
     UiThreadUtil.assertOnUiThread();
 
@@ -1172,7 +1196,9 @@ public void onPackagerReloadCommand() {
                   new Runnable() {
                     @Override
                     public void run() {
-                      handleReloadJS();
+                      // NOTE(brentvatne): rather than reload just JS we need to reload the entire project from manifest
+                      // handleReloadJS();
+                      reloadExpoApp();
                     }
                   });
             }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java

@@ -138,6 +138,9 @@ public void reloadSettings() {}
   @Override
   public void handleReloadJS() {}
 
+  @Override
+  public void reloadExpoApp() {}
+
   @Override
   public void reloadJSFromServer(String bundleURL) {}
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxContentView.java

@@ -259,7 +259,7 @@ public void init() {
         new View.OnClickListener() {
           @Override
           public void onClick(View v) {
-            Assertions.assertNotNull(mDevSupportManager).handleReloadJS();
+            Assertions.assertNotNull(mDevSupportManager).reloadExpoApp();
           }
         });
     mDismissButton = (Button) findViewById(R.id.rn_redbox_dismiss_button);

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialogSurfaceDelegate.java

@@ -98,7 +98,7 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
                 return true;
               }
               if (mDoubleTapReloadRecognizer.didDoubleTapR(keyCode, getCurrentFocus())) {
-                mDevSupportManager.handleReloadJS();
+                mDevSupportManager.reloadExpoApp();
               }
               return super.onKeyUp(keyCode, event);
             }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java

@@ -72,6 +72,8 @@ public interface DevSupportManager extends JSExceptionHandler {
 
   void handleReloadJS();
 
+  void reloadExpoApp();
+
   void reloadJSFromServer(final String bundleURL);
 
   void reloadJSFromServer(final String bundleURL, final BundleLoadCallback callback);