[Android][sdk39] Make SplashScreen methods work in SDK39

android/expoview/src/main/java/host/exp/exponent/experience/ExperienceActivity.java

@@ -39,7 +39,7 @@
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import de.greenrobot.event.EventBus;
-import expo.modules.splashscreen.SplashScreen;
+import expo.modules.splashscreen.singletons.SplashScreen;
 import host.exp.exponent.ABIVersion;
 import host.exp.exponent.AppLoader;
 import host.exp.exponent.Constants;

android/expoview/src/main/java/host/exp/exponent/experience/HomeActivity.java

@@ -35,7 +35,7 @@
 import expo.modules.medialibrary.MediaLibraryPackage;
 import expo.modules.notifications.NotificationsPackage;
 import expo.modules.permissions.PermissionsPackage;
-import expo.modules.splashscreen.SplashScreen;
+import expo.modules.splashscreen.singletons.SplashScreen;
 import expo.modules.splashscreen.SplashScreenImageResizeMode;
 import expo.modules.splashscreen.SplashScreenPackage;
 import expo.modules.taskManager.TaskManagerPackage;

android/expoview/src/main/java/host/exp/exponent/kernel/services/SplashScreenKernelService.java

@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 
-import expo.modules.splashscreen.SplashScreen;
+import expo.modules.splashscreen.singletons.SplashScreen;
 import host.exp.exponent.kernel.ExperienceId;
 
 /**

android/versioned-abis/expoview-abi39_0_0/src/main/java/abi39_0_0/expo/modules/splashscreen/SplashScreenModule.kt

@@ -9,6 +9,10 @@ import abi39_0_0.org.unimodules.core.errors.CurrentActivityNotFoundException
 import abi39_0_0.org.unimodules.core.interfaces.ActivityProvider
 import abi39_0_0.org.unimodules.core.interfaces.ExpoMethod
 
+// Below import is added explicitly to provide a redirection from versioned code realm to unversioned code realm.
+// Without this import any `SplashScreen.methodName(...)` invocation on JS side ends up in versioned SplashScreen kotlin object that stores no information about the ExperienceActivity.
+import expo.modules.splashscreen.singletons.SplashScreen
+
 class SplashScreenModule(context: Context) : ExportedModule(context) {
   companion object {
     private const val NAME = "ExpoSplashScreen"

packages/expo-splash-screen/android/src/main/java/expo/modules/splashscreen/SplashScreenModule.kt

@@ -9,6 +9,12 @@ import org.unimodules.core.errors.CurrentActivityNotFoundException
 import org.unimodules.core.interfaces.ActivityProvider
 import org.unimodules.core.interfaces.ExpoMethod
 
+// Below import must be kept unversioned even in versioned code to provide a redirection from
+// versioned code realm to unversioned code realm.
+// Without this import any `SplashScreen.anyMethodName(...)` invocation on JS side ends up
+// in versioned SplashScreen kotlin object that stores no information about the ExperienceActivity.
+import expo.modules.splashscreen.singletons.SplashScreen
+
 class SplashScreenModule(context: Context) : ExportedModule(context) {
   companion object {
     private const val NAME = "ExpoSplashScreen"

packages/expo-splash-screen/android/src/main/java/expo/modules/splashscreen/SplashScreenPackage.kt

@@ -1,7 +1,7 @@
 package expo.modules.splashscreen
 
 import android.content.Context
-import expo.modules.splashscreen.SplashScreenModule
+import expo.modules.splashscreen.singletons.SplashScreen
 
 import org.unimodules.core.BasePackage
 import org.unimodules.core.ExportedModule

packages/expo-splash-screen/android/src/main/java/expo/modules/splashscreen/SplashScreen.kt → packages/expo-splash-screen/android/src/main/java/expo/modules/splashscreen/singletons/SplashScreen.kt

@@ -1,8 +1,12 @@
-package expo.modules.splashscreen
+package expo.modules.splashscreen.singletons
 
 import android.app.Activity
 import android.util.Log
 import android.view.ViewGroup
+import expo.modules.splashscreen.NativeResourcesBasedSplashScreenViewProvider
+import expo.modules.splashscreen.SplashScreenController
+import expo.modules.splashscreen.SplashScreenImageResizeMode
+import expo.modules.splashscreen.SplashScreenViewProvider
 import org.unimodules.core.interfaces.SingletonModule
 import java.util.*
 

packages/expo-splash-screen/android/src/main/java/expo/modules/splashscreen/SplashScreenStatusBar.kt → packages/expo-splash-screen/android/src/main/java/expo/modules/splashscreen/singletons/SplashScreenStatusBar.kt

@@ -1,13 +1,8 @@
-package expo.modules.splashscreen
+package expo.modules.splashscreen.singletons
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.res.Configuration
 import android.os.Build
-import android.view.View
-import android.view.WindowManager
-import androidx.annotation.ColorInt
-import androidx.annotation.UiThread
 import androidx.core.view.ViewCompat
 
 object SplashScreenStatusBar {

tools/expotools/src/versioning/android/android-packages-to-keep.txt

@@ -27,4 +27,5 @@ expo.modules.updates.db
 expo.modules.updates.launcher
 expo.modules.updates.loader
 expo.modules.updates.manifest
+expo.modules.splashscreen.singletons.SplashScreen
 com.facebook.proguard.annotations.DoNotStrip