expo-splash-screen 0.26.4 → 0.27.1

package/CHANGELOG.md

@@ -10,15 +10,29 @@
 
 ### 💡 Others
 
-## 0.26.4 — 2024-01-24
+## 0.27.1 — 2024-04-22
 
 _This version does not introduce any user-facing changes._
 
-## 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
 
@@ -28,7 +42,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.4'
+version = '0.27.1'
 
 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.4'
+    versionName '0.27.1'
   }
 }
 
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen",
-  "version": "0.26.4",
+  "version": "0.27.1",
   "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.4"
+    "@expo/prebuild-config": "7.0.1"
   },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "dd467f9665171a9729dad8837ea595cd046936f4"
+  "gitHead": "0897aeadb926491a457bcd67d83360956994ee82"
 }