@onekeyfe/react-native-splash-screen 1.1.22 → 1.1.23

package/android/src/main/java/com/margelo/nitro/reactnativesplashscreen/SplashScreenBridge.kt

@@ -56,14 +56,19 @@ object SplashScreenBridge {
         onSuccess: ((Boolean) -> Unit)?,
         onFailure: ((String) -> Unit)?
     ) {
-        isAlreadyHidden = true
         val controller = controllers[activity]
         if (controller == null) {
             OneKeyLog.warn(TAG, "hide: no controller for activity")
             onFailure?.invoke("No splash screen registered for this activity")
             return
         }
-        controller.hide(onSuccess, onFailure)
+        controller.hide(
+            onSuccess = { result ->
+                isAlreadyHidden = true
+                onSuccess?.invoke(result)
+            },
+            onFailure = onFailure
+        )
     }
 
     private fun createSplashView(activity: Activity): android.view.View? {

package/android/src/main/java/com/margelo/nitro/reactnativesplashscreen/SplashViewController.kt

@@ -32,6 +32,7 @@ internal class SplashViewController(
 
     private var autoHideEnabled = true
     private var splashShown = false
+    private var searchCancelled = false
 
     fun show() {
         val activity = weakActivity.get() ?: return
@@ -64,6 +65,8 @@ internal class SplashViewController(
             onFailure?.invoke("Activity is already destroyed")
             return
         }
+        searchCancelled = true
+        handler.removeCallbacksAndMessages(null)
         Handler(activity.mainLooper).post {
             contentView.removeView(splashView)
             autoHideEnabled = true
@@ -74,6 +77,13 @@ internal class SplashViewController(
     }
 
     private fun searchForRootView() {
+        if (searchCancelled) return
+        val activity = weakActivity.get()
+        if (activity == null || activity.isFinishing || activity.isDestroyed) {
+            OneKeyLog.warn(TAG, "searchForRootView: activity destroyed, stopping search")
+            return
+        }
+        if (!splashShown) return
         val found = findRootView(contentView)
         if (found != null) {
             handleRootView(found)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-splash-screen",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "description": "react-native-splash-screen",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/README.md

@@ -1,36 +0,0 @@
-# react-native-splash-screen
-
-react-native-splash-screen
-
-## Installation
-
-```sh
-npm install react-native-splash-screen react-native-nitro-modules
-
-> `react-native-nitro-modules` is required as this library relies on [Nitro Modules](https://nitro.margelo.com/).
-```
-
-## Usage
-
-```js
-import { ReactNativeSplashScreen } from 'react-native-splash-screen';
-
-// ...
-
-const result = await ReactNativeSplashScreen.hello({ message: 'World' });
-console.log(result); // { success: true, data: 'Hello, World!' }
-```
-
-## Contributing
-
-- [Development workflow](CONTRIBUTING.md#development-workflow)
-- [Sending a pull request](CONTRIBUTING.md#sending-a-pull-request)
-- [Code of conduct](CODE_OF_CONDUCT.md)
-
-## License
-
-MIT
-
----
-
-Made with [create-react-native-library](https://github.com/callstack/react-native-builder-bob)