react-native-bootsplash 6.1.4 → 6.2.0-rc.0

package/README.md

@@ -203,6 +203,7 @@ Edit the `ios/YourApp/AppDelegate.mm` file:
 
 // ⬇️ Add this before file @end (for react-native 0.74+)
 - (void)customizeRootView:(RCTRootView *)rootView {
+  [super customizeRootView:rootView];
   [RNBootSplash initWithStoryboard:@"BootSplash" rootView:rootView]; // ⬅️ initialize the splash screen
 }
 

package/android/build.gradle

@@ -7,6 +7,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet("kotlinVersion", "1.8.0")}")
         classpath("com.android.tools.build:gradle:7.3.1")
     }
 }
@@ -16,14 +17,15 @@ def isNewArchitectureEnabled() {
 }
 
 apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 if (isNewArchitectureEnabled()) {
     apply plugin: "com.facebook.react"
 }
 
 android {
-    buildToolsVersion safeExtGet("buildToolsVersion", "33.0.0")
-    compileSdkVersion safeExtGet("compileSdkVersion", 33)
+    buildToolsVersion safeExtGet("buildToolsVersion", "34.0.0")
+    compileSdkVersion safeExtGet("compileSdkVersion", 34)
 
     if (project.android.hasProperty("namespace")) {
         namespace "com.zoontek.rnbootsplash"
@@ -39,8 +41,8 @@ android {
     }
     defaultConfig {
         buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
-        minSdkVersion safeExtGet("minSdkVersion", 21)
-        targetSdkVersion safeExtGet("targetSdkVersion", 33)
+        minSdkVersion safeExtGet("minSdkVersion", 23)
+        targetSdkVersion safeExtGet("targetSdkVersion", 34)
     }
     lintOptions {
         abortOnError false

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplash.kt

@@ -0,0 +1,13 @@
+package com.zoontek.rnbootsplash
+
+import android.app.Activity
+
+import androidx.annotation.StyleRes
+
+object RNBootSplash {
+
+  @JvmStatic
+  fun init(activity: Activity, @StyleRes themeResId: Int) {
+    RNBootSplashModuleImpl.init(activity, themeResId)
+  }
+}

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashDialog.kt

@@ -0,0 +1,79 @@
+package com.zoontek.rnbootsplash
+
+import android.app.Activity
+import android.app.Dialog
+import android.os.Bundle
+import android.view.WindowManager
+
+import androidx.annotation.StyleRes
+
+class RNBootSplashDialog(
+  activity: Activity,
+  @StyleRes themeResId: Int,
+  private val fade: Boolean
+) : Dialog(activity, themeResId) {
+
+  init {
+    setOwnerActivity(activity)
+    setCancelable(false)
+    setCanceledOnTouchOutside(false)
+  }
+
+  @Deprecated("Deprecated in favor of OnBackPressedCallback")
+  override fun onBackPressed() {
+    val activity = ownerActivity
+    activity?.moveTaskToBack(true)
+  }
+
+  override fun dismiss() {
+    if (isShowing) {
+      runCatching { super.dismiss() }
+    }
+  }
+
+  fun dismiss(callback: () -> Unit) {
+    if (isShowing) {
+      setOnDismissListener { callback() }
+      runCatching { super.dismiss() }.onFailure { callback() }
+    } else {
+      callback()
+    }
+  }
+
+  override fun show() {
+    if (!isShowing) {
+      runCatching { super.show() }
+    }
+  }
+
+  fun show(callback: () -> Unit) {
+    if (!isShowing) {
+      setOnShowListener { callback() }
+      runCatching { super.show() }.onFailure { callback() }
+    } else {
+      callback()
+    }
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    window?.apply {
+      setLayout(
+        WindowManager.LayoutParams.MATCH_PARENT,
+        WindowManager.LayoutParams.MATCH_PARENT
+      )
+
+      setWindowAnimations(
+        when {
+          fade -> R.style.BootSplashFadeOutAnimation
+          else -> R.style.BootSplashNoAnimation
+        }
+      )
+
+      if (RNBootSplashModuleImpl.isSamsungOneUI4()) {
+        setBackgroundDrawableResource(R.drawable.compat_splash_screen_oneui_4)
+      }
+    }
+
+    super.onCreate(savedInstanceState)
+  }
+}

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashModuleImpl.kt

@@ -0,0 +1,242 @@
+package com.zoontek.rnbootsplash
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.res.Configuration
+import android.os.Build
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewConfiguration
+import android.view.ViewTreeObserver.OnPreDrawListener
+
+import androidx.annotation.StyleRes
+
+import com.facebook.common.logging.FLog
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.common.ReactConstants
+import com.facebook.react.uimanager.PixelUtil
+
+import java.util.Timer
+import java.util.TimerTask
+
+object RNBootSplashModuleImpl {
+  const val NAME = "RNBootSplash"
+
+  private enum class Status {
+    HIDDEN,
+    HIDING,
+    INITIALIZING,
+    VISIBLE,
+  }
+
+  private val mPromiseQueue = RNBootSplashQueue<Promise>()
+  private var mStatus = Status.HIDDEN
+
+  @StyleRes
+  private var mThemeResId = -1
+
+  private var mInitialDialog: RNBootSplashDialog? = null
+  private var mFadeOutDialog: RNBootSplashDialog? = null
+
+  internal fun init(activity: Activity?, @StyleRes themeResId: Int) {
+    if (mThemeResId != -1) {
+      return FLog.w(
+        ReactConstants.TAG,
+        "$NAME: Ignored initialization, module is already initialized."
+      )
+    }
+
+    mThemeResId = themeResId
+
+    if (activity == null) {
+      return FLog.w(
+        ReactConstants.TAG,
+        "$NAME: Ignored initialization, current activity is null."
+      )
+    }
+
+    // Apply postBootSplashTheme
+    val typedValue = TypedValue()
+    val currentTheme = activity.theme
+
+    if (currentTheme.resolveAttribute(R.attr.postBootSplashTheme, typedValue, true)) {
+      val finalThemeId = typedValue.resourceId
+
+      if (finalThemeId != 0) {
+        activity.setTheme(finalThemeId)
+      }
+    }
+
+    // Keep the splash screen on-screen until Dialog is shown
+    val contentView = activity.findViewById<View>(android.R.id.content)
+    mStatus = Status.INITIALIZING
+
+    contentView
+      .viewTreeObserver
+      .addOnPreDrawListener(object : OnPreDrawListener {
+        override fun onPreDraw(): Boolean {
+          if (mStatus == Status.INITIALIZING) {
+            return false
+          }
+
+          contentView
+            .viewTreeObserver
+            .removeOnPreDrawListener(this)
+
+          return true
+        }
+      })
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      // This is not called on Android 12 when activity is started using intent
+      // (Android studio / CLI / notification / widget…)
+      activity
+        .splashScreen
+        .setOnExitAnimationListener { view ->
+          view.remove() // Remove it immediately, without animation
+
+          activity
+            .splashScreen
+            .clearOnExitAnimationListener()
+        }
+    }
+
+    mInitialDialog = RNBootSplashDialog(activity, mThemeResId, false)
+
+    UiThreadUtil.runOnUiThread {
+      mInitialDialog?.show { mStatus = Status.VISIBLE }
+    }
+  }
+
+  private fun clearPromiseQueue() {
+    while (!mPromiseQueue.isEmpty()) {
+      mPromiseQueue.shift()?.resolve(true)
+    }
+  }
+
+  private fun hideAndClearPromiseQueue(reactContext: ReactApplicationContext, fade: Boolean) {
+    UiThreadUtil.runOnUiThread {
+      val activity = reactContext.currentActivity
+
+      if (mStatus == Status.INITIALIZING
+        || activity == null
+        || activity.isFinishing
+        || activity.isDestroyed
+      ) {
+        val timer = Timer()
+
+        timer.schedule(object : TimerTask() {
+          override fun run() {
+            timer.cancel()
+            hideAndClearPromiseQueue(reactContext, fade)
+          }
+        }, 100)
+
+        return@runOnUiThread
+      }
+
+      if (mStatus == Status.HIDING) {
+        return@runOnUiThread // wait until fade out end for clearPromiseQueue
+      }
+
+      if (mStatus == Status.HIDDEN) {
+        clearPromiseQueue()
+        return@runOnUiThread // both initial and fade out dialog are hidden
+      }
+
+      mStatus = Status.HIDING
+
+      val hideSequence = {
+        val fadeOutDialogDismiss = {
+          mFadeOutDialog = null
+          mStatus = Status.HIDDEN
+          clearPromiseQueue()
+        }
+
+        val initialDialogDismiss = {
+          mInitialDialog = null
+          mFadeOutDialog?.dismiss(fadeOutDialogDismiss) ?: fadeOutDialogDismiss()
+        }
+
+        mInitialDialog?.dismiss(initialDialogDismiss) ?: initialDialogDismiss()
+      }
+
+      if (fade) {
+        // Create a new Dialog instance with fade out animation
+        mFadeOutDialog = RNBootSplashDialog(activity, mThemeResId, true)
+        mFadeOutDialog?.show(hideSequence)
+      } else {
+        mInitialDialog?.dismiss(hideSequence) ?: hideSequence()
+      }
+    }
+  }
+
+  // From https://stackoverflow.com/a/61062773
+  fun isSamsungOneUI4(): Boolean {
+    return runCatching {
+      val field = Build.VERSION::class.java.getDeclaredField("SEM_PLATFORM_INT")
+      val version = (field.getInt(null) - 90000) / 10000
+      version == 4
+    }.getOrDefault(false)
+  }
+
+  internal fun onHostDestroy() {
+    mStatus = Status.HIDDEN
+    mThemeResId = -1
+    clearPromiseQueue()
+
+    mInitialDialog?.apply {
+      dismiss()
+      mInitialDialog = null
+    }
+
+    mFadeOutDialog?.apply {
+      dismiss()
+      mFadeOutDialog = null
+    }
+  }
+
+  fun getConstants(reactContext: ReactApplicationContext): Map<String, Any> {
+    val resources = reactContext.resources
+    val constants = HashMap<String, Any>()
+
+    val uiMode =
+      reactContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+
+    @SuppressLint("InternalInsetResource", "DiscouragedApi") val statusBarHeightResId =
+      resources.getIdentifier("status_bar_height", "dimen", "android")
+
+    @SuppressLint("InternalInsetResource", "DiscouragedApi") val navigationBarHeightResId =
+      resources.getIdentifier("navigation_bar_height", "dimen", "android")
+
+    val statusBarHeight = when {
+      statusBarHeightResId > 0 ->
+        PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(statusBarHeightResId).toFloat())
+      else -> 0f
+    }
+
+    val navigationBarHeight = when {
+      navigationBarHeightResId > 0 && !ViewConfiguration.get(reactContext).hasPermanentMenuKey() ->
+        PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(navigationBarHeightResId).toFloat())
+      else -> 0f
+    }
+
+    constants["darkModeEnabled"] = uiMode == Configuration.UI_MODE_NIGHT_YES
+    constants["logoSizeRatio"] = if (isSamsungOneUI4()) 0.5 else 1.0
+    constants["navigationBarHeight"] = navigationBarHeight
+    constants["statusBarHeight"] = statusBarHeight
+
+    return constants
+  }
+
+  fun hide(reactContext: ReactApplicationContext, fade: Boolean, promise: Promise) {
+    mPromiseQueue.push(promise)
+    hideAndClearPromiseQueue(reactContext, fade)
+  }
+
+  fun isVisible(promise: Promise) {
+    promise.resolve(mStatus != Status.HIDDEN)
+  }
+}

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashPackage.kt

