[VO-428] feat: Call resolve on all Android's path for hide and show, and improve debug

android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashModule.java

@@ -3,6 +3,7 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
@@ -31,6 +32,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
 
   public static final String MODULE_NAME = "RNBootSplash";
   private static final int ANIMATION_DURATION = 220;
+  private static final String TAG = "🌊 RNBootSplash";
 
   private enum Status {
     VISIBLE,
@@ -147,17 +149,19 @@ private void show(final RNBootSplashTask task) {
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
+        Log.d(TAG, "run show " + task.getBootsplashName());
         addBootsplashName(task.getBootsplashName());
         final Activity activity = getReactApplicationContext().getCurrentActivity();
         final Promise promise = task.getPromise();
 
         if (activity == null || activity.isFinishing()) {
+          promise.resolve("activity_finishing");
           waitAndShiftNextTask();
           return;
         }
 
         if (activity.findViewById(R.id.bootsplash_layout_id) != null) {
-          promise.resolve(true); // splash screen is already visible
+          promise.resolve("already_visible"); // splash screen is already visible
           shiftNextTask();
           return;
         }
@@ -201,25 +205,29 @@ private void hide(final RNBootSplashTask task) {
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
+        Log.d(TAG, "run hide " + task.getBootsplashName());
         removeBootsplashName(task.getBootsplashName());
 
+        final Promise promise = task.getPromise();
+
         if (hasBootsplashToDisplay()) {
+          promise.resolve("shift_next");
           waitAndShiftNextTask(); // splash screen should still be displayed for some BootsplashNames
           return;
         }
 
         final Activity activity = getReactApplicationContext().getCurrentActivity();
-        final Promise promise = task.getPromise();
 
         if (activity == null || activity.isFinishing()) {
+          promise.resolve("activity_finishing");
           waitAndShiftNextTask();
           return;
         }
 
         final LinearLayout layout = activity.findViewById(R.id.bootsplash_layout_id);
 
         if (layout == null) {
-          promise.resolve(true); // splash screen is already hidden
+          promise.resolve("already_hidden"); // splash screen is already hidden
           shiftNextTask();
           return;
         }
@@ -262,6 +270,7 @@ public void show(final boolean fade, final String bootsplashName, final Promise
     if (mDrawableResId == -1) {
       promise.reject("uninitialized_module", "react-native-bootsplash has not been initialized");
     } else {
+      Log.d(TAG, "show " + bootsplashName);
       mTaskQueue.add(new RNBootSplashTask(RNBootSplashTask.Type.SHOW, fade, bootsplashName, promise));
       shiftNextTask();
     }
@@ -272,6 +281,7 @@ public void hide(final boolean fade, final String bootsplashName, final Promise
     if (mDrawableResId == -1) {
       promise.reject("uninitialized_module", "react-native-bootsplash has not been initialized");
     } else {
+      Log.d(TAG, "hide " + bootsplashName);
       mTaskQueue.add(new RNBootSplashTask(RNBootSplashTask.Type.HIDE, fade, bootsplashName, promise));
       shiftNextTask();
     }
@@ -297,12 +307,14 @@ protected void addBootsplashName(String name) {
     if (!mBootsplashNames.contains(name)) {
       mBootsplashNames.add(name);
     }
+    Log.d(TAG, "mBootsplashNames = " + mBootsplashNames.toString());
   }
 
   protected void removeBootsplashName(String name) {
     if (mBootsplashNames.contains(name)) {
       mBootsplashNames.remove(name);
     }
+    Log.d(TAG, "mBootsplashNames = " + mBootsplashNames.toString());
   }
 
   protected boolean hasBootsplashToDisplay() {

dist/typescript/index.d.ts

@@ -3,8 +3,9 @@ export declare type Config = {
     fade?: boolean;
     bootsplashName?: string;
 };
-export declare function show(config?: Config): Promise<void>;
-export declare function hide(config?: Config): Promise<void>;
+export declare type ResultStatus = boolean | "activity_finishing" | "already_visible" | "already_hidden" | "shift_next";
+export declare function show(config?: Config): Promise<ResultStatus>;
+export declare function hide(config?: Config): Promise<ResultStatus>;
 export declare function getVisibilityStatus(): Promise<VisibilityStatus>;
 declare const _default: {
     show: typeof show;

ios/RNBootSplash.m

@@ -52,12 +52,14 @@ + (void)addBootsplashName:(NSString * _Nonnull)name {
   if ([_bootsplashNames indexOfObject:name] == NSNotFound) {
     [_bootsplashNames addObject:name];
   }
+  NSLog(@"🌊 RNBootSplash _bootsplashNames = %@", _bootsplashNames);
 }
 
 + (void)removeBootsplashName:(NSString * _Nonnull)name {
   if ([_bootsplashNames indexOfObject:name] != NSNotFound) {
     [_bootsplashNames removeObject:name];
   }
+  NSLog(@"🌊 RNBootSplash _bootsplashNames = %@", _bootsplashNames);
 }
 
 + (BOOL)hasBootsplashToDisplay {
@@ -155,7 +157,7 @@ + (void)shiftNextTask {
 + (void)showWithTask:(RNBootSplashTask *)task {
   [RNBootSplash addBootsplashName:task.bootsplashName];
   if (_splashVC != nil) {
-    task.resolve(@(true)); // splash screen is already visible
+    task.resolve(@("already_visible")); // splash screen is already visible
     [self shiftNextTask];
   } else {
     _status = RNBootSplashStatusTransitioningToVisible;
@@ -178,10 +180,10 @@ + (void)showWithTask:(RNBootSplashTask *)task {
 + (void)hideWithTask:(RNBootSplashTask *)task {
   [RNBootSplash removeBootsplashName:task.bootsplashName];
   if ([self hasBootsplashToDisplay]) {
-    task.resolve(@(true)); // splash screen should still be displayed for some BootsplashNames
+    task.resolve(@("shift_next")); // splash screen should still be displayed for some BootsplashNames
     [self shiftNextTask];
   } else if (_splashVC == nil) {
-    task.resolve(@(true)); // splash screen is already hidden
+    task.resolve(@("already_hidden")); // splash screen is already hidden
     [self shiftNextTask];
   } else {
     _status = RNBootSplashStatusTransitioningToHidden;

src/index.ts

@@ -2,25 +2,31 @@ import { NativeModules } from "react-native";
 
 export type VisibilityStatus = "visible" | "hidden" | "transitioning";
 export type Config = { fade?: boolean; bootsplashName?: string };
+export type ResultStatus =
+  | boolean
+  | "activity_finishing"
+  | "already_visible"
+  | "already_hidden"
+  | "shift_next";
 
 const NativeModule: {
-  show: (fade: boolean, bootsplashName: string) => Promise<true>;
-  hide: (fade: boolean, bootsplashName: string) => Promise<true>;
+  show: (fade: boolean, bootsplashName: string) => Promise<ResultStatus>;
+  hide: (fade: boolean, bootsplashName: string) => Promise<ResultStatus>;
   getVisibilityStatus: () => Promise<VisibilityStatus>;
 } = NativeModules.RNBootSplash;
 
-export function show(config: Config = {}): Promise<void> {
+export function show(config: Config = {}): Promise<ResultStatus> {
   return NativeModule.show(
     { fade: false, ...config }.fade,
     config.bootsplashName ?? "global",
-  ).then(() => {});
+  ).then((result) => result);
 }
 
-export function hide(config: Config = {}): Promise<void> {
+export function hide(config: Config = {}): Promise<ResultStatus> {
   return NativeModule.hide(
     { fade: false, ...config }.fade,
     config.bootsplashName ?? "global",
-  ).then(() => {});
+  ).then((result) => result);
 }
 
 export function getVisibilityStatus(): Promise<VisibilityStatus> {