expo-splash-screen 0.19.0 → 0.20.0

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 0.20.0 — 2023-06-21
+
+### 🛠 Breaking changes
+
+- Deprecated `@expo/configure-splash-screen` in favor of the splash screen config plugin. ([#21464](https://github.com/expo/expo/pull/21464) by [@byCedric](https://github.com/byCedric))
+
+### 🎉 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
+
+- Fixed Android build warnings for Gradle version 8. ([#22537](https://github.com/expo/expo/pull/22537), [#22609](https://github.com/expo/expo/pull/22609) by [@kudo](https://github.com/kudo))
+
 ## 0.19.0 — 2023-05-08
 
 ### 💡 Others

package/README.md

@@ -1,4 +1,11 @@
-# expo-splash-screen
+<p>
+  <a href="https://docs.expo.dev/versions/latest/sdk/splash-screen/">
+    <img
+      src="../../.github/resources/expo-splash-screen.svg"
+      alt="expo-splash-screen"
+      height="64" />
+  </a>
+</p>
 
 `expo-splash-screen` allows you to customize your app's splash screen, which is the initial screen users see when the app is launched, before it has loaded. Splash screens (sometimes called launch screens) provide a user's first experience with your application.
 
@@ -250,10 +257,6 @@ npx expo install expo-splash-screen
 
 Run `npx pod-install` after installing the package.
 
-### Automatic configuration
-
-The easiest way to configure the splash screen in bare React Native projects is with the expo-splash-screen command. See the [README](https://github.com/expo/expo-cli/tree/main/unlinked-packages/configure-splash-screen) for more information, or run `yarn expo-splash-screen --help` in your project.
-
 ### Manual Configuration
 
 To achieve native splash screen (in iOS ecosystem it's called `LaunchScreen`) behavior, you have to provide either a `SplashScreen.storyboard` file or a `SplashScreen.xib` file, and configure your Xcode project accordingly.
@@ -504,10 +507,6 @@ You might want to customize the StatusBar appearance during the time the SplashS
 
 To achieve fully-native splash screen behavior, `expo-splash-screen` needs to be hooked into the native view hierarchy and consume some resources that have to be placed under `/android/app/src/res` directory.
 
-### Automatic configuration
-
-The easiest way to configure the splash screen in bare React Native projects is with the expo-splash-screen command. See the [README](https://github.com/expo/expo-cli/tree/main/unlinked-packages/configure-splash-screen) for more information, or run `yarn expo-splash-screen --help` in your project.
-
 ### Manual Configuration
 
 1. [Configure `res/drawable/splashscreen_image.png`](#-configure-resdrawablesplashscreen_imagepng)
@@ -699,7 +698,6 @@ Create new color resource in your `res/values/colors.xml` (if your application s
 
 ```diff
   <resources>
-    <!-- Below line is handled by '@expo/configure-splash-screen' command and it's discouraged to modify it manually -->
     <color name="splashscreen_background">#D0D0C0</color>
 +   <color name="splashscreen_statusbar_color">#(AA)RRGGBB</color> <!-- #AARRGGBB or #RRGGBB format -->
   </resources>
@@ -777,7 +775,6 @@ We try to keep changes backward compatible, the code for `expo-splash-screen` wi
      setTheme(R.style.AppTheme);
      super.onCreate(null);
 -    // SplashScreen.show(...) has to be called after super.onCreate(...)
--    // Below line is handled by '@expo/configure-splash-screen' command and it's discouraged to modify it manually
 -    SplashScreen.show(this, SplashScreenImageResizeMode.CONTAIN, ReactRootView.class, false);
    }
 ```

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.19.0'
+version = '0.20.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -35,19 +35,11 @@ buildscript {
   }
 }
 
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -70,15 +62,21 @@ android {
     jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
+  namespace "expo.modules.splashscreen"
   defaultConfig {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 17
-    versionName '0.19.0'
+    versionName '0.20.0'
   }
   lintOptions {
     abortOnError false
   }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 dependencies {

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
-<manifest package="expo.modules.splashscreen">
+<manifest>
 </manifest>

package/android/src/main/java/expo/modules/splashscreen/SplashScreenModule.kt

@@ -1,13 +1,11 @@
 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.
@@ -15,47 +13,30 @@ import expo.modules.core.interfaces.ExpoMethod
 // 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) }
-    )
   }
 }

package/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)
   }

package/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

package/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)

package/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

package/build/ExpoSplashScreen.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("expo-modules-core").ProxyNativeModule;
+declare const _default: any;
 export default _default;
 //# sourceMappingURL=ExpoSplashScreen.d.ts.map

package/build/ExpoSplashScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSplashScreen.d.ts","sourceRoot":"","sources":["../src/ExpoSplashScreen.ts"],"names":[],"mappings":";AAEA,wBAAyD"}
+{"version":3,"file":"ExpoSplashScreen.d.ts","sourceRoot":"","sources":["../src/ExpoSplashScreen.ts"],"names":[],"mappings":";AACA,wBAA6D"}

package/build/ExpoSplashScreen.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoSplashScreen || {};
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoSplashScreen') || {};
 //# sourceMappingURL=ExpoSplashScreen.js.map

package/build/ExpoSplashScreen.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSplashScreen.js","sourceRoot":"","sources":["../src/ExpoSplashScreen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,eAAe,kBAAkB,CAAC,gBAAgB,IAAI,EAAE,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\n\nexport default NativeModulesProxy.ExpoSplashScreen || {};\n"]}
+{"version":3,"file":"ExpoSplashScreen.js","sourceRoot":"","sources":["../src/ExpoSplashScreen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,eAAe,mBAAmB,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\nexport default requireNativeModule('ExpoSplashScreen') || {};\n"]}

package/expo-module.config.json

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

package/ios/EXSplashScreen.podspec

@@ -17,6 +17,13 @@ Pod::Spec.new do |s|
   s.dependency 'ExpoModulesCore'
   s.dependency 'React-Core'
 
+  unless defined?(install_modules_dependencies)
+    # `install_modules_dependencies` is defined from react_native_pods.rb.
+    # when running with `pod ipc spec`, this method is not defined and we have to require manually.
+    require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
+  end
+  install_modules_dependencies(s)
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
     s.source_files = "#{s.name}/**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Provides a module to allow keeping the native Splash Screen visible until you choose to hide it.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,8 +37,7 @@
     "preset": "expo-module-scripts"
   },
   "dependencies": {
-    "@expo/configure-splash-screen": "^0.6.0",
-    "@expo/prebuild-config": "6.0.2"
+    "@expo/prebuild-config": "6.2.0"
   },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
@@ -46,5 +45,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
+  "gitHead": "fa5ecca8251986b9f197cc14074eec0ab6dfb6db"
 }

package/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') || {};

package/android/src/main/java/expo/modules/splashscreen/exceptions/NoContentViewException.kt

@@ -1,9 +0,0 @@
-package expo.modules.splashscreen.exceptions
-
-import expo.modules.core.errors.CodedException
-
-class NoContentViewException : CodedException("ContentView is not yet available. Call 'SplashScreen.show(...)' once 'setContentView()' is called.") {
-  override fun getCode(): String {
-    return "ERR_NO_CONTENT_VIEW_FOUND"
-  }
-}

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-splash-screen",
-  "platforms": ["ios", "android"]
-}