react-native-bootsplash 5.1.0-beta.0 → 5.1.0-beta.2

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

@@ -0,0 +1,123 @@
+package com.zoontek.rnbootsplash;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+
+public class RNBootSplashDialog extends Dialog {
+
+  private final boolean mFade;
+
+  public RNBootSplashDialog(@NonNull Activity activity, @StyleRes int themeResId, boolean fade) {
+    super(activity, themeResId);
+
+    mFade = fade;
+
+    setOwnerActivity(activity);
+    setCancelable(false);
+    setCanceledOnTouchOutside(false);
+  }
+
+  public boolean getFade() {
+    return mFade;
+  }
+
+  @Override
+  public void onBackPressed() {
+    Activity activity = getOwnerActivity();
+
+    if (activity != null) {
+      activity.moveTaskToBack(true);
+    }
+  }
+
+  @Override
+  public void dismiss() {
+    if (!isShowing()) {
+      return;
+    }
+
+    try {
+      super.dismiss();
+    } catch (Exception ignored) {}
+  }
+
+  public void dismiss(@NonNull final Runnable callback) {
+    if (!isShowing()) {
+      callback.run();
+      return;
+    }
+
+    setOnDismissListener(new OnDismissListener() {
+      @Override
+      public void onDismiss(DialogInterface dialog) {
+        callback.run();
+      }
+    });
+
+    try {
+      super.dismiss();
+    } catch (Exception ignored) {
+      callback.run();
+    }
+  }
+
+  @Override
+  public void show() {
+    if (isShowing()) {
+      return;
+    }
+
+    try {
+      super.show();
+    } catch (Exception ignored) {}
+  }
+
+  public void show(@NonNull final Runnable callback) {
+    if (isShowing()) {
+      callback.run();
+      return;
+    }
+
+    setOnShowListener(new DialogInterface.OnShowListener() {
+      @Override
+      public void onShow(DialogInterface dialog) {
+        callback.run();
+      }
+    });
+
+    try {
+      super.show();
+    } catch (Exception ignored) {
+      callback.run();
+    }
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    final Window window = getWindow();
+
+    if (window != null) {
+      window.setLayout(
+        WindowManager.LayoutParams.MATCH_PARENT,
+        WindowManager.LayoutParams.MATCH_PARENT
+      );
+
+      window.setWindowAnimations(mFade
+        ? R.style.BootSplashFadeOutAnimation
+        : R.style.BootSplashNoAnimation);
+
+      if (RNBootSplashModuleImpl.isSamsungOneUI4()) {
+        window.setBackgroundDrawableResource(R.drawable.compat_splash_screen_oneui_4);
+      }
+    }
+
+    super.onCreate(savedInstanceState);
+  }
+}

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

@@ -1,24 +1,16 @@
 package com.zoontek.rnbootsplash;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
-import android.view.animation.AccelerateInterpolator;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.window.SplashScreen;
 import android.window.SplashScreenView;
 
