react-native-bootsplash 4.0.0-alpha.1 → 4.0.0-beta.1

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

@@ -1,52 +1,50 @@
 package com.zoontek.rnbootsplash;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Resources;
 import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.Window;
+import android.view.animation.AccelerateInterpolator;
 
-import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
+import androidx.core.splashscreen.SplashScreen;
+import androidx.core.splashscreen.SplashScreenViewProvider;
 
+import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.LifecycleEventListener;
 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.bridge.UiThreadUtil;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.PixelUtil;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
-@ReactModule(name = RNBootSplashModule.MODULE_NAME)
+@ReactModule(name = RNBootSplashModule.NAME)
 public class RNBootSplashModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
-  public static final String MODULE_NAME = "RNBootSplash";
+  public static final String NAME = "RNBootSplash";
   private static final int ANIMATION_DURATION = 220;
 
   private enum Status {
     VISIBLE,
     HIDDEN,
-    TRANSITIONING_TO_VISIBLE,
-    TRANSITIONING_TO_HIDDEN
+    TRANSITIONING
   }
 
-  private static int mBootThemeResId = -1;
+  @Nullable
+  private static SplashScreen mSplashScreen = null;
+
   private static final ArrayList<RNBootSplashTask> mTaskQueue = new ArrayList<>();
   private static Status mStatus = Status.HIDDEN;
   private static boolean mIsAppInBackground = false;
-
-  @Nullable
-  private static RNBootSplashDialog mDialog = null;
+  private static boolean mShouldFade = false;
+  private static boolean mShouldKeepOnScreen = true;
 
   public RNBootSplashModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -55,73 +53,46 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
 
   @Override
   public String getName() {
-    return MODULE_NAME;
+    return NAME;
   }
 
-  @Override
-  public @Nullable Map<String, Object> getConstants() {
-    final HashMap<String, Object> constants = new HashMap<>();
-    final Context context = getReactApplicationContext();
-    final Resources resources = context.getResources();
-    final boolean hasMenuKey = ViewConfiguration.get(context).hasPermanentMenuKey();
-
-    final int statusBarHeightResId =
-      resources.getIdentifier("status_bar_height", "dimen", "android");
-    final int navigationBarHeightResId =
-      resources.getIdentifier("navigation_bar_height", "dimen", "android");
-
-    final float statusBarHeight =
-      statusBarHeightResId > 0
-        ? Math.round(PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(statusBarHeightResId)))
-        : 0;
-    final float navigationBarHeight =
-      navigationBarHeightResId > 0 && !hasMenuKey
-        ?  Math.round(PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(navigationBarHeightResId)))
-        : 0;
-
-    constants.put("statusBarHeight", statusBarHeight);
-    constants.put("navigationBarHeight", navigationBarHeight);
-
-    return constants;
-  }
-
-  protected static void init(final Activity activity,
-                             @StyleRes final int bootThemeResId,
-                             @ColorRes final int backgroundColorResId) {
-    UiThreadUtil.runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        if (activity == null
-          || activity.isFinishing()
-          || mDialog != null) {
-          return;
-        }
-
-        final int backgroundColor = activity.getResources().getColor(backgroundColorResId);
-        final View decorView = activity.getWindow().getDecorView();
-
-        mBootThemeResId = bootThemeResId;
-        mStatus = Status.VISIBLE;
-        mDialog = new RNBootSplashDialog(activity, mBootThemeResId);
-
-        mDialog.setOnShowListener(new DialogInterface.OnShowListener() {
-          @Override
-          public void onShow(DialogInterface dialog) {
-            decorView.setBackgroundColor(backgroundColor);
-          }
-        });
+  protected static void init(@Nullable final Activity activity) {
+    if (activity == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        NAME + ": Ignored initialization, current activity is null.");
+      return;
+    }
 
-        Window window = mDialog.getWindow();
+    mSplashScreen = SplashScreen.installSplashScreen(activity);
+    mStatus = Status.VISIBLE;
 
-        if (window != null) {
-          window.setWindowAnimations(R.style.bootsplash_no_animation);
-        }
+    mSplashScreen.setKeepVisibleCondition(new SplashScreen.KeepOnScreenCondition() {
+      @Override
+      public boolean shouldKeepOnScreen() {
+        return mShouldKeepOnScreen;
+      }
+    });
 
-        if (!mDialog.isShowing()) {
-          mDialog.show();
-        } else {
-          decorView.setBackgroundColor(backgroundColor);
-        }
+    mSplashScreen.setOnExitAnimationListener(new SplashScreen.OnExitAnimationListener() {
+      @Override
+      public void onSplashScreenExit(@NonNull SplashScreenViewProvider splashScreenViewProvider) {
+        View splashScreenView = splashScreenViewProvider.getView();
+
+        splashScreenView
+          .animate()
+          // Crappy hack to avoid automatic layout transitions
+          .setDuration(mShouldFade ? ANIMATION_DURATION: 0)
+          .setStartDelay(mShouldFade ? 0 : ANIMATION_DURATION)
+          .alpha(0.0f)
+          .setInterpolator(new AccelerateInterpolator())
+          .setListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+              super.onAnimationEnd(animation);
+              splashScreenViewProvider.remove();
+            }
+          }).start();
       }
     });
   }
