react-native-bootsplash 4.0.0 → 4.1.1

package/README.md

@@ -28,9 +28,9 @@ Show a bootsplash during app startup. Hide it when you are ready.<br>
 ## Installation
 
 ```bash
-$ npm install --save react-native-bootsplash@next
+$ npm install --save react-native-bootsplash
 # --- or ---
-$ yarn add react-native-bootsplash@next
+$ yarn add react-native-bootsplash
 ```
 
 Don't forget going into the `ios` directory to execute a `pod install`.
@@ -110,7 +110,7 @@ $ yarn react-native generate-bootsplash --help
 The command can take multiple arguments:
 
 ```bash
-react-native generate-bootsplash <logoPath>
+yarn react-native generate-bootsplash <logoPath>
 
 Generate a launch screen using an original logo file
 
@@ -216,7 +216,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
 
-  implementation "androidx.core:core-splashscreen:1.0.0-alpha02" // Add this line
+  implementation "androidx.core:core-splashscreen:1.0.0-beta01" // Add this line
 
   // …
 ```

package/RNBootSplash.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors         = package["author"]
   s.homepage        = package["homepage"]
 
-  s.platforms       = { :ios => "11.0" }
+  s.platforms       = { :ios => "11.0", :tvos => "11.0" }
   s.requires_arc    = true
 
   s.source          = { :git => package["repository"]["url"], :tag => s.version }

package/android/build.gradle

@@ -49,5 +49,5 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+" // From node_modules
-    implementation "androidx.core:core-splashscreen:${safeExtGet("androidXSplashScreenVersion", "1.0.0-alpha02")}"
+    implementation "androidx.core:core-splashscreen:${safeExtGet("androidXSplashScreenVersion", "1.0.0-beta01")}"
 }

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

@@ -21,7 +21,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
 
-import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -40,9 +39,9 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
   @Nullable
   private static SplashScreen mSplashScreen = null;
 
-  private static final ArrayList<RNBootSplashTask> mTaskQueue = new ArrayList<>();
+  private static final RNBootSplashQueue<RNBootSplashTask> mTaskQueue = new RNBootSplashQueue<>();
   private static Status mStatus = Status.HIDDEN;
-  private static boolean mIsAppInBackground = false;
+  private static boolean mIsAppInForeground = true;
   private static boolean mShouldFade = false;
   private static boolean mShouldKeepOnScreen = true;
 
@@ -67,7 +66,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
     mSplashScreen = SplashScreen.installSplashScreen(activity);
     mStatus = Status.VISIBLE;
 
-    mSplashScreen.setKeepVisibleCondition(new SplashScreen.KeepOnScreenCondition() {
+    mSplashScreen.setKeepOnScreenCondition(new SplashScreen.KeepOnScreenCondition() {
       @Override
       public boolean shouldKeepOnScreen() {
         return mShouldKeepOnScreen;
@@ -99,29 +98,28 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
 
   @Override
   public void onHostDestroy() {
-    mIsAppInBackground = true;
+    mIsAppInForeground = false;
   }
 
   @Override
   public void onHostPause() {
-    mIsAppInBackground = true;
+    mIsAppInForeground = false;
   }
 
   @Override
   public void onHostResume() {
-    mIsAppInBackground = false;
+    mIsAppInForeground = true;
     shiftNextTask();
   }
 
   private void shiftNextTask() {
-    boolean shouldSkipTick = mStatus == Status.TRANSITIONING
-      || mIsAppInBackground
-      || mTaskQueue.isEmpty();
+    if (mStatus != Status.TRANSITIONING && mIsAppInForeground) {
+      RNBootSplashTask task = mTaskQueue.shift();
 
-    if (shouldSkipTick) return;
-
-    RNBootSplashTask task = mTaskQueue.remove(0);
-    hideWithTask(task);
+      if (task != null) {
+        hideWithTask(task);
+      }
+    }
   }
 
   private void waitAndRetry() {
@@ -170,8 +168,8 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
           @Override
           public void run() {
             mStatus = Status.HIDDEN;
-            promise.resolve(true);
             timer.cancel();
+            promise.resolve(true);
             shiftNextTask();
           }
         }, ANIMATION_DURATION);
@@ -184,7 +182,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
     if (mSplashScreen == null || mStatus == Status.HIDDEN) {
       promise.resolve(true);
     } else {
-      mTaskQueue.add(new RNBootSplashTask(fade, promise));
+      mTaskQueue.push(new RNBootSplashTask(fade, promise));
       shiftNextTask();
     }
   }

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

@@ -0,0 +1,31 @@
+package com.zoontek.rnbootsplash;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Vector;
+
+/**
+ * Represents a first-in-first-out (FIFO) thread safe queue of objects.
+ * Its source code is based on Java internal <code>Stack</code>.
+ */
+public class RNBootSplashQueue<E> extends Vector<E> {
+
+  public RNBootSplashQueue() {}
+
+  @Nullable
+  public synchronized E shift() {
+    if (size() == 0) {
+      return null;
+    }
+
+    E item = elementAt(0);
+    removeElementAt(0);
+
+    return item;
+  }
+
+  public void push(@NonNull E item) {
+    addElement(item);
+  }
+}

package/ios/RNBootSplash.m

@@ -85,16 +85,14 @@ RCT_EXPORT_MODULE();
 }
 
 + (void)shiftNextTask {
-  bool shouldSkipTick = _status == RNBootSplashStatusTransitioning
-    || [_taskQueue count] == 0
-    || [[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground;
+  if (_status != RNBootSplashStatusTransitioning &&
+      [_taskQueue count] > 0 &&
+      [[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
+    RNBootSplashTask *task = [_taskQueue objectAtIndex:0];
+    [_taskQueue removeObjectAtIndex:0];
 
-  if (shouldSkipTick) return;
-
-  RNBootSplashTask *task = [_taskQueue objectAtIndex:0];
-  [_taskQueue removeObjectAtIndex:0];
-
-  return [self hideWithTask:task];
+    [self hideWithTask:task];
+  }
 }
 
 + (void)hideWithTask:(RNBootSplashTask *)task {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",
@@ -65,14 +65,14 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "@types/react-native": "^0.66.4",
-    "lint-staged": "^12.0.2",
-    "prettier": "^2.4.1",
+    "@types/react-native": "^0.66.12",
+    "lint-staged": "^12.1.7",
+    "prettier": "^2.5.1",
     "prettier-plugin-organize-imports": "^2.3.4",
     "react": "^17.0.2",
-    "react-native": "^0.66.3",
+    "react-native": "^0.66.4",
     "react-native-builder-bob": "^0.18.2",
     "rescript": "^9.1.4",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.4"
   }
 }