expo-splash-screen 0.26.3 → 0.27.0

package/CHANGELOG.md

@@ -10,11 +10,25 @@
 
 ### 💡 Others
 
-## 0.26.3 — 2024-01-18
+## 0.27.0 — 2024-04-18
+
+### 🐛 Bug fixes
+
+- Fixed white screen flickering when using expo-updates with longer `fallbackToCacheTimeout`. ([#28227](https://github.com/expo/expo/pull/28227) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Removed deprecated backward compatible Gradle settings. ([#28083](https://github.com/expo/expo/pull/28083) by [@kudo](https://github.com/kudo))
+
+## 0.26.4 - 2024-01-24
+
+_This version does not introduce any user-facing changes._
+
+## 0.26.3 - 2024-01-18
 
 _This version does not introduce any user-facing changes._
 
-## 0.26.2 — 2024-01-10
+## 0.26.2 - 2024-01-10
 
 ### 🐛 Bug fixes
 
@@ -24,7 +38,7 @@ _This version does not introduce any user-facing changes._
 
 - Replace deprecated `com.facebook.react:react-native:+` Android dependency with `com.facebook.react:react-android`. ([#26237](https://github.com/expo/expo/pull/26237) by [@kudo](https://github.com/kudo))
 
-## 0.26.1 — 2023-12-19
+## 0.26.1 - 2023-12-19
 
 _This version does not introduce any user-facing changes._
 

package/android/build.gradle

@@ -1,111 +1,25 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.26.3'
+version = '0.27.0'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-if (expoModulesCorePlugin.exists()) {
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
-  // Remove this check, but keep the contents after SDK49 support is dropped
-  if (safeExtGet("expoProvidesDefaultConfig", false)) {
-    useExpoPublishing()
-    useCoreDependencies()
-  }
-}
-
-buildscript {
-  // Simple helper that allows the root project to override versions declared by this library.
-  ext.safeExtGet = { prop, fallback ->
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-  }
-
-  // Ensures backward compatibility
-  ext.getKotlinVersion = {
-    if (ext.has("kotlinVersion")) {
-      ext.kotlinVersion()
-    } else {
-      ext.safeExtGet("kotlinVersion", "1.8.10")
-    }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-  }
-}
-
-// Remove this if and it's contents, when support for SDK49 is dropped
-if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-  afterEvaluate {
-    publishing {
-      publications {
-        release(MavenPublication) {
-          from components.release
-        }
-      }
-      repositories {
-        maven {
-          url = mavenLocal().url
-        }
-      }
-    }
-  }
-}
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
+useExpoPublishing()
 
 android {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-
-    publishing {
-      singleVariant("release") {
-        withSourcesJar()
-      }
-    }
-
-    lintOptions {
-      abortOnError false
-    }
-  }
-
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
-    }
-
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.majorVersion
-    }
-  }
-
   namespace "expo.modules.splashscreen"
   defaultConfig {
     versionCode 17
-    versionName '0.26.3'
+    versionName '0.27.0'
   }
 }
 
 dependencies {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    implementation project(':expo-modules-core')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  }
-
   implementation 'com.facebook.react:react-android'
   implementation 'androidx.appcompat:appcompat:1.2.0'
-  implementation "org.jetbrains.kotlin:kotlin-reflect:${getKotlinVersion()}"
+  implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion()}"
 }

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

@@ -5,9 +5,6 @@ package expo.modules.splashscreen
 import android.content.Context
 import androidx.core.content.ContextCompat
 
-// this needs to stay for versioning to work
-// EXPO_VERSIONING_NEEDS_PACKAGE_R
-
 /**
  * Default implementation that uses native resources.
  */

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

@@ -1,10 +1,11 @@
 package expo.modules.splashscreen
 
 import android.content.Context
-import expo.modules.splashscreen.singletons.SplashScreen
 import expo.modules.core.interfaces.Package