@@ -143,27 +114,17 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
   }
 
   private void shiftNextTask() {
-    boolean shouldSkipTick = mBootThemeResId == -1
-      || mStatus == Status.TRANSITIONING_TO_VISIBLE
-      || mStatus == Status.TRANSITIONING_TO_HIDDEN
+    boolean shouldSkipTick = mStatus == Status.TRANSITIONING
       || mIsAppInBackground
       || mTaskQueue.isEmpty();
 
     if (shouldSkipTick) return;
 
     RNBootSplashTask task = mTaskQueue.remove(0);
-
-    switch (task.getType()) {
-      case SHOW:
-        show(task);
-        break;
-      case HIDE:
-        hide(task);
-        break;
-    }
+    hideWithTask(task);
   }
 
-  private void waitAndShiftNextTask() {
+  private void waitAndRetry() {
     final Timer timer = new Timer();
 
     timer.schedule(new TimerTask() {
@@ -175,134 +136,55 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
     }, 250);
   }
 
-  private void show(final RNBootSplashTask task) {
-    UiThreadUtil.runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        final Activity activity = getReactApplicationContext().getCurrentActivity();
-        final boolean fade = task.getFade();
-        final Promise promise = task.getPromise();
-
-        if (activity == null || activity.isFinishing()) {
-          waitAndShiftNextTask();
-          return;
-        }
-
-        if (mDialog != null) {
-          promise.resolve(true); // splash screen is already visible
-          shiftNextTask();
-          return;
-        }
-
-        mStatus = Status.TRANSITIONING_TO_VISIBLE;
-        mDialog = new RNBootSplashDialog(activity, mBootThemeResId);
-
-        Window window = mDialog.getWindow();
-
-        if (window != null) {
-          window.setWindowAnimations(fade
-            ? R.style.bootsplash_fade_animation
-            : R.style.bootsplash_no_animation);
-        }
-
-        if (!mDialog.isShowing()) {
-          mDialog.show();
-        }
-
-        if (!fade) {
-          mStatus = Status.VISIBLE;
-          promise.resolve(true);
-          shiftNextTask();
-        } else {
-          final Timer timer = new Timer();
+  private void hideWithTask(final RNBootSplashTask task) {
+    final Activity activity = getReactApplicationContext().getCurrentActivity();
+    final boolean fade = task.getFade();
+    final Promise promise = task.getPromise();
 
-          timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-              mStatus = Status.VISIBLE;
-              promise.resolve(true);
-              shiftNextTask();
-              timer.cancel();
-            }
-          }, ANIMATION_DURATION);
-        }
-      }
-    });
-  }
+    if (mSplashScreen == null || mStatus == Status.HIDDEN) {
+      promise.resolve(true);
+      shiftNextTask();
+      return;
+    }
 
