[android][splash-screen] Migrate to new modules API (expo#22827)

packages/expo-splash-screen/CHANGELOG.md

@@ -9,6 +9,7 @@
 ### 🎉 New features
 
 - Added support for React Native 0.72. ([#22588](https://github.com/expo/expo/pull/22588) by [@kudo](https://github.com/kudo))
+- Migrated Android codebase to use Expo modules API. ([#22827](https://github.com/expo/expo/pull/22827) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 🐛 Bug fixes
 

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

@@ -1,61 +1,42 @@
 package expo.modules.splashscreen
 
-import android.content.Context
-
-import expo.modules.core.ExportedModule
-import expo.modules.core.ModuleRegistry
-import expo.modules.core.Promise
-import expo.modules.core.errors.CurrentActivityNotFoundException
-import expo.modules.core.interfaces.ActivityProvider
-import expo.modules.core.interfaces.ExpoMethod
+import expo.modules.kotlin.Promise
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+import expo.modules.splashscreen.exceptions.HideAsyncException
+import expo.modules.splashscreen.exceptions.PreventAutoHideException
 
 // 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"
-    private const val ERROR_TAG = "ERR_SPLASH_SCREEN"
-  }
-
-  private lateinit var activityProvider: ActivityProvider
-
-  override fun getName(): String {
-    return NAME
-  }
+class SplashScreenModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ExpoSplashScreen")
 
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    activityProvider = moduleRegistry.getModule(ActivityProvider::class.java)
-  }
+    AsyncFunction("preventAutoHideAsync") { promise: Promise ->
+      val currentActivity =
+        appContext.currentActivity ?: throw Exceptions.MissingActivity()
 
-  @ExpoMethod
-  fun preventAutoHideAsync(promise: Promise) {
-    val activity = activityProvider.currentActivity
-    if (activity == null) {
-      promise.reject(CurrentActivityNotFoundException())
-      return
+      SplashScreen.preventAutoHide(
+        currentActivity,
+        { hasEffect -> promise.resolve(hasEffect) },
+        { m -> promise.reject(PreventAutoHideException(m)) }
+      )
     }
-    SplashScreen.preventAutoHide(
-      activity,
-      { hasEffect -> promise.resolve(hasEffect) },
-      { m -> promise.reject(ERROR_TAG, m) }
-    )
-  }
 
-  @ExpoMethod
-  fun hideAsync(promise: Promise) {
-    val activity = activityProvider.currentActivity
-    if (activity == null) {
-      promise.reject(CurrentActivityNotFoundException())
-      return
+    AsyncFunction("hideAsync") { promise: Promise ->
+      val currentActivity =
+        appContext.currentActivity ?: throw Exceptions.MissingActivity()
+
+      SplashScreen.hide(
+        currentActivity,
+        { hasEffect -> promise.resolve(hasEffect) },
+        { m -> promise.reject(HideAsyncException(m)) }
+      )
     }
-    SplashScreen.hide(
-      activity,
-      { hasEffect -> promise.resolve(hasEffect) },
-      { m -> promise.reject(ERROR_TAG, m) }
-    )
   }
 }

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

@@ -2,16 +2,11 @@ package expo.modules.splashscreen
 
 import android.content.Context
 import expo.modules.splashscreen.singletons.SplashScreen
-import expo.modules.core.BasePackage
-import expo.modules.core.ExportedModule
+import expo.modules.core.interfaces.Package
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.core.interfaces.SingletonModule
 
-class SplashScreenPackage : BasePackage() {
-  override fun createExportedModules(context: Context): List<ExportedModule> {
-    return listOf(SplashScreenModule(context))
-  }
-
+class SplashScreenPackage : Package {
   override fun createSingletonModules(context: Context?): List<SingletonModule> {
     return listOf(SplashScreen)
   }

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

@@ -2,6 +2,7 @@ package expo.modules.splashscreen
 
 import android.app.Activity
 import android.os.Handler
+import android.os.Looper
 import android.view.View
 import android.view.ViewGroup
 import expo.modules.splashscreen.exceptions.NoContentViewException
@@ -17,7 +18,7 @@ open class SplashScreenViewController(
   private val weakActivity = WeakReference(activity)
   private val contentView: ViewGroup = activity.findViewById(android.R.id.content)
     ?: throw NoContentViewException()
-  private val handler = Handler()
+  private val handler = Handler(Looper.getMainLooper())
 
   private var autoHideEnabled = true
   private var splashScreenShown = false

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

@@ -0,0 +1,12 @@
+package expo.modules.splashscreen.exceptions
+
+import expo.modules.kotlin.exception.CodedException
+
+class NoContentViewException :
+  CodedException("ContentView is not yet available. Call 'SplashScreen.show(...)' once 'setContentView()' is called.")
+
+class PreventAutoHideException(message: String) :
+  CodedException(message)
+
+class HideAsyncException(message: String) :
+  CodedException(message)

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

@@ -1,17 +1,10 @@
 package expo.modules.splashscreen.singletons
 
-import android.annotation.SuppressLint
 import android.app.Activity
-import android.os.Build
 import androidx.core.view.ViewCompat
 
 object SplashScreenStatusBar {
   fun configureTranslucent(activity: Activity, translucent: Boolean?) {
-    @SuppressLint("ObsoleteSdkInt")
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return
-    }
-
     translucent?.let {
       activity.runOnUiThread {
         // If the status bar is translucent hook into the window insets calculations

packages/expo-splash-screen/expo-module.config.json

@@ -0,0 +1,7 @@
+{
+  "name": "expo-splash-screen",
+  "platforms": ["ios", "android"],
+  "android": {
+    "modules": ["expo.modules.splashscreen.SplashScreenModule"]
+  }
+}

packages/expo-splash-screen/src/ExpoSplashScreen.ts

@@ -1,3 +1,2 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-
-export default NativeModulesProxy.ExpoSplashScreen || {};
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoSplashScreen') || {};