react-native-bootsplash 4.0.1 → 4.1.2

package/README.md

@@ -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.Stack;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -40,7 +39,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
   @Nullable
   private static SplashScreen mSplashScreen = null;
 
-  private static final Stack<RNBootSplashTask> mTaskStack = new Stack<>();
+  private static final RNBootSplashQueue<RNBootSplashTask> mTaskQueue = new RNBootSplashQueue<>();
   private static Status mStatus = Status.HIDDEN;
   private static boolean mIsAppInForeground = true;
   private static boolean mShouldFade = false;
@@ -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;
@@ -114,11 +113,12 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
   }
 
   private void shiftNextTask() {
-    if (mStatus != Status.TRANSITIONING &&
-        mIsAppInForeground &&
-        mTaskStack.size() > 0) {
-      RNBootSplashTask task = mTaskStack.pop();
-      hideWithTask(task);
+    if (mStatus != Status.TRANSITIONING && mIsAppInForeground) {
+      RNBootSplashTask task = mTaskQueue.shift();
+
+      if (task != null) {
+        hideWithTask(task);
+      }
     }
   }
 
@@ -182,7 +182,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
     if (mSplashScreen == null || mStatus == Status.HIDDEN) {
       promise.resolve(true);
     } else {
-      mTaskStack.push(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.h

@@ -1,12 +1,6 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTRootView.h>
 
-typedef enum {
-  RNBootSplashStatusVisible = 0,
-  RNBootSplashStatusHidden = 1,
-  RNBootSplashStatusTransitioning = 2
-} RNBootSplashStatus;
-
 @interface RNBootSplashTask : NSObject
 
 @property (nonatomic, readonly) BOOL fade;
@@ -20,6 +14,6 @@ typedef enum {
 @interface RNBootSplash : NSObject <RCTBridgeModule>
 
 + (void)initWithStoryboard:(NSString * _Nonnull)storyboardName
-                  rootView:(RCTRootView * _Nonnull)rootView;
+                  rootView:(RCTRootView * _Nullable)rootView;
 
 @end

package/ios/RNBootSplash.m

@@ -3,9 +3,10 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUtils.h>
 
-static NSMutableArray<RNBootSplashTask *> *_taskStack = nil;
+static NSMutableArray<RNBootSplashTask *> *_taskQueue = nil;
 static RCTRootView *_rootView = nil;
-static RNBootSplashStatus _status = RNBootSplashStatusHidden;
+static bool _isTransitioning = false;
+static bool _shouldPreventInit = false;
 
 @implementation RNBootSplashTask
 
@@ -26,7 +27,7 @@ static RNBootSplashStatus _status = RNBootSplashStatusHidden;
 RCT_EXPORT_MODULE();
 
 + (BOOL)requiresMainQueueSetup {
-  return YES;
+  return NO;
 }
 
 - (dispatch_queue_t)methodQueue {
@@ -34,18 +35,24 @@ RCT_EXPORT_MODULE();
 }
 
 + (void)initWithStoryboard:(NSString * _Nonnull)storyboardName
-                  rootView:(RCTRootView * _Nonnull)rootView {
-  _rootView = rootView;
-  _status = RNBootSplashStatusVisible;
-  _taskStack = [[NSMutableArray alloc] init];
+                  rootView:(RCTRootView * _Nullable)rootView {
+  if (rootView == nil || _rootView != nil || RCTRunningInAppExtension())
+    return;
 
-  UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
-  [_rootView setLoadingView:[[storyboard instantiateInitialViewController] view]];
+  _rootView = rootView;
 
   [[NSNotificationCenter defaultCenter] removeObserver:rootView
                                                   name:RCTContentDidAppearNotification
                                                 object:rootView];
 
+  UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
+  UIView *loadingView = [[storyboard instantiateInitialViewController] view];
+
+  if (_shouldPreventInit)
+    return;
+
+  [_rootView setLoadingView:loadingView];
+
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(onJavaScriptDidLoad:)
                                                name:RCTJavaScriptDidLoadNotification
@@ -73,89 +80,99 @@ RCT_EXPORT_MODULE();
 }
 
 + (void)onJavaScriptDidFailToLoad {
-  _status = RNBootSplashStatusHidden;
+  [self removeLoadingView];
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 
-  if (_rootView != nil) {
++ (bool)isHidden {
+  return _rootView == nil || _rootView.loadingView == nil || [_rootView.loadingView isHidden];
+}
+
++ (void)removeLoadingView {
+  if (![self isHidden]) {
     _rootView.loadingView.hidden = YES;
     [_rootView.loadingView removeFromSuperview];
     _rootView.loadingView = nil;
   }
+}
 
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
++ (void)ensureTaskQueue {
+  if (_taskQueue == nil)
+    _taskQueue = [[NSMutableArray alloc] init];
 }
 
 + (void)shiftNextTask {
-  if (_status != RNBootSplashStatusTransitioning &&
-      [_taskStack count] > 0 &&
+  [self ensureTaskQueue];
+
+  if ([_taskQueue count] > 0 &&
+      !_isTransitioning &&
       [[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
-    RNBootSplashTask *task = [_taskStack objectAtIndex:0];
-    [_taskStack removeObjectAtIndex:0];
+    RNBootSplashTask *task = [_taskQueue objectAtIndex:0];
+    [_taskQueue removeObjectAtIndex:0];
 
     [self hideWithTask:task];
   }
 }
 
 + (void)hideWithTask:(RNBootSplashTask *)task {
-  if (_status == RNBootSplashStatusHidden) {
+  if ([self isHidden]) {
     task.resolve(@(true));
     return [self shiftNextTask];
   }
 
   if (!task.fade) {
-    _status = RNBootSplashStatusHidden;
-
-    _rootView.loadingView.hidden = YES;
-    [_rootView.loadingView removeFromSuperview];
-    _rootView.loadingView = nil;
-
+    [self removeLoadingView];
     task.resolve(@(true));
     return [self shiftNextTask];
   }
 
-  _status = RNBootSplashStatusTransitioning;
-
-  [UIView transitionWithView:_rootView
-                    duration:0.220
-                     options:UIViewAnimationOptionTransitionCrossDissolve
-                  animations:^{
-                               _rootView.loadingView.hidden = YES;
-                             }
-                  completion:^(__unused BOOL finished) {
-                               _status = RNBootSplashStatusHidden;
-
-                               [_rootView.loadingView removeFromSuperview];
-                               _rootView.loadingView = nil;
-
-                               task.resolve(@(true));
-                               return [self shiftNextTask];
-                             }];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    _isTransitioning = true;
+
+    [UIView transitionWithView:_rootView
+                      duration:0.220
+                       options:UIViewAnimationOptionTransitionCrossDissolve
+                    animations:^{
+      _rootView.loadingView.hidden = YES;
+    }
+                    completion:^(__unused BOOL finished) {
+      [_rootView.loadingView removeFromSuperview];
+      _rootView.loadingView = nil;
+
+      task.resolve(@(true));
+      _isTransitioning = false;
+
+      return [self shiftNextTask];
+    }];
+  });
 }
 
 RCT_REMAP_METHOD(hide,
                  hideWithFade:(BOOL)fade
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
-  if (_rootView == nil || _status == RNBootSplashStatusHidden)
+  _shouldPreventInit = true;
+
+  if ([RNBootSplash isHidden] || RCTRunningInAppExtension())
     return resolve(@(true));
 
   RNBootSplashTask *task = [[RNBootSplashTask alloc] initWithFade:fade
                                                          resolver:resolve];
 
-  [_taskStack addObject:task];
+  [RNBootSplash ensureTaskQueue];
+  [_taskQueue addObject:task];
   [RNBootSplash shiftNextTask];
 }
 
 RCT_REMAP_METHOD(getVisibilityStatus,
                  getVisibilityStatusWithResolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
-  switch (_status) {
-    case RNBootSplashStatusVisible:
-      return resolve(@"visible");
-    case RNBootSplashStatusHidden:
-      return resolve(@"hidden");
-    case RNBootSplashStatusTransitioning:
-      return resolve(@"transitioning");
-  }
+  if ([RNBootSplash isHidden])
+    return resolve(@"hidden");
+  else if (_isTransitioning)
+    return resolve(@"transitioning");
+  else
+    return resolve(@"visible");
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "4.0.1",
+  "version": "4.1.2",
   "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.15",
+    "lint-staged": "^12.3.3",
+    "prettier": "^2.5.1",
     "prettier-plugin-organize-imports": "^2.3.4",
     "react": "^17.0.2",
-    "react-native": "^0.66.3",
+    "react-native": "^0.67.2",
     "react-native-builder-bob": "^0.18.2",
     "rescript": "^9.1.4",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.5"
   }
 }