react-native-bootsplash 7.2.0 → 7.3.0

package/android/app/build/generated/source/codegen/java/com/facebook/fbreact/specs/NativeRNBootSplashSpec.java

@@ -0,0 +1,78 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.facebook.fbreact.specs;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+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.common.build.ReactBuildConfig;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public abstract class NativeRNBootSplashSpec extends ReactContextBaseJavaModule implements TurboModule {
+  public static final String NAME = "RNBootSplash";
+
+  public NativeRNBootSplashSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  protected abstract Map<String, Object> getTypedExportedConstants();
+
+  @Override
+  @DoNotStrip
+  public final @Nullable Map<String, Object> getConstants() {
+    Map<String, Object> constants = getTypedExportedConstants();
+    if (ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD) {
+      Set<String> obligatoryFlowConstants = new HashSet<>(Arrays.asList(
+          "darkModeEnabled"
+      ));
+      Set<String> optionalFlowConstants = new HashSet<>(Arrays.asList(
+          "logoSizeRatio",
+          "navigationBarHeight",
+          "statusBarHeight"
+      ));
+      Set<String> undeclaredConstants = new HashSet<>(constants.keySet());
+      undeclaredConstants.removeAll(obligatoryFlowConstants);
+      undeclaredConstants.removeAll(optionalFlowConstants);
+      if (!undeclaredConstants.isEmpty()) {
+        throw new IllegalStateException(String.format("Native Module Flow doesn't declare constants: %s", undeclaredConstants));
+      }
+      undeclaredConstants = obligatoryFlowConstants;
+      undeclaredConstants.removeAll(constants.keySet());
+      if (!undeclaredConstants.isEmpty()) {
+        throw new IllegalStateException(String.format("Native Module doesn't fill in constants: %s", undeclaredConstants));
+      }
+    }
+    return constants;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void hide(boolean fade, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void isVisible(Promise promise);
+}

package/android/app/build/generated/source/codegen/jni/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNBootSplashSpec/*.cpp)
+
+add_library(
+  react_codegen_RNBootSplashSpec
+  OBJECT
+  ${react_codegen_SRCS}
+)
+
+target_include_directories(react_codegen_RNBootSplashSpec PUBLIC . react/renderer/components/RNBootSplashSpec)
+
+target_link_libraries(
+  react_codegen_RNBootSplashSpec
+  fbjni
+  jsi
+  # We need to link different libraries based on whether we are building rncore or not, that's necessary
+  # because we want to break a circular dependency between react_codegen_rncore and reactnative
+  reactnative
+)
+
+target_compile_options(
+  react_codegen_RNBootSplashSpec
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+)

package/android/app/build/generated/source/codegen/jni/RNBootSplashSpec-generated.cpp

@@ -0,0 +1,44 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJniCpp.js
+ */
+
+#include "RNBootSplashSpec.h"
+
+namespace facebook::react {
+
+static facebook::jsi::Value __hostFunction_NativeRNBootSplashSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, ObjectKind, "getConstants", "()Ljava/util/Map;", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeRNBootSplashSpecJSI_hide(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "hide", "(ZLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeRNBootSplashSpecJSI_isVisible(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "isVisible", "(Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+NativeRNBootSplashSpecJSI::NativeRNBootSplashSpecJSI(const JavaTurboModule::InitParams &params)
+  : JavaTurboModule(params) {
+  methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashSpecJSI_getConstants};
+  methodMap_["hide"] = MethodMetadata {1, __hostFunction_NativeRNBootSplashSpecJSI_hide};
+  methodMap_["isVisible"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashSpecJSI_isVisible};
+}
+
+std::shared_ptr<TurboModule> RNBootSplashSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+  if (moduleName == "RNBootSplash") {
+    return std::make_shared<NativeRNBootSplashSpecJSI>(params);
+  }
+  return nullptr;
+}
+
+} // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/RNBootSplashSpec.h

@@ -0,0 +1,31 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJniH.js
+ */
+
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+/**
+ * JNI C++ class for module 'NativeRNBootSplash'
+ */
+class JSI_EXPORT NativeRNBootSplashSpecJSI : public JavaTurboModule {
+public:
+  NativeRNBootSplashSpecJSI(const JavaTurboModule::InitParams &params);
+};
+
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> RNBootSplashSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+
+} // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNBootSplashSpec/RNBootSplashSpecJSI-generated.cpp

@@ -0,0 +1,39 @@
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleCpp.js
+ */
+
+#include "RNBootSplashSpecJSI.h"
+
+namespace facebook::react {
+
+static jsi::Value __hostFunction_NativeRNBootSplashCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeRNBootSplashCxxSpecJSI *>(&turboModule)->getConstants(
+    rt
+  );
+}
+static jsi::Value __hostFunction_NativeRNBootSplashCxxSpecJSI_hide(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeRNBootSplashCxxSpecJSI *>(&turboModule)->hide(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asBool()
+  );
+}
+static jsi::Value __hostFunction_NativeRNBootSplashCxxSpecJSI_isVisible(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeRNBootSplashCxxSpecJSI *>(&turboModule)->isVisible(
+    rt
+  );
+}
+
+NativeRNBootSplashCxxSpecJSI::NativeRNBootSplashCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
+  : TurboModule("RNBootSplash", jsInvoker) {
+  methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashCxxSpecJSI_getConstants};
+  methodMap_["hide"] = MethodMetadata {1, __hostFunction_NativeRNBootSplashCxxSpecJSI_hide};
+  methodMap_["isVisible"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashCxxSpecJSI_isVisible};
+}
+
+
+} // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNBootSplashSpec/RNBootSplashSpecJSI.h