+import expo.modules.core.interfaces.ReactActivityHandler
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.core.interfaces.SingletonModule
+import expo.modules.splashscreen.singletons.SplashScreen
 
 class SplashScreenPackage : Package {
   override fun createSingletonModules(context: Context?): List<SingletonModule> {
@@ -14,4 +15,8 @@ class SplashScreenPackage : Package {
   override fun createReactActivityLifecycleListeners(activityContext: Context): List<ReactActivityLifecycleListener> {
     return listOf(SplashScreenReactActivityLifecycleListener(activityContext))
   }
+
+  override fun createReactActivityHandlers(activityContext: Context?): List<ReactActivityHandler> {
+    return listOf(SplashScreenReactActivityHandler())
+  }
 }

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

@@ -1,32 +1,45 @@
-@file:Suppress("UnusedImport")
-
 package expo.modules.splashscreen
 
 import android.app.Activity
 import android.content.Context
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactRootView
+import expo.modules.core.interfaces.ReactActivityHandler
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.splashscreen.singletons.SplashScreen
 
-// this needs to stay for versioning to work
-// EXPO_VERSIONING_NEEDS_PACKAGE_R
-
 class SplashScreenReactActivityLifecycleListener(activityContext: Context) : ReactActivityLifecycleListener {
   override fun onContentChanged(activity: Activity) {
-    SplashScreen.show(
+    SplashScreen.ensureShown(
       activity,
       getResizeMode(activity),
       ReactRootView::class.java,
       getStatusBarTranslucent(activity)
     )
   }
+}
 
-  private fun getResizeMode(context: Context): SplashScreenImageResizeMode =
-    SplashScreenImageResizeMode.fromString(
-      context.getString(R.string.expo_splash_screen_resize_mode).lowercase()
+class SplashScreenReactActivityHandler : ReactActivityHandler {
+  override fun getDelayLoadAppHandler(
+    activity: ReactActivity,
+    reactNativeHost: ReactNativeHost
+  ): ReactActivityHandler.DelayLoadAppHandler? {
+    SplashScreen.ensureShown(
+      activity,
+      getResizeMode(activity),
+      ReactRootView::class.java,
+      getStatusBarTranslucent(activity)
     )
-      ?: SplashScreenImageResizeMode.CONTAIN
-
-  private fun getStatusBarTranslucent(context: Context): Boolean =
-    context.getString(R.string.expo_splash_screen_status_bar_translucent).toBoolean()
+    return null
+  }
 }
+
+private fun getResizeMode(context: Context): SplashScreenImageResizeMode =
+  SplashScreenImageResizeMode.fromString(
+    context.getString(R.string.expo_splash_screen_resize_mode).lowercase()
+  )
+    ?: SplashScreenImageResizeMode.CONTAIN
+
+private fun getStatusBarTranslucent(context: Context): Boolean =
+  context.getString(R.string.expo_splash_screen_status_bar_translucent).toBoolean()

package/android/src/main/java/expo/modules/splashscreen/singletons/SplashScreen.kt

@@ -149,4 +149,21 @@ object SplashScreen : SingletonModule {
   fun hide(activity: Activity) {
     hide(activity, {}, {})
   }
+
+  /**
+   * An internal helper to make sure splash screen is shown when startup.
+   */
+  internal fun ensureShown(
+    activity: Activity,
+    resizeMode: SplashScreenImageResizeMode,
+    rootViewClass: Class<out ViewGroup>,
+    statusBarTranslucent: Boolean
+  ) {
+    val controller = controllers[activity]
+    if (controller == null) {
+      show(activity, resizeMode, rootViewClass, statusBarTranslucent)
+    } else {
+      controller.showSplashScreen { }
+    }
+  }
 }

package/build/index.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../src/index.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,YAAY,GAAG,mBAAmB,CAAC,kBAAkB,CAG1D,CAAC;AAEF,IAAI,8BAA8B,GAAG,KAAK,CAAC;AAC3C,IAAI,4BAA4B,GAAG,KAAK,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B;IAClD,4CAA4C;IAC5C,IAAI,4BAA4B,EAAE;QAChC,OAAO,KAAK,CAAC;KACd;IACD,4BAA4B,GAAG,IAAI,CAAC;IAEpC,oGAAoG;IACpG,oEAAoE;IACpE,IAAI,UAAU,EAAE,gBAAgB,EAAE;QAChC,MAAM,eAAe,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;QACtD,UAAU,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC7C,SAAS,EAAE,CAAC;YACZ,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,YAAY,CAAC,oBAAoB,EAAE,CAAC;AAC7C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,kFAAkF;IAClF,kFAAkF;IAClF,IAAI,8BAA8B,EAAE;QAClC,OAAO;KACR;IACD,SAAS,EAAE,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,SAAS;IACvB,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;QACnD,oCAAoC;QACpC;QACE,yDAAyD;QACzD,4BAA4B;YAC5B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,yCAAyC,CAAC,EACjE;YACA,OAAO;SACR;QACD,MAAM,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,gEAAgE;IAChE,8BAA8B,GAAG,IAAI,CAAC;IACtC,sBAAsB;IACtB,OAAO,8BAA8B,EAAE,CAAC;AAC1C,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nconst SplashModule = requireNativeModule('ExpoSplashScreen') as {\n  preventAutoHideAsync: () => Promise<boolean>;\n  hideAsync: () => Promise<boolean>;\n};\n\nlet _userControlledAutoHideEnabled = false;\nlet _preventAutoHideAsyncInvoked = false;\n\n/**\n * Expo Router uses this internal method to ensure that we can detect if the user\n * has explicitly opted into preventing the splash screen from hiding. This means\n * they will also explicitly hide it. If they don't, we will hide it for them after\n * the navigation render completes.\n *\n * @private\n */\nexport async function _internal_preventAutoHideAsync(): Promise<boolean> {\n  // Memoize, this should only be called once.\n  if (_preventAutoHideAsyncInvoked) {\n    return false;\n  }\n  _preventAutoHideAsyncInvoked = true;\n\n  // Append error handling to ensure any uncaught exceptions result in the splash screen being hidden.\n  // This prevents the splash screen from floating over error screens.\n  if (ErrorUtils?.getGlobalHandler) {\n    const originalHandler = ErrorUtils.getGlobalHandler();\n    ErrorUtils.setGlobalHandler((error, isFatal) => {\n      hideAsync();\n      originalHandler(error, isFatal);\n    });\n  }\n\n  return SplashModule.preventAutoHideAsync();\n}\n\n/**\n * Used for Expo libraries to attempt hiding the splash screen after they've completed their work.\n * If the user has explicitly opted into preventing the splash screen from hiding, we should not\n * hide it for them. This is often used for animated splash screens.\n *\n * @private\n */\nexport const _internal_maybeHideAsync = () => {\n  // If the user has explicitly opted into preventing the splash screen from hiding,\n  // we should not hide it for them. This is often used for animated splash screens.\n  if (_userControlledAutoHideEnabled) {\n    return;\n  }\n  hideAsync();\n};\n\nexport function hideAsync() {\n  return SplashModule.hideAsync().catch((error: any) => {\n    // Hide this very unfortunate error.\n    if (\n      // Only throw the error is something unexpected happened.\n      _preventAutoHideAsyncInvoked &&\n      error.message.includes('No native splash screen registered for ')\n    ) {\n      return;\n    }\n    throw error;\n  });\n}\n\nexport const preventAutoHideAsync = () => {\n  // Indicate that the user is controlling the auto hide behavior.\n  _userControlledAutoHideEnabled = true;\n  // Prevent as usual...\n  return _internal_preventAutoHideAsync();\n};\n"]}
+{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../src/index.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,YAAY,GAAG,mBAAmB,CAAC,kBAAkB,CAG1D,CAAC;AAEF,IAAI,8BAA8B,GAAG,KAAK,CAAC;AAC3C,IAAI,4BAA4B,GAAG,KAAK,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B;IAClD,4CAA4C;IAC5C,IAAI,4BAA4B,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,4BAA4B,GAAG,IAAI,CAAC;IAEpC,oGAAoG;IACpG,oEAAoE;IACpE,IAAI,UAAU,EAAE,gBAAgB,EAAE,CAAC;QACjC,MAAM,eAAe,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;QACtD,UAAU,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC7C,SAAS,EAAE,CAAC;YACZ,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,YAAY,CAAC,oBAAoB,EAAE,CAAC;AAC7C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,kFAAkF;IAClF,kFAAkF;IAClF,IAAI,8BAA8B,EAAE,CAAC;QACnC,OAAO;IACT,CAAC;IACD,SAAS,EAAE,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,SAAS;IACvB,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;QACnD,oCAAoC;QACpC;QACE,yDAAyD;QACzD,4BAA4B;YAC5B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,yCAAyC,CAAC,EACjE,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,gEAAgE;IAChE,8BAA8B,GAAG,IAAI,CAAC;IACtC,sBAAsB;IACtB,OAAO,8BAA8B,EAAE,CAAC;AAC1C,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nconst SplashModule = requireNativeModule('ExpoSplashScreen') as {\n  preventAutoHideAsync: () => Promise<boolean>;\n  hideAsync: () => Promise<boolean>;\n};\n\nlet _userControlledAutoHideEnabled = false;\nlet _preventAutoHideAsyncInvoked = false;\n\n/**\n * Expo Router uses this internal method to ensure that we can detect if the user\n * has explicitly opted into preventing the splash screen from hiding. This means\n * they will also explicitly hide it. If they don't, we will hide it for them after\n * the navigation render completes.\n *\n * @private\n */\nexport async function _internal_preventAutoHideAsync(): Promise<boolean> {\n  // Memoize, this should only be called once.\n  if (_preventAutoHideAsyncInvoked) {\n    return false;\n  }\n  _preventAutoHideAsyncInvoked = true;\n\n  // Append error handling to ensure any uncaught exceptions result in the splash screen being hidden.\n  // This prevents the splash screen from floating over error screens.\n  if (ErrorUtils?.getGlobalHandler) {\n    const originalHandler = ErrorUtils.getGlobalHandler();\n    ErrorUtils.setGlobalHandler((error, isFatal) => {\n      hideAsync();\n      originalHandler(error, isFatal);\n    });\n  }\n\n  return SplashModule.preventAutoHideAsync();\n}\n\n/**\n * Used for Expo libraries to attempt hiding the splash screen after they've completed their work.\n * If the user has explicitly opted into preventing the splash screen from hiding, we should not\n * hide it for them. This is often used for animated splash screens.\n *\n * @private\n */\nexport const _internal_maybeHideAsync = () => {\n  // If the user has explicitly opted into preventing the splash screen from hiding,\n  // we should not hide it for them. This is often used for animated splash screens.\n  if (_userControlledAutoHideEnabled) {\n    return;\n  }\n  hideAsync();\n};\n\nexport function hideAsync() {\n  return SplashModule.hideAsync().catch((error: any) => {\n    // Hide this very unfortunate error.\n    if (\n      // Only throw the error is something unexpected happened.\n      _preventAutoHideAsyncInvoked &&\n      error.message.includes('No native splash screen registered for ')\n    ) {\n      return;\n    }\n    throw error;\n  });\n}\n\nexport const preventAutoHideAsync = () => {\n  // Indicate that the user is controlling the auto hide behavior.\n  _userControlledAutoHideEnabled = true;\n  // Prevent as usual...\n  return _internal_preventAutoHideAsync();\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen",
-  "version": "0.26.3",
+  "version": "0.27.0",
   "description": "Provides a module to allow keeping the native Splash Screen visible until you choose to hide it.",
   "main": "build",
   "types": "build",
@@ -34,7 +34,7 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/splash-screen/",
   "dependencies": {
-    "@expo/prebuild-config": "6.7.3"
+    "@expo/prebuild-config": "7.0.0-beta.0"
   },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "102899632731658eecba006c0d1c79b98ba8f5f7"
+  "gitHead": "4165b8d72e1b9a1889c2767534cc619e21468110"
 }