@@ -0,0 +1,37 @@
+package com.zoontek.rnbootsplash
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class RNBootSplashPackage : TurboReactPackage() {
+
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return when (name) {
+      RNBootSplashModuleImpl.NAME -> RNBootSplashModule(reactContext)
+      else -> null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+
+      val moduleInfo = ReactModuleInfo(
+        RNBootSplashModuleImpl.NAME,
+        RNBootSplashModuleImpl.NAME,
+        false,
+        false,
+        true,
+        false,
+        isTurboModule
+      )
+
+      moduleInfos[RNBootSplashModuleImpl.NAME] = moduleInfo
+      moduleInfos
+    }
+  }
+}

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashQueue.kt

@@ -0,0 +1,26 @@
+package com.zoontek.rnbootsplash
+
+import java.util.Vector
+
+/**
+ * Represents a first-in-first-out (FIFO) thread safe queue of objects.
+ * Its source code is based on Java internal `Stack`.
+ */
+class RNBootSplashQueue<E> : Vector<E>() {
+
+  @Synchronized
+  fun shift(): E? {
+    if (size == 0) {
+      return null
+    }
+
+    val item = elementAt(0)
+    removeElementAt(0)
+
+    return item
+  }
+
+  fun push(item: E) {
+    addElement(item)
+  }
+}