@@ -0,0 +1,85 @@
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleH.js
+ */
+
+#pragma once
+
+#include <ReactCommon/TurboModule.h>
+#include <react/bridging/Bridging.h>
+
+namespace facebook::react {
+
+
+  class JSI_EXPORT NativeRNBootSplashCxxSpecJSI : public TurboModule {
+protected:
+  NativeRNBootSplashCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
+
+public:
+  virtual jsi::Object getConstants(jsi::Runtime &rt) = 0;
+  virtual jsi::Value hide(jsi::Runtime &rt, bool fade) = 0;
+  virtual jsi::Value isVisible(jsi::Runtime &rt) = 0;
+
+};
+
+template <typename T>
+class JSI_EXPORT NativeRNBootSplashCxxSpec : public TurboModule {
+public:
+  jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
+    return delegate_.get(rt, propName);
+  }
+
+  static constexpr std::string_view kModuleName = "RNBootSplash";
+
+protected:
+  NativeRNBootSplashCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
+    : TurboModule(std::string{NativeRNBootSplashCxxSpec::kModuleName}, jsInvoker),
+      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
+
+
+private:
+  class Delegate : public NativeRNBootSplashCxxSpecJSI {
+  public:
+    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
+      NativeRNBootSplashCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
+
+    }
+
+    jsi::Object getConstants(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::getConstants) == 1,
+          "Expected getConstants(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Object>(
+          rt, &T::getConstants, jsInvoker_, instance_);
+    }
+    jsi::Value hide(jsi::Runtime &rt, bool fade) override {
+      static_assert(
+          bridging::getParameterCount(&T::hide) == 2,
+          "Expected hide(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::hide, jsInvoker_, instance_, std::move(fade));
+    }
+    jsi::Value isVisible(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::isVisible) == 1,
+          "Expected isVisible(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::isVisible, jsInvoker_, instance_);
+    }
+
+  private:
+    friend class NativeRNBootSplashCxxSpec;
+    T *instance_;
+  };
+
+  Delegate delegate_;
+};
+
+} // namespace facebook::react

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

