react-native-bootsplash 4.0.0 → 4.0.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
 

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

@@ -21,7 +21,7 @@ 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.Stack;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -40,9 +40,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 Stack<RNBootSplashTask> mTaskStack = new Stack<>();
   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;
 
@@ -99,29 +99,27 @@ 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 (shouldSkipTick) return;
-
-    RNBootSplashTask task = mTaskQueue.remove(0);
-    hideWithTask(task);
+    if (mStatus != Status.TRANSITIONING &&
+        mIsAppInForeground &&
+        mTaskStack.size() > 0) {
+      RNBootSplashTask task = mTaskStack.pop();
+      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));
+      mTaskStack.push(new RNBootSplashTask(fade, promise));
       shiftNextTask();
     }
   }

package/ios/RNBootSplash.m

@@ -3,7 +3,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUtils.h>
 
-static NSMutableArray<RNBootSplashTask *> *_taskQueue = nil;
+static NSMutableArray<RNBootSplashTask *> *_taskStack = nil;
 static RCTRootView *_rootView = nil;
 static RNBootSplashStatus _status = RNBootSplashStatusHidden;
 
@@ -37,7 +37,7 @@ RCT_EXPORT_MODULE();
                   rootView:(RCTRootView * _Nonnull)rootView {
   _rootView = rootView;
   _status = RNBootSplashStatusVisible;
-  _taskQueue = [[NSMutableArray alloc] init];
+  _taskStack = [[NSMutableArray alloc] init];
 
   UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
   [_rootView setLoadingView:[[storyboard instantiateInitialViewController] view]];
@@ -85,16 +85,14 @@ RCT_EXPORT_MODULE();
 }
 
 + (void)shiftNextTask {
-  bool shouldSkipTick = _status == RNBootSplashStatusTransitioning
-    || [_taskQueue count] == 0
-    || [[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground;
+  if (_status != RNBootSplashStatusTransitioning &&
+      [_taskStack count] > 0 &&
+      [[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
+    RNBootSplashTask *task = [_taskStack objectAtIndex:0];
+    [_taskStack removeObjectAtIndex:0];
 
-  if (shouldSkipTick) return;
-
-  RNBootSplashTask *task = [_taskQueue objectAtIndex:0];
-  [_taskQueue removeObjectAtIndex:0];
-
-  return [self hideWithTask:task];
+    [self hideWithTask:task];
+  }
 }
 
 + (void)hideWithTask:(RNBootSplashTask *)task {
@@ -143,7 +141,7 @@ RCT_REMAP_METHOD(hide,
   RNBootSplashTask *task = [[RNBootSplashTask alloc] initWithFade:fade
                                                          resolver:resolve];
 
-  [_taskQueue addObject:task];
+  [_taskStack addObject:task];
   [RNBootSplash shiftNextTask];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",