package/android/src/main/res/values/colors.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/remote_color_resources_res/values/colors.xml;l=67 -->
+    <!-- https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/res/color/system_bar_background_semi_transparent.xml -->
+    <color name="systemBarDarkScrim">#801b1b1b</color>
+    <!-- https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/com/android/internal/policy/DecorView.java;l=142 -->
+    <color name="systemBarLightScrim">#e6ffffff</color>
+</resources>

package/android/src/main/res/values/styles.xml

@@ -10,35 +10,35 @@
         <item name="android:windowExitAnimation">@anim/bootsplash_fade_out</item>
     </style>
 
-    <style name="Theme.BootSplash.Common" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Theme.BootSplash.DayNight" parent="Theme.AppCompat.DayNight.NoActionBar">
+    </style>
+
+    <style name="Theme.BootSplash.Base" parent="Theme.BootSplash.DayNight">
+        <item name="darkContentBarsStyle">true</item>
+    </style>
+
+    <style name="Theme.BootSplash.Common" parent="Theme.BootSplash.Base">
         <item name="android:opacity">opaque</item>
         <item name="android:windowBackground">@drawable/compat_splash_screen</item>
         <item name="bootSplashBrand">@drawable/transparent_pixel</item>
     </style>
 
-    <style name="Theme.BootSplash.DayNight" parent="Theme.BootSplash.Common">
-    </style>
-
-    <style name="Theme.BootSplash" parent="Theme.BootSplash.DayNight">
+    <style name="Theme.BootSplash" parent="Theme.BootSplash.Common">
         <item name="bootSplashBackground">?android:colorBackground</item>
         <item name="bootSplashLogo">@android:drawable/sym_def_app_icon</item>
         <item name="postBootSplashTheme">?android:attr/theme</item>
     </style>
 