@@ -1,7 +1,6 @@
 package com.zoontek.rnbootsplash
 
 import android.app.Activity
-
 import androidx.annotation.StyleRes
 
 object RNBootSplash {

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

@@ -2,24 +2,24 @@ package com.zoontek.rnbootsplash
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
 import android.content.res.Configuration
 import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 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
+import java.util.concurrent.ConcurrentLinkedQueue
 
 object RNBootSplashModuleImpl {
   const val NAME = "RNBootSplash"
@@ -31,16 +31,12 @@ object RNBootSplashModuleImpl {
     VISIBLE,
   }
 
-  private val mPromiseQueue = RNBootSplashQueue<Promise>()
+  @StyleRes private var mThemeResId = -1
+  private val mPromiseQueue = ConcurrentLinkedQueue<Promise>()
   private var mStatus = Status.HIDDEN
+  private var mSplashView: RNBootSplashView? = null
 
-  @StyleRes
-  private var mThemeResId = -1
-
-  private var mInitialDialog: RNBootSplashDialog? = null
-  private var mFadeOutDialog: RNBootSplashDialog? = null
-
-  internal fun init(activity: Activity?, @StyleRes themeResId: Int) {
+  internal fun init(mainActivity: Activity?, @StyleRes themeResId: Int) {
     if (mThemeResId != -1) {
       return FLog.w(
         ReactConstants.TAG,
@@ -50,7 +46,7 @@ object RNBootSplashModuleImpl {
 
     mThemeResId = themeResId
 
-    if (activity == null) {
+    if (mainActivity == null) {
       return FLog.w(
         ReactConstants.TAG,
         "$NAME: Ignored initialization, current activity is null."
@@ -59,81 +55,85 @@ object RNBootSplashModuleImpl {
 
     // Apply postBootSplashTheme
     val typedValue = TypedValue()
-    val currentTheme = activity.theme
+    val currentTheme = mainActivity.theme
 
     if (currentTheme.resolveAttribute(R.attr.postBootSplashTheme, typedValue, true)) {
       val finalThemeId = typedValue.resourceId
 
       if (finalThemeId != 0) {
-        activity.setTheme(finalThemeId)
+        mainActivity.setTheme(finalThemeId)
       }
     }
 
-    // Keep the splash screen on-screen until Dialog is shown
-    val contentView = activity.findViewById<View>(android.R.id.content)
+    // Keep the splash screen on-screen until View is shown
+    val contentView = mainActivity.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
+    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()
-        }
-    }
+      val splashScreen = mainActivity.splashScreen
 
-    mInitialDialog = RNBootSplashDialog(activity, mThemeResId, false)
+      splashScreen.setOnExitAnimationListener { view ->
+        view.remove() // Remove it immediately, without animation
+        splashScreen.clearOnExitAnimationListener()
+      }
+
+      // Mitigates race where splash exit listener may fire after activity stop (not a full fix)
+      if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
+        val application = mainActivity.application
+
+        application.registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
+          override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+          override fun onActivityDestroyed(activity: Activity) {}
+          override fun onActivityPaused(activity: Activity) {}
+          override fun onActivityResumed(activity: Activity) {}
+          override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+          override fun onActivityStarted(activity: Activity) {}
+
+          override fun onActivityStopped(activity: Activity) {
+            if (activity == mainActivity) {
+              runCatching { splashScreen.clearOnExitAnimationListener() }
+              application.unregisterActivityLifecycleCallbacks(this)
+            }
+          }
+        })
+      }
+    }
 
     UiThreadUtil.runOnUiThread {
-      mInitialDialog?.show { mStatus = Status.VISIBLE }
+      mSplashView = RNBootSplashView(mainActivity, mThemeResId)
+      mStatus = Status.VISIBLE
     }
   }
 
   private fun clearPromiseQueue() {
-    while (!mPromiseQueue.isEmpty()) {
-      mPromiseQueue.shift()?.resolve(true)
-    }
+    generateSequence { mPromiseQueue.poll() }.forEach { it.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
+      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)
-
+        Handler(Looper.getMainLooper())
+          .postDelayed({ hideAndClearPromiseQueue(reactContext, fade) }, 100)
         return@runOnUiThread
       }
 
@@ -143,39 +143,24 @@ object RNBootSplashModuleImpl {
 
       if (mStatus == Status.HIDDEN) {
         clearPromiseQueue()
-        return@runOnUiThread // both initial and fade out dialog are hidden
+        return@runOnUiThread // view is 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()
+      val callback = {
+        mSplashView = null
+        mStatus = Status.HIDDEN
+        clearPromiseQueue()
       }
 
-      if (fade) {
-        // Create a new Dialog instance with fade out animation
-        mFadeOutDialog = RNBootSplashDialog(activity, mThemeResId, true)
-        mFadeOutDialog?.show(hideSequence)
-      } else {
-        mInitialDialog?.dismiss(hideSequence) ?: hideSequence()
-      }
+      mSplashView?.remove(fade, callback) ?: callback()
     }
   }
 
   // From https://stackoverflow.com/a/61062773
-  fun isSamsungOneUI4(): Boolean {
-    return runCatching {
+  val isSamsungOneUI4: Boolean by lazy {
+    runCatching {
       val field = Build.VERSION::class.java.getDeclaredField("SEM_PLATFORM_INT")
       val version = (field.getInt(null) - 90000) / 10000
       version == 4
@@ -187,28 +172,23 @@ object RNBootSplashModuleImpl {
     mThemeResId = -1
     clearPromiseQueue()
 
-    mInitialDialog?.apply {
-      dismiss()
-      mInitialDialog = null
-    }
-
-    mFadeOutDialog?.apply {
-      dismiss()
-      mFadeOutDialog = null
+    mSplashView?.let { view ->
+      view.animate().cancel()
+      view.remove(false)
+      mSplashView = 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
+    val uiMode = reactContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
 
-    @SuppressLint("InternalInsetResource", "DiscouragedApi") val statusBarHeightResId =
+    @SuppressLint("InternalInsetResource", "DiscouragedApi")
+    val statusBarHeightResId =
       resources.getIdentifier("status_bar_height", "dimen", "android")
 
-    @SuppressLint("InternalInsetResource", "DiscouragedApi") val navigationBarHeightResId =
+    @SuppressLint("InternalInsetResource", "DiscouragedApi")
+    val navigationBarHeightResId =
       resources.getIdentifier("navigation_bar_height", "dimen", "android")
 
     val statusBarHeight = when {
@@ -223,16 +203,16 @@ object RNBootSplashModuleImpl {
       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
+    return buildMap {
+      put("darkModeEnabled", uiMode == Configuration.UI_MODE_NIGHT_YES)
+      put("logoSizeRatio", if (isSamsungOneUI4) 0.5 else 1.0)
+      put("navigationBarHeight", navigationBarHeight)
+      put("statusBarHeight", statusBarHeight)
+    }
   }
 
   fun hide(reactContext: ReactApplicationContext, fade: Boolean, promise: Promise) {
-    mPromiseQueue.push(promise)
+    mPromiseQueue.add(promise)
     hideAndClearPromiseQueue(reactContext, fade)
   }
 

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

@@ -9,28 +9,19 @@ 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
-    }
+    return if (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(
+  override fun getReactModuleInfoProvider() = ReactModuleInfoProvider {
+    mapOf(
+      RNBootSplashModuleImpl.NAME to ReactModuleInfo(
         RNBootSplashModuleImpl.NAME,
         RNBootSplashModuleImpl.NAME,
         false,
         false,
         false,
-        isTurboModule
+        BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
       )
-
-      moduleInfos[RNBootSplashModuleImpl.NAME] = moduleInfo
-      moduleInfos
-    }
+    )
   }
 }