[expo-dev-launcher] take 2 at SDK 44 plugin compatibility

packages/expo-dev-launcher/CHANGELOG.md

@@ -12,6 +12,7 @@
 - Fix plugin when `expo-updates` is not present. ([#15541](https://github.com/expo/expo/pull/15541) by [@esamelson](https://github.com/esamelson))
 - Include expo-platform header in manifest requests. ([#15563](https://github.com/expo/expo/pull/15563) by [@esamelson](https://github.com/esamelson))
 - Fix plugin compatibility with SDK 44. ([#15562](https://github.com/expo/expo/pull/15562) by [@lukmccall](https://github.com/lukmccall))
+- Second pass at fixing SDK 44 compatibility in config plugin.
 
 ### 💡 Others
 

packages/expo-dev-launcher/plugin/src/__tests__/__snapshots__/withDevLauncher-test.ts.snap

@@ -3,7 +3,14 @@
 exports[`modifyJavaMainActivity modifies the MainActivity file for dev-launcher 1`] = `
 "import android.content.Intent;
 import expo.modules.devlauncher.DevLauncherController;
+import android.os.Build;
+import android.os.Bundle;
+
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+
+import expo.modules.ReactActivityDelegateWrapper;
 
 public class MainActivity extends ReactActivity {
 
@@ -15,13 +22,49 @@ public class MainActivity extends ReactActivity {
     super.onNewIntent(intent);
   }
 
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    // Set the theme to AppTheme BEFORE onCreate to support
+    // coloring the background, status bar, and navigation bar.
+    // This is required for expo-splash-screen.
+    setTheme(R.style.AppTheme);
+    super.onCreate(null);
+  }
+
   /**
-    * Returns the name of the main component registered from JavaScript. This is used to schedule
-    * rendering of the component.
-    */
+   * Returns the name of the main component registered from JavaScript.
+   * This is used to schedule rendering of the component.
+   */
   @Override
   protected String getMainComponentName() {
-    return \\"react-native-project\\";
+    return \\"main\\";
+  }
+
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return DevLauncherController.wrapReactActivityDelegate(this, () -> new ReactActivityDelegateWrapper(this,
+      new ReactActivityDelegate(this, getMainComponentName())
+    ));
+  }
+
+  /**
+   * Align the back button behavior with Android S
+   * where moving root activities to background instead of finishing activities.
+   * @see <a href=\\"https://developer.android.com/reference/android/app/Activity#onBackPressed()\\">onBackPressed</a>
+   */
+  @Override
+  public void invokeDefaultOnBackPressed() {
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+      if (!moveTaskToBack(false)) {
+        // For non-root activities, use the default implementation to finish them.
+        super.invokeDefaultOnBackPressed();
+      }
+      return;
+    }
+
+    // Use the default back button implementation on Android S
+    // because it's doing more than {@link Activity#moveTaskToBack} in fact.
+    super.invokeDefaultOnBackPressed();
   }
 }
 "
@@ -31,6 +74,10 @@ exports[`modifyJavaMainActivity modifies the MainActivity file for dev-launcher
 "import android.content.Intent;
 import expo.modules.devlauncher.DevLauncherController;
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+
+import expo.modules.ReactActivityDelegateWrapper;
 
 public class MainActivity extends ReactActivity {
   /**
@@ -42,6 +89,13 @@ public class MainActivity extends ReactActivity {
     return \\"react-native-project\\";
   }
 
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return DevLauncherController.wrapReactActivityDelegate(this, () -> new ReactActivityDelegateWrapper(this,
+      new ReactActivityDelegate(this, getMainComponentName())
+    ));
+  }
+
   @Override
   protected void onNewIntent(Intent intent) {
     if (DevLauncherController.tryToHandleIntent(this, intent)) {

packages/expo-dev-launcher/plugin/src/__tests__/fixtures/AppDelegate-expo-modules-sdk-44.m

@@ -0,0 +1,76 @@
+#import "AppDelegate.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTRootView.h>
+#import <React/RCTLinkingManager.h>
+#import <React/RCTConvert.h>
+
+#if defined(FB_SONARKIT_ENABLED) && __has_include(<FlipperKit/FlipperClient.h>)
+#import <FlipperKit/FlipperClient.h>
+#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
+#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
+#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
+#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
+#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
+
+static void InitializeFlipper(UIApplication *application) {
+  FlipperClient *client = [FlipperClient sharedClient];
+  SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
+  [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
+  [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
+  [client addPlugin:[FlipperKitReactPlugin new]];
+  [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
+  [client start];
+}
+#endif
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+#if defined(FB_SONARKIT_ENABLED) && __has_include(<FlipperKit/FlipperClient.h>)
+  InitializeFlipper(application);
+#endif
+
+  RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  rootView.backgroundColor = [UIColor whiteColor];
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  UIViewController *rootViewController = [self.reactDelegate createRootViewController];
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+
+  [super application:application didFinishLaunchingWithOptions:launchOptions];
+
+  return YES;
+ }
+
+- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
+{
+  // If you'd like to export some custom RCTBridgeModules, add them here!
+  return @[];
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
+ #ifdef DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+ #else
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+ #endif
+}
+
+// Linking API
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
+  return [RCTLinkingManager application:application openURL:url options:options];
+}
+
+// Universal Links
+- (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
+  return [RCTLinkingManager application:application
+                   continueUserActivity:userActivity
+                     restorationHandler:restorationHandler];
+}
+
+@end

packages/expo-dev-launcher/plugin/src/__tests__/fixtures/MainActivity-expo-modules.java

@@ -0,0 +1,55 @@
+import android.os.Build;
+import android.os.Bundle;
+
+import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+
+import expo.modules.ReactActivityDelegateWrapper;
+
+public class MainActivity extends ReactActivity {
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    // Set the theme to AppTheme BEFORE onCreate to support
+    // coloring the background, status bar, and navigation bar.
+    // This is required for expo-splash-screen.
+    setTheme(R.style.AppTheme);
+    super.onCreate(null);
+  }
+
+  /**
+   * Returns the name of the main component registered from JavaScript.
+   * This is used to schedule rendering of the component.
+   */
+  @Override
+  protected String getMainComponentName() {
+    return "main";
+  }
+
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return new ReactActivityDelegateWrapper(this,
+      new ReactActivityDelegate(this, getMainComponentName())
+    );
+  }
+
+  /**
+   * Align the back button behavior with Android S
+   * where moving root activities to background instead of finishing activities.
+   * @see <a href="https://developer.android.com/reference/android/app/Activity#onBackPressed()">onBackPressed</a>
+   */
+  @Override
+  public void invokeDefaultOnBackPressed() {
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+      if (!moveTaskToBack(false)) {
+        // For non-root activities, use the default implementation to finish them.
+        super.invokeDefaultOnBackPressed();
+      }
+      return;
+    }
+
+    // Use the default back button implementation on Android S
+    // because it's doing more than {@link Activity#moveTaskToBack} in fact.
+    super.invokeDefaultOnBackPressed();
+  }
+}

packages/expo-dev-launcher/plugin/src/__tests__/fixtures/MainActivity-with-on-new-intent.java

@@ -1,4 +1,8 @@
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+
+import expo.modules.ReactActivityDelegateWrapper;
 
 public class MainActivity extends ReactActivity {
   /**
@@ -10,6 +14,13 @@ protected String getMainComponentName() {
     return "react-native-project";
   }
 
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return new ReactActivityDelegateWrapper(this,
+      new ReactActivityDelegate(this, getMainComponentName())
+    );
+  }
+
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);

packages/expo-dev-launcher/plugin/src/__tests__/withDevLauncher-test.ts

@@ -4,13 +4,25 @@ import path from 'path';
 import { modifyJavaMainActivity } from '../withDevLauncher';
 
 describe(modifyJavaMainActivity, () => {
+  /**
+   * The config plugin cannot currently handle projects created with react-native init
+   *
   it(`modifies the MainActivity file for dev-launcher`, () => {
     const fixture = fs.readFileSync(
       path.join(__dirname, 'fixtures', 'MainActivity-react-native.java'),
       'utf8'
     );
     expect(modifyJavaMainActivity(fixture)).toMatchSnapshot();
   });
+   */
+
+  it(`modifies the MainActivity file for dev-launcher`, () => {
+    const fixture = fs.readFileSync(
+      path.join(__dirname, 'fixtures', 'MainActivity-expo-modules.java'),
+      'utf8'
+    );
+    expect(modifyJavaMainActivity(fixture)).toMatchSnapshot();
+  });
 
   it(`modifies the MainActivity file for dev-launcher when onNewIntent exists`, () => {
     const fixture = fs.readFileSync(
@@ -22,7 +34,7 @@ describe(modifyJavaMainActivity, () => {
 
   it(`modifying MainActivity twice doesn't change the content`, () => {
     const firstModification = fs.readFileSync(
-      path.join(__dirname, 'fixtures', 'MainActivity-react-native.java'),
+      path.join(__dirname, 'fixtures', 'MainActivity-expo-modules.java'),
       'utf8'
     );
     modifyJavaMainActivity(firstModification);

packages/expo-dev-launcher/plugin/src/withDevLauncher.ts

@@ -205,7 +205,7 @@ export function modifyJavaMainActivity(content: string): string {
       WarningAggregator.addWarningAndroid(
         'expo-dev-launcher',
         `Failed to wrap 'ReactActivityDelegate'
-See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${InstallationPage}`
+See the expo-dev-client installation instructions to modify your MainActivity.java manually: ${InstallationPage}`
       );
       return content;
     }