-  private void hide(final RNBootSplashTask task) {
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        final Activity activity = getReactApplicationContext().getCurrentActivity();
-        final boolean fade = task.getFade();
-        final Promise promise = task.getPromise();
-
         if (activity == null || activity.isFinishing()) {
-          waitAndShiftNextTask();
+          waitAndRetry(); // Wait for activity to be ready
           return;
         }
 
-        if (mDialog == null) {
-          promise.resolve(true); // splash screen is already hidden
-          shiftNextTask();
-          return;
+        if (fade) {
+          mStatus = Status.TRANSITIONING;
         }
 
-        mStatus = Status.TRANSITIONING_TO_HIDDEN;
+        mShouldFade = fade;
+        mShouldKeepOnScreen = false;
 
-        Window window = mDialog.getWindow();
+        final Timer timer = new Timer();
 
-        mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+        // We cannot rely on setOnExitAnimationListener
+        // See https://issuetracker.google.com/issues/197906327
+        timer.schedule(new TimerTask() {
           @Override
-          public void onDismiss(DialogInterface dialog) {
+          public void run() {
             mStatus = Status.HIDDEN;
-            mDialog = null;
             promise.resolve(true);
+            timer.cancel();
             shiftNextTask();
           }
-        });
-
-        if (window != null) {
-          window.setWindowAnimations(fade
-            ? R.style.bootsplash_fade_animation
-            : R.style.bootsplash_no_animation);
-        }
-
-        if (!fade) {
-          mDialog.dismiss();
-        } else {
-          mDialog.hide();
-          final Timer timer = new Timer();
-
-          timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-              mDialog.dismiss();
-              timer.cancel();
-            }
-          }, ANIMATION_DURATION);
-        }
+        }, ANIMATION_DURATION);
       }
     });
   }
 
-  @ReactMethod
-  public void show(final boolean fade, final Promise promise) {
-    if (mBootThemeResId == -1) {
-      promise.reject("uninitialized_module", "react-native-bootsplash has not been initialized");
-    } else {
-      mTaskQueue.add(new RNBootSplashTask(RNBootSplashTask.Type.SHOW, fade, promise));
-      shiftNextTask();
-    }
-  }
-
   @ReactMethod
   public void hide(final boolean fade, final Promise promise) {
-    if (mBootThemeResId == -1) {
-      promise.reject("uninitialized_module", "react-native-bootsplash has not been initialized");
+    if (mSplashScreen == null || mStatus == Status.HIDDEN) {
+      promise.resolve(true);
     } else {
-      mTaskQueue.add(new RNBootSplashTask(RNBootSplashTask.Type.HIDE, fade, promise));
+      mTaskQueue.add(new RNBootSplashTask(fade, promise));
       shiftNextTask();
     }
   }
@@ -316,8 +198,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
       case HIDDEN:
         promise.resolve("hidden");
         break;
-      case TRANSITIONING_TO_VISIBLE:
-      case TRANSITIONING_TO_HIDDEN:
+      case TRANSITIONING:
         promise.resolve("transitioning");
         break;
     }

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

@@ -1,5 +1,7 @@
 package com.zoontek.rnbootsplash;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -11,13 +13,15 @@ import java.util.List;
 
 public class RNBootSplashPackage implements ReactPackage {
 
+  @NonNull
   @Override
-  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
     return Arrays.<NativeModule>asList(new RNBootSplashModule(reactContext));
   }
 
+  @NonNull
   @Override
-  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
     return Collections.emptyList();
   }
 }

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

@@ -6,19 +6,10 @@ import com.facebook.react.bridge.Promise;
 
 public class RNBootSplashTask {
 
-  public enum Type {
-    SHOW,
-    HIDE
-  }
-
   private final boolean mFade;
   @NonNull private final Promise mPromise;
-  @NonNull private final Type mType;
 
-  public RNBootSplashTask(@NonNull final Type type,
-                          final boolean fade,
-                          @NonNull final Promise promise) {
-    mType = type;
+  public RNBootSplashTask(final boolean fade, @NonNull final Promise promise) {
     mFade = fade;
     mPromise = promise;
   }
@@ -27,11 +18,6 @@ public class RNBootSplashTask {
     return mFade;
   }
 
-  @NonNull
-  public Type getType() {
-    return mType;
-  }
-
   @NonNull
   public Promise getPromise() {
     return mPromise;