[configure-splash-screen] <feat>: Accomodate Android API change

expo/expo#10294 introduces scoping to SplashScreen object used in project's MainActivity
expo · Sep 24, 2020 · 8f9cf1b · 8f9cf1b
1 parent 969c593
commit 8f9cf1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/configure-splash-screen/src/android/MainActivity.ts b/packages/configure-splash-screen/src/android/MainActivity.ts
@@ -68,8 +68,8 @@ export default async function configureMainActivity(
     // importing SplashScreen
     .applyAction(content => {
       const [succeeded, newContent] = replace(content, {
-        replacePattern: /^import expo\.modules\.splashscreen\.SplashScreen.*?\nimport expo\.modules\.splashscreen\.SplashScreenImageResizeMode.*?$/m,
-        replaceContent: `import expo.modules.splashscreen.SplashScreen${LE}
+        replacePattern: /^import expo\.modules\.splashscreen\..*SplashScreen.*?\nimport expo\.modules\.splashscreen\.SplashScreenImageResizeMode.*?$/m,
+        replaceContent: `import expo.modules.splashscreen.singletons.SplashScreen${LE}
 import expo.modules.splashscreen.SplashScreenImageResizeMode${LE}`,
       });
       return [newContent, 'replacedSplashImports', succeeded];
@@ -80,7 +80,7 @@ import expo.modules.splashscreen.SplashScreenImageResizeMode${LE}`,
       }
       const [succeeded, newContent] = insert(content, {
         insertPattern: isJava ? /(?=public class .* extends .* {.*$)/m : /(?=class .* : .* {.*$)/m,
-        insertContent: `import expo.modules.splashscreen.SplashScreen${LE}
+        insertContent: `import expo.modules.splashscreen.singletons.SplashScreen${LE}
 import expo.modules.splashscreen.SplashScreenImageResizeMode${LE}
 
 `,

diff --git a/packages/configure-splash-screen/src/android/__tests__/MainActivity.test.ts b/packages/configure-splash-screen/src/android/__tests__/MainActivity.test.ts
@@ -56,7 +56,7 @@ ${
   !addSplashScreenShowWith
     ? ''
     : `
-import expo.modules.splashscreen.SplashScreen${LE}
+import expo.modules.splashscreen.singletons.SplashScreen${LE}
 import expo.modules.splashscreen.SplashScreenImageResizeMode${LE}
 `
 }

diff --git a/...ndroid/__tests__/fixtures/react-native-project-structure-with-splash-screen-configured.ts b/...ndroid/__tests__/fixtures/react-native-project-structure-with-splash-screen-configured.ts
@@ -7,7 +7,7 @@ import com.facebook.react.ReactActivity;
 
 import com.facebook.react.ReactRootView;
 
-import expo.modules.splashscreen.SplashScreen;
+import expo.modules.splashscreen.singletons.SplashScreen;
 import expo.modules.splashscreen.SplashScreenImageResizeMode;
 
 public class MainActivity extends ReactActivity {