-import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
@@ -46,56 +38,8 @@ public class RNBootSplashModuleImpl {
   @StyleRes
   private static int mThemeResId = -1;
 
-  @NonNull
-  private static View getContentView(@NonNull Activity activity) {
-    return activity.findViewById(android.R.id.content);
-  }
-
   @Nullable
-  private static ViewGroup getRootView(@NonNull Activity activity) {
-    return (ViewGroup) getContentView(activity).getRootView();
-  }
-
-  @Nullable
-  private static View getSplashScreenView(@NonNull Activity activity) {
-    final ViewGroup rootView = getRootView(activity);
-
-    return rootView != null
-      ? rootView.findViewById(R.id.bootsplash_layout)
-      : null;
-  }
-
-  private static void removeSplashScreenView(@NonNull Activity activity) {
-    final ViewGroup rootView = getRootView(activity);
-    final View splashScreenView = getSplashScreenView(activity);
-
-    if (rootView != null && splashScreenView != null) {
-      rootView.removeView(splashScreenView);
-    }
-  }
-
-  private static void clearPromiseQueue() {
-    while (!mPromiseQueue.isEmpty()) {
-      Promise promise = mPromiseQueue.shift();
-
-      if (promise != null) {
-        promise.resolve(true);
-      }
-    }
-  }
-
-  // From https://stackoverflow.com/a/61062773
-  public static boolean isSamsungOneUI4() {
-    String name = "SEM_PLATFORM_INT";
-
-    try {
-      Field field = Build.VERSION.class.getDeclaredField(name);
-      int version = (field.getInt(null) - 90000) / 10000;
-      return version == 4;
-    } catch (Exception ignored) {
-      return false;
-    }
-  }
+  private static RNBootSplashDialog mDialog = null;
 
   protected static void init(
     @Nullable final Activity activity,
@@ -113,13 +57,6 @@ public class RNBootSplashModuleImpl {
       return;
     }
 
-    ViewGroup rootView = getRootView(activity);
-
-    if (rootView == null) {
-      FLog.w(ReactConstants.TAG, NAME + ": Ignored initialization, current activity rootView is null.");
-      return;
-    }
-
     // Apply postBootSplashTheme
     TypedValue typedValue = new TypedValue();
     Resources.Theme currentTheme = activity.getTheme();
@@ -133,28 +70,8 @@ public class RNBootSplashModuleImpl {
       }
     }
 
-    @Nullable Integer backgroundResId = null;
-    @Nullable Integer backgroundColor = null;
-    @Nullable Drawable logo = null;
-    @Nullable Drawable brand = null;
-
-    if (currentTheme.resolveAttribute(R.attr.bootSplashBackground, typedValue, true)) {
-      backgroundResId = typedValue.resourceId;
-      backgroundColor = typedValue.data;
-    }
-
-    if (currentTheme.resolveAttribute(R.attr.bootSplashLogo, typedValue, true)
-      && typedValue.resourceId != Resources.ID_NULL) {
-      logo = currentTheme.getDrawable(typedValue.resourceId);
-    }
-
-    if (currentTheme.resolveAttribute(R.attr.bootSplashBrand, typedValue, true)
-      && typedValue.resourceId != Resources.ID_NULL) {
-      brand = currentTheme.getDrawable(typedValue.resourceId);
-    }
-
-    // Keep the splash screen on-screen until View is added
-    final View contentView = getContentView(activity);
+    // Keep the splash screen on-screen until Dialog is shown
+    final View contentView = activity.findViewById(android.R.id.content);
     mShouldKeepOnScreen = true;
 
     contentView
@@ -177,46 +94,57 @@ public class RNBootSplashModuleImpl {
     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…)
+      SplashScreen.OnExitAnimationListener listener = new SplashScreen.OnExitAnimationListener() {
+        @Override
+        public void onSplashScreenExit(@NonNull SplashScreenView view) {
+          view.remove(); // Remove it immediately, without animation
+
+          activity
+            .getSplashScreen()
+            .clearOnExitAnimationListener();
+        }
+      };
+
       activity
         .getSplashScreen()
-        .setOnExitAnimationListener(new SplashScreen.OnExitAnimationListener() {
-          @Override
-          public void onSplashScreenExit(@NonNull SplashScreenView splashScreenView) {
-            splashScreenView.remove(); // Remove it immediately, without animation
-
-            activity
-              .getSplashScreen()
-              .clearOnExitAnimationListener();
-          }
-        });
+        .setOnExitAnimationListener(listener);
     }
 
-    @LayoutRes int layout = isSamsungOneUI4()
-      ? R.layout.splash_screen_view_samsung_oneui_4
-      : R.layout.splash_screen_view;
+    mDialog = new RNBootSplashDialog(activity, mThemeResId, false);
 
-    View splashScreenView = FrameLayout.inflate(activity, layout, null);
+    UiThreadUtil.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        mDialog.show(new Runnable() {
+          @Override
+          public void run() {
+            mShouldKeepOnScreen = false;
+          }
+        });
+      }
+    });
+  }
 