-    <style name="Theme.BootSplash.BarsStyle" parent="Theme.BootSplash">
-        <item name="darkContentBarsStyle">true</item>
-    </style>
-
-    <style name="Theme.BootSplash.TransparentStatus" parent="Theme.BootSplash.BarsStyle">
+    <style name="Theme.BootSplash.TransparentStatus" parent="Theme.BootSplash">
     </style>
 
-    <style name="Theme.BootSplash.EdgeToEdge.Common" parent="Theme.BootSplash.BarsStyle">
+    <style name="Theme.BootSplash.EdgeToEdge.Common" parent="Theme.BootSplash">
         <item name="android:fitsSystemWindows">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
     <style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.Common">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:statusBarColor">@color/systemBarDarkScrim</item>
+        <item name="android:navigationBarColor">@color/systemBarDarkScrim</item>
     </style>
 </resources>

package/android/src/main/res/values-night/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash.BarsStyle" parent="Theme.BootSplash">
+    <style name="Theme.BootSplash.Base" parent="Theme.BootSplash.DayNight">
         <item name="darkContentBarsStyle">false</item>
     </style>
 </resources>

package/android/src/main/res/values-v23/styles.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash.TransparentStatus" parent="Theme.BootSplash.BarsStyle">
+    <style name="Theme.BootSplash.TransparentStatus" parent="Theme.BootSplash">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?darkContentBarsStyle</item>
     </style>
 
     <style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.Common">
