From 43332e56c8dc3eb0d04e4bcbcc3ffa4fd9009801 Mon Sep 17 00:00:00 2001
From: Mathieu Acthernoene <zoontek@gmail.com>
Date: Sun, 12 Nov 2023 12:24:20 +0100
Subject: [PATCH] 5.1.2 (#511)

---
 .../rnbootsplash/RNBootSplashDialog.java      |  4 -
 .../rnbootsplash/RNBootSplashModuleImpl.java  | 90 ++++++++++---------
 .../res/drawable-v23/compat_splash_screen.xml | 20 +++++
 .../compat_splash_screen_oneui_4.xml          |  9 +-
 android/src/main/res/values-v23/styles.xml    |  4 -
 android/src/main/res/values-v31/styles.xml    |  2 +-
 android/src/main/res/values/styles.xml        |  7 +-
 example/ios/Podfile.lock                      |  4 +-
 package.json                                  |  2 +-
 9 files changed, 80 insertions(+), 62 deletions(-)
 create mode 100644 android/src/main/res/drawable-v23/compat_splash_screen.xml

diff --git a/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashDialog.java b/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashDialog.java
index 374b2625..179a54cb 100644
--- a/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashDialog.java
+++ b/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashDialog.java
@@ -24,10 +24,6 @@ public RNBootSplashDialog(@NonNull Activity activity, @StyleRes int themeResId,
     setCanceledOnTouchOutside(false);
   }
 
-  public boolean getFade() {
-    return mFade;
-  }
-
   @Override
   public void onBackPressed() {
     Activity activity = getOwnerActivity();
diff --git a/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashModuleImpl.java b/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashModuleImpl.java
index bf543375..3c78cd7e 100644
--- a/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashModuleImpl.java
+++ b/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashModuleImpl.java
@@ -39,7 +39,9 @@ public class RNBootSplashModuleImpl {
   private static int mThemeResId = -1;
 
   @Nullable
-  private static RNBootSplashDialog mDialog = null;
+  private static RNBootSplashDialog mInitialDialog = null;
+  @Nullable
+  private static RNBootSplashDialog mFadeOutDialog = null;
 
   protected static void init(
     @Nullable final Activity activity,
@@ -110,12 +112,12 @@ public void onSplashScreenExit(@NonNull SplashScreenView view) {
         .setOnExitAnimationListener(listener);
     }
 
-    mDialog = new RNBootSplashDialog(activity, mThemeResId, false);
+    mInitialDialog = new RNBootSplashDialog(activity, mThemeResId, false);
 
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        mDialog.show(new Runnable() {
+        mInitialDialog.show(new Runnable() {
           @Override
           public void run() {
             mShouldKeepOnScreen = false;
@@ -126,14 +128,20 @@ public void run() {
   }
 
   public static void onHostResume() {
-    if (mDialog != null) {
-      mDialog.show();
+    if (mInitialDialog != null) {
+      mInitialDialog.show();
+    }
+    if (mFadeOutDialog != null) {
+      mFadeOutDialog.show();
     }
   }
 
   public static void onHostPause() {
-    if (mDialog != null) {
-      mDialog.dismiss();
+    if (mInitialDialog != null) {
+      mInitialDialog.dismiss();
+    }
+    if (mFadeOutDialog != null) {
+      mFadeOutDialog.dismiss();
     }
   }
 
@@ -174,53 +182,51 @@ public void run() {
           return;
         }
 
-        if (mDialog != null && mDialog.getFade()) {
+        if (mFadeOutDialog != null) {
           return; // wait until fade out end for clearPromiseQueue
         }
 
-        if (mDialog == null) {
+        if (mInitialDialog == null) {
           clearPromiseQueue();
           return; // both initial and fade out dialog are hidden
         }
 
-        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 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;
-
-          tmp[0].dismiss(new Runnable() {
+        if (!fade) {
+          mInitialDialog.dismiss(new Runnable() {
             @Override
             public void run() {
-              tmp[0] = null;
+              mInitialDialog = null;
               clearPromiseQueue();
             }
           });
+
+          return;
         }
+
+        // Create a new Dialog instance with fade out animation
+        mFadeOutDialog = new RNBootSplashDialog(activity, mThemeResId, true);
+
+        mFadeOutDialog.show(new Runnable() {
+
+          @Override
+          public void run() {
+            mInitialDialog.dismiss(new Runnable() {
+
+              @Override
+              public void run() {
+                mInitialDialog = null;
+
+                mFadeOutDialog.dismiss(new Runnable() {
+                  @Override
+                  public void run() {
+                    mFadeOutDialog = null;
+                    clearPromiseQueue();
+                  }
+                });
+              }
+            });
+          }
+        });
       }
     });
   }
@@ -274,6 +280,6 @@ public static void hide(
   }
 
   public static void isVisible(final Promise promise) {
-    promise.resolve(mShouldKeepOnScreen || mDialog != null);
+    promise.resolve(mShouldKeepOnScreen || mInitialDialog != null || mFadeOutDialog != null);
   }
 }
diff --git a/android/src/main/res/drawable-v23/compat_splash_screen.xml b/android/src/main/res/drawable-v23/compat_splash_screen.xml
new file mode 100644
index 00000000..d8eb7db9
--- /dev/null
+++ b/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>
diff --git a/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml b/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml
index 95e0779a..8463898f 100644
--- a/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml
+++ b/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml
@@ -13,7 +13,10 @@
         android:width="144dp"
         android:height="144dp" />
 
-    <item android:gravity="fill" android:bottom="60dp">
-        <bitmap android:src="?bootSplashBrand" android:gravity="bottom|center_horizontal" />
-    </item>
+    <item
+        android:drawable="?bootSplashBrand"
+        android:gravity="bottom|center_horizontal"
+        android:width="200dp"
+        android:height="80dp"
+        android:bottom="60dp" />
 </layer-list>
diff --git a/android/src/main/res/values-v23/styles.xml b/android/src/main/res/values-v23/styles.xml
index 8eae61e3..738332ae 100644
--- a/android/src/main/res/values-v23/styles.xml
+++ b/android/src/main/res/values-v23/styles.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <style name="Theme.BootSplash.Branded" parent="Theme.BootSplash.DayNight">
-        <item name="bootSplashBrand">@null</item>
-    </style>
-
     <style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.Common">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowTranslucentNavigation">true</item>
diff --git a/android/src/main/res/values-v31/styles.xml b/android/src/main/res/values-v31/styles.xml
index 43c80677..c54537a1 100644
--- a/android/src/main/res/values-v31/styles.xml
+++ b/android/src/main/res/values-v31/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <style name="Theme.BootSplash" parent="Theme.BootSplash.Branded">
+    <style name="Theme.BootSplash" parent="Theme.BootSplash.DayNight">
         <item name="android:windowSplashScreenBackground">?bootSplashBackground</item>
         <item name="android:windowSplashScreenAnimatedIcon">?bootSplashLogo</item>
         <item name="android:windowSplashScreenBrandingImage">?bootSplashBrand</item>
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
index 7407bc1e..7a186559 100644
--- a/android/src/main/res/values/styles.xml
+++ b/android/src/main/res/values/styles.xml
@@ -14,16 +14,13 @@
     <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>
+        <item name="bootSplashBrand">@drawable/transparent_pixel</item>
     </style>
 
     <style name="Theme.BootSplash.DayNight" parent="Theme.BootSplash.Common">
     </style>
 
-    <style name="Theme.BootSplash.Branded" parent="Theme.BootSplash.DayNight">
-        <item name="bootSplashBrand">@drawable/transparent_pixel</item>
-    </style>
-
-    <style name="Theme.BootSplash" parent="Theme.BootSplash.Branded">
+    <style name="Theme.BootSplash" parent="Theme.BootSplash.DayNight">
         <item name="bootSplashBackground">?android:colorBackground</item>
         <item name="bootSplashLogo">@android:drawable/sym_def_app_icon</item>
         <item name="postBootSplashTheme">?android:attr/theme</item>
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index ebb42d62..316a6932 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -485,7 +485,7 @@ PODS:
     - React-jsi (= 0.72.6)
     - React-logger (= 0.72.6)
     - React-perflogger (= 0.72.6)
-  - RNBootSplash (5.1.1):
+  - RNBootSplash (5.1.2):
     - React-Core
   - SocketRocket (0.6.1)
   - Yoga (1.14.0)
@@ -709,7 +709,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: f23e337008403341177fc52ee4ca94e442c17ede
   React-utils: fa59c9a3375fb6f4aeb66714fd3f7f76b43a9f16
   ReactCommon: dd03c17275c200496f346af93a7b94c53f3093a4
-  RNBootSplash: b1af20a3759c440ca1ecb5dfdee2120f2ee1804b
+  RNBootSplash: e5534cb3ab82a525da2930b3cd377099e4dbc89e
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: b76f1acfda8212aa16b7e26bcce3983230c82603
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
diff --git a/package.json b/package.json
index 4225ac88..0fe8b5c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",