-    if (backgroundResId != null && backgroundResId != Resources.ID_NULL) {
-      splashScreenView.setBackgroundResource(backgroundResId);
-    } else if (backgroundColor != null) {
-      splashScreenView.setBackgroundColor(backgroundColor);
-    } else {
-      splashScreenView.setBackground(activity.getWindow().getDecorView().getBackground());
+  public static void onHostResume() {
+    if (mDialog != null) {
+      mDialog.show();
     }
+  }
 
-    if (logo != null) {
-      ImageView logoView = splashScreenView.findViewById(R.id.bootsplash_logo);
-      logoView.setImageDrawable(logo);
+  public static void onHostPause() {
+    if (mDialog != null) {
+      mDialog.dismiss();
     }
+  }
 
-    if (brand != null) {
-      ImageView brandView = splashScreenView.findViewById(R.id.bootsplash_brand);
-      brandView.setImageDrawable(brand);
-    }
+  private static void clearPromiseQueue() {
+    while (!mPromiseQueue.isEmpty()) {
+      Promise promise = mPromiseQueue.shift();
 
-    rootView.addView(splashScreenView);
-    mShouldKeepOnScreen = false; // unfreeze the system thread UI
+      if (promise != null) {
+        promise.resolve(true);
+      }
+    }
   }
 
   private static void hideAndClearPromiseQueue(
@@ -246,37 +174,70 @@ public class RNBootSplashModuleImpl {
           return;
         }
 
-        View splashScreenView  = getSplashScreenView(activity);
-
-        if (splashScreenView == null) {
-          clearPromiseQueue();
-          return;
+        if (mDialog != null && mDialog.getFade()) {
+          return; // wait until fade out end for clearPromiseQueue
         }
 
-        if (!fade) {
-          removeSplashScreenView(activity);
+        if (mDialog == null) {
           clearPromiseQueue();
-          return;
+          return; // both initial and fade out dialog are hidden
         }
 
-        splashScreenView
-          .animate()
-          .setDuration(250)
-          .alpha(0)
-          .setInterpolator(new AccelerateInterpolator())
-          .setListener(new AnimatorListenerAdapter() {
+        final RNBootSplashDialog[] tmp = {mDialog};
+
+        if (fade) {
+          // Create a new Dialog instance with fade out animation
+          mDialog = new RNBootSplashDialog(activity, mThemeResId, true);
+
+          mDialog.show(new Runnable() {
+
             @Override
-            public void onAnimationEnd(Animator animation) {
-              super.onAnimationEnd(animation);
+            public void run() {
+              tmp[0].dismiss(new Runnable() {
+
+                @Override
+                public void run() {
+                  tmp[0] = null;
+
+                  mDialog.dismiss(new Runnable() {
+                    @Override
+                    public void run() {
+                      mDialog = null;
+                      clearPromiseQueue();
+                    }
+                  });
+                }
+              });
+            }
+          });
+        } else {
+          mDialog = null;
 
-              removeSplashScreenView(activity);
+          tmp[0].dismiss(new Runnable() {
+            @Override
+            public void run() {
+              tmp[0] = null;
               clearPromiseQueue();
             }
           });
+        }
       }
     });
   }
 
+  // From https://stackoverflow.com/a/61062773
+  public static boolean isSamsungOneUI4() {
+    String name = "SEM_PLATFORM_INT";
+
+    try {
+      Field field = Build.VERSION.class.getDeclaredField(name);
+      int version = (field.getInt(null) - 90000) / 10000;
+      return version == 4;
+    } catch (Exception ignored) {
+      return false;
+    }
+  }
+
   public static Map<String, Object> getConstants(final ReactApplicationContext reactContext) {
     final Resources resources = reactContext.getResources();
     HashMap<String, Object> constants = new HashMap<>();
@@ -291,7 +252,8 @@ public class RNBootSplashModuleImpl {
       ? PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(statusBarHeightResId))
       : 0;
 
-    float navigationBarHeight = navigationBarHeightResId > 0 && !ViewConfiguration.get(reactContext).hasPermanentMenuKey()
+    float navigationBarHeight = navigationBarHeightResId > 0 &&
+      !ViewConfiguration.get(reactContext).hasPermanentMenuKey()
       ? PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(navigationBarHeightResId))
       : 0;
 
@@ -311,15 +273,7 @@ public class RNBootSplashModuleImpl {
     hideAndClearPromiseQueue(reactContext, fade);
   }
 
-  public static void isVisible(
-    final ReactApplicationContext reactContext,
-    final Promise promise
-  ) {
-    if (mShouldKeepOnScreen) {
-      promise.resolve(true);
-    } else {
-      final Activity activity = reactContext.getCurrentActivity();
-      promise.resolve(activity != null && getSplashScreenView(activity) != null);
-    }
+  public static void isVisible(final Promise promise) {
+    promise.resolve(mShouldKeepOnScreen || mDialog != null);
   }
 }

package/android/src/main/res/drawable/compat_splash_screen.xml

@@ -6,14 +6,10 @@
     </item>
 
     <item android:gravity="fill">
-        <bitmap
-            android:src="?bootSplashLogo"
-            android:gravity="center" />
+        <bitmap android:src="?bootSplashLogo" android:gravity="center" />
     </item>
 
     <item android:gravity="fill" android:bottom="60dp">
-        <bitmap
-            android:src="?bootSplashBrand"
-            android:gravity="center_horizontal|bottom" />
+        <bitmap android:src="?bootSplashBrand" android:gravity="bottom|center_horizontal" />
     </item>
 </layer-list>

package/android/src/main/res/drawable/compat_splash_screen_oneui_4.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:gravity="fill">
+        <color android:color="?attr/bootSplashBackground" />
+    </item>
+
+    <item android:gravity="fill">
+        <bitmap android:src="?bootSplashLogo" android:gravity="center" />
+    </item>
+
+    <item android:gravity="fill" android:bottom="60dp">
+        <bitmap android:src="?bootSplashBrand" android:gravity="bottom|center_horizontal" />
+    </item>
+</layer-list>

package/android/src/main/res/drawable-v23/compat_splash_screen.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:gravity="fill">
+        <color android:color="?attr/bootSplashBackground" />
+    </item>
+
+    <item
+        android:drawable="?bootSplashLogo"
+        android:gravity="center"
+        android:width="288dp"
+        android:height="288dp" />
+
+    <item
+        android:drawable="?bootSplashBrand"
+        android:gravity="bottom|center_horizontal"
+        android:width="200dp"
+        android:height="80dp"
+        android:bottom="60dp" />
+</layer-list>

package/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:gravity="fill">
+        <color android:color="?attr/bootSplashBackground" />
+    </item>
+
+    <!-- There's an issue with logo size on Samsung OneUI v4
+     We need to render it 2 times smaller (288 / 2 = 144) -->
+    <item
+        android:drawable="?bootSplashLogo"
+        android:gravity="center"
+        android:width="144dp"
+        android:height="144dp" />
+
+    <item
+        android:drawable="?bootSplashBrand"
+        android:gravity="bottom|center_horizontal"
+        android:width="200dp"
+        android:height="80dp"
+        android:bottom="60dp" />
+</layer-list>

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

@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
+    <style name="BootSplashNoAnimation">
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@null</item>
+    </style>
+
+    <style name="BootSplashFadeOutAnimation">
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@anim/bootsplash_fade_out</item>
+    </style>
+
     <style name="Theme.BootSplash.Common" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:opacity">opaque</item>
         <item name="android:windowBackground">@drawable/compat_splash_screen</item>

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

@@ -2,6 +2,7 @@ package com.zoontek.rnbootsplash;
 
 import androidx.annotation.NonNull;
 
+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;
@@ -9,10 +10,11 @@ import com.facebook.react.module.annotations.ReactModule;
 import java.util.Map;
 
 @ReactModule(name = RNBootSplashModuleImpl.NAME)
-public class RNBootSplashModule extends NativeRNBootSplashSpec {
+public class RNBootSplashModule extends NativeRNBootSplashSpec implements LifecycleEventListener {
 
   public RNBootSplashModule(ReactApplicationContext reactContext) {
     super(reactContext);
+    reactContext.addLifecycleEventListener(this);
   }
 
   @Override
@@ -26,6 +28,19 @@ public class RNBootSplashModule extends NativeRNBootSplashSpec {
     return RNBootSplashModuleImpl.getConstants(getReactApplicationContext());
   }
 
+  @Override
+  public void onHostDestroy() {}
+
+  @Override
+  public void onHostResume() {
+    RNBootSplashModuleImpl.onHostResume();
+  }
+
+  @Override
+  public void onHostPause() {
+    RNBootSplashModuleImpl.onHostPause();
+  }
+
   @Override
   public void hide(boolean fade, Promise promise) {
     RNBootSplashModuleImpl.hide(getReactApplicationContext(), fade, promise);
@@ -33,6 +48,6 @@ public class RNBootSplashModule extends NativeRNBootSplashSpec {
 
   @Override
   public void isVisible(Promise promise) {
-    RNBootSplashModuleImpl.isVisible(getReactApplicationContext(), promise);
+    RNBootSplashModuleImpl.isVisible(promise);
   }
 }

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

@@ -3,6 +3,7 @@ package com.zoontek.rnbootsplash;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -12,10 +13,11 @@ import com.facebook.react.module.annotations.ReactModule;
 import java.util.Map;
 
 @ReactModule(name = RNBootSplashModuleImpl.NAME)
-public class RNBootSplashModule extends ReactContextBaseJavaModule {
+public class RNBootSplashModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
   public RNBootSplashModule(ReactApplicationContext reactContext) {
     super(reactContext);
+    reactContext.addLifecycleEventListener(this);
   }
 
   @NonNull
@@ -30,6 +32,19 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule {
     return RNBootSplashModuleImpl.getConstants(getReactApplicationContext());
   }
 
+  @Override
+  public void onHostDestroy() {}
+
+  @Override
+  public void onHostResume() {
+    RNBootSplashModuleImpl.onHostResume();
+  }
+
+  @Override
+  public void onHostPause() {
+    RNBootSplashModuleImpl.onHostPause();
+  }
+
   @ReactMethod
   public void hide(boolean fade, Promise promise) {
     RNBootSplashModuleImpl.hide(getReactApplicationContext(), fade, promise);
@@ -37,6 +52,6 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule {
 
   @ReactMethod
   public void isVisible(Promise promise) {
-    RNBootSplashModuleImpl.isVisible(getReactApplicationContext(), promise);
+    RNBootSplashModuleImpl.isVisible(promise);
   }
 }