-        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:navigationBarColor">@color/systemBarDarkScrim</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?darkContentBarsStyle</item>
     </style>

package/android/src/main/res/values-v29/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash.DayNight" parent="Theme.BootSplash.Common">
+    <style name="Theme.BootSplash.DayNight" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:forceDarkAllowed">false</item>
     </style>
 

package/android/src/main/res/values-v31/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash" parent="Theme.BootSplash.DayNight">
+    <style name="Theme.BootSplash" parent="Theme.BootSplash.Common">
         <item name="android:windowSplashScreenBackground">?bootSplashBackground</item>
         <item name="android:windowSplashScreenAnimatedIcon">?bootSplashLogo</item>
         <item name="android:windowSplashScreenBrandingImage">?bootSplashBrand</item>

package/android/src/newarch/com/zoontek/rnbootsplash/RNBootSplashModule.kt

@@ -0,0 +1,39 @@
+package com.zoontek.rnbootsplash
+
+import com.facebook.react.bridge.LifecycleEventListener
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = RNBootSplashModuleImpl.NAME)
+class RNBootSplashModule(reactContext: ReactApplicationContext) :
+  NativeRNBootSplashSpec(reactContext), LifecycleEventListener {
+
+  init {
+    reactContext.addLifecycleEventListener(this)
+  }
+
+  override fun getName(): String {
+    return RNBootSplashModuleImpl.NAME
+  }
+
+  override fun onHostResume() {}
+
+  override fun onHostPause() {}
+
+  override fun onHostDestroy() {
+    RNBootSplashModuleImpl.onHostDestroy()
+  }
+
+  override fun getTypedExportedConstants(): Map<String, Any> {
+    return RNBootSplashModuleImpl.getConstants(reactApplicationContext)
+  }
+
+  override fun hide(fade: Boolean, promise: Promise) {
+    RNBootSplashModuleImpl.hide(reactApplicationContext, fade, promise)
+  }
+
+  override fun isVisible(promise: Promise) {
+    RNBootSplashModuleImpl.isVisible(promise)
+  }
+}

package/android/src/oldarch/com/zoontek/rnbootsplash/RNBootSplashModule.kt

@@ -0,0 +1,43 @@
+package com.zoontek.rnbootsplash
+
+import com.facebook.react.bridge.LifecycleEventListener
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = RNBootSplashModuleImpl.NAME)
+class RNBootSplashModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext), LifecycleEventListener {
+
+  init {
+    reactContext.addLifecycleEventListener(this)
+  }
+
+  override fun getName(): String {
+    return RNBootSplashModuleImpl.NAME
+  }
+
+  override fun onHostResume() {}
+
+  override fun onHostPause() {}
+
+  override fun onHostDestroy() {
+    RNBootSplashModuleImpl.onHostDestroy()
+  }
+
+  override fun getConstants(): Map<String, Any> {
+    return RNBootSplashModuleImpl.getConstants(reactApplicationContext)
+  }
+
+  @ReactMethod
+  fun hide(fade: Boolean, promise: Promise) {
+    RNBootSplashModuleImpl.hide(reactApplicationContext, fade, promise)
+  }
+
+  @ReactMethod
+  fun isVisible(promise: Promise) {
+    RNBootSplashModuleImpl.isVisible(promise)
+  }
+}