react-native-bootsplash 4.1.1 → 4.1.4

package/README.md

@@ -97,6 +97,8 @@ public class MainApplication extends Application implements ReactApplication {
 
 ## Setup
 
+ℹ️ For `react-native` < `0.68` documentation, check the [`v4.1.3 README.md`](https://github.com/zoontek/react-native-bootsplash/blob/4.1.3/README.md)
+
 ### Assets generation
 
 In order to speed up the setup, we provide a **CLI** to generate assets, create the Android Drawable XML file and the iOS Storyboard file automatically ✨.
@@ -132,6 +134,17 @@ yarn react-native generate-bootsplash assets/bootsplash_logo_original.png \
   --flavor=main
 ```
 
+#### Using an SVG
+
+You might want to use SVG as input file. For that, you can install a CLI tool to convert your logo first:
+
+```bash
+$ brew install librsvg # available on macOS
+$ rsvg-convert -w 3000 bootsplash_logo.svg -o bootsplash_logo.png # create a large PNG with generous leeway for 4x Android xxxhdpi devices
+$ react-native generate-bootsplash bootsplash_logo.png
+$ rm bootsplash_logo.png # optionally, clean up the PNG
+```
+
 ![](https://raw.githubusercontent.com/zoontek/react-native-bootsplash/master/docs/cli_tool.png?raw=true)
 
 This tool relies on the naming conventions that are used in the `/example` project and will therefore create the following files:
@@ -161,22 +174,20 @@ ios/YourProjectName/Images.xcassets/BootSplashLogo.imageset/bootsplash_logo@3x.p
 
 _⚠️ Only `.storyboard` files are supported ([Apple has deprecated other methods in April 2020](https://developer.apple.com/news/?id=01132020b))._
 
-Edit the `ios/YourProjectName/AppDelegate.m` file:
+Edit the `ios/YourProjectName/AppDelegate.mm` file:
 
 ```obj-c
 #import "AppDelegate.h"
-
-#import <React/RCTBridge.h>
-#import <React/RCTBundleURLProvider.h>
-#import <React/RCTRootView.h>
-
 #import "RNBootSplash.h" // <- add the header import
 
+// …
+
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   // …
+
   rootViewController.view = rootView;
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
@@ -200,7 +211,7 @@ Set the `BootSplash.storyboard` as launch screen file:
 ```gradle
 buildscript {
   ext {
-    buildToolsVersion = "30.0.2"
+    buildToolsVersion = "31.0.0"
     minSdkVersion = 23 // <- AndroidX splashscreen has basic support for 21 (only the background color), so 23 is best
     compileSdkVersion = 31 // <- set at least 31
     targetSdkVersion = 31 // <- set at least 31
@@ -212,10 +223,9 @@ buildscript {
 
 ```gradle
 dependencies {
-  implementation fileTree(dir: "libs", include: ["*.jar"])
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"  // From node_modules
+  // …
 
+  implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
   implementation "androidx.core:core-splashscreen:1.0.0-beta01" // Add this line
 
   // …
@@ -255,18 +265,7 @@ dependencies {
     android:roundIcon="@mipmap/ic_launcher_round"
     android:allowBackup="false"
     android:theme="@style/BootTheme"> <!-- Replace @style/AppTheme with @style/BootTheme -->
-    <activity
-    android:name=".MainActivity"
-    android:label="@string/app_name"
-    android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-    android:launchMode="singleTask"
-    android:windowSoftInputMode="adjustResize"
-    android:exported="true"> <!-- Add android:exported="true" -->
-    <intent-filter>
-      <action android:name="android.intent.action.MAIN" />
-      <category android:name="android.intent.category.LAUNCHER" />
-    </intent-filter>
-    </activity>
+    <!-- … -->
   </application>
 </manifest>
 
@@ -276,23 +275,23 @@ dependencies {
 
 ```java
 import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate; // <- add this necessary import
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
 import com.zoontek.rnbootsplash.RNBootSplash; // <- add this necessary import
 
 public class MainActivity extends ReactActivity {
 
   // …
 
-  @Override
-  protected ReactActivityDelegate createReactActivityDelegate() {
-    return new ReactActivityDelegate(this, getMainComponentName()) {
-
-      @Override
-      protected void loadApp(String appKey) {
-        RNBootSplash.init(MainActivity.this); // <- initialize the splash screen
-        super.loadApp(appKey);
-      }
-    };
+  public static class MainActivityDelegate extends ReactActivityDelegate {
+
+    // …
+
+    @Override
+    protected void loadApp(String appKey) {
+      RNBootSplash.init(getPlainActivity()); // <- initialize the splash screen
+      super.loadApp(appKey);
+    }
   }
 }
 ```
@@ -316,8 +315,6 @@ RNBootSplash.hide(); // immediate
 RNBootSplash.hide({ fade: true }); // fade
 ```
 
----
-
 ### getVisibilityStatus()
 
 #### Method type
@@ -360,7 +357,25 @@ function App() {
 
 **🤙 A more complex example is available in the [`/example` folder](example).**
 
-### Testing with Jest
+## Using React Navigation
+
+If you are using React Navigation, you can hide the splash screen once the navigation container and all children have finished mounting by using the `onReady` function.
+
+```js
+import React from "react";
+import { NavigationContainer } from "@react-navigation/native";
+import RNBootSplash from "react-native-bootsplash";
+
+function App() {
+  return (
+    <NavigationContainer onReady={() => RNBootSplash.hide()}>
+      {/* content */}
+    </NavigationContainer>
+  );
+}
+```
+
+## Testing with Jest
 
 Testing code which uses this library requires some setup since we need to mock the native methods.
 
@@ -369,7 +384,7 @@ To add the mocks, create a file _jest/setup.js_ (or any other file name) contain
 ```js
 jest.mock("react-native-bootsplash", () => {
   return {
-    show: jest.fn().mockResolvedValueOnce(),
+    hide: jest.fn().mockResolvedValueOnce(),
     getVisibilityStatus: jest.fn().mockResolvedValue("hidden"),
   };
 });
@@ -383,24 +398,6 @@ After that, we need to add the setup file in the jest config. You can add it und
 }
 ```
 
-### Using React Navigation
-
-If you are using React Navigation, you can hide the splash screen once the navigation container and all children have finished mounting by using the `onReady` function.
-
-```js
-import React from "react";
-import { NavigationContainer } from "@react-navigation/native";
-import RNBootSplash from "react-native-bootsplash";
-
-function App() {
-  return (
-    <NavigationContainer onReady={() => RNBootSplash.hide()}>
-      {/* content */}
-    </NavigationContainer>
-  );
-}
-```
-
 ## 🕵️‍♂️ Comparison with [react-native-splash-screen](https://github.com/crazycodeboy/react-native-splash-screen)
 
 - If `react-native-splash-screen` encourages you to display an image over your application, `react-native-bootsplash` way-to-go is to design your launch screen using platforms tools.

package/android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
             mavenCentral()
         }
         dependencies {
-            classpath("com.android.tools.build:gradle:4.2.2")
+            classpath("com.android.tools.build:gradle:7.0.4")
         }
     }
 }
@@ -21,7 +21,7 @@ apply plugin: "com.android.library"
 
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 31)
-    buildToolsVersion safeExtGet("buildToolsVersion", "30.0.2")
+    buildToolsVersion safeExtGet("buildToolsVersion", "31.0.0")
     defaultConfig {
         minSdkVersion safeExtGet("minSdkVersion", 23)
         targetSdkVersion safeExtGet("targetSdkVersion", 31)

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

@@ -12,7 +12,6 @@ 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;
@@ -25,7 +24,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 @ReactModule(name = RNBootSplashModule.NAME)
-public class RNBootSplashModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
+public class RNBootSplashModule extends ReactContextBaseJavaModule {
 
   public static final String NAME = "RNBootSplash";
   private static final int ANIMATION_DURATION = 220;
@@ -39,15 +38,13 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
   @Nullable
   private static SplashScreen mSplashScreen = null;
 
-  private static final RNBootSplashQueue<RNBootSplashTask> mTaskQueue = new RNBootSplashQueue<>();
+  private static final RNBootSplashQueue<Promise> mPromiseQueue = new RNBootSplashQueue<>();
   private static Status mStatus = Status.HIDDEN;
-  private static boolean mIsAppInForeground = true;
   private static boolean mShouldFade = false;
   private static boolean mShouldKeepOnScreen = true;
 
   public RNBootSplashModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    reactContext.addLifecycleEventListener(this);
   }
 
   @Override
@@ -96,95 +93,66 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
     });
   }
 
-  @Override
-  public void onHostDestroy() {
-    mIsAppInForeground = false;
-  }
-
-  @Override
-  public void onHostPause() {
-    mIsAppInForeground = false;
-  }
-
-  @Override
-  public void onHostResume() {
-    mIsAppInForeground = true;
-    shiftNextTask();
-  }
+  private void clearPromiseQueue() {
+    while (!mPromiseQueue.isEmpty()) {
+      Promise promise = mPromiseQueue.shift();
 
-  private void shiftNextTask() {
-    if (mStatus != Status.TRANSITIONING && mIsAppInForeground) {
-      RNBootSplashTask task = mTaskQueue.shift();
-
-      if (task != null) {
-        hideWithTask(task);
-      }
+      if (promise != null)
+        promise.resolve(true);
     }
   }
 
-  private void waitAndRetry() {
-    final Timer timer = new Timer();
-
-    timer.schedule(new TimerTask() {
-      @Override
-      public void run() {
-        shiftNextTask();
-        timer.cancel();
-      }
-    }, 250);
-  }
-
-  private void hideWithTask(final RNBootSplashTask task) {
-    final Activity activity = getReactApplicationContext().getCurrentActivity();
-    final boolean fade = task.getFade();
-    final Promise promise = task.getPromise();
-
+  private void hideAndResolveAll(final boolean fade) {
     if (mSplashScreen == null || mStatus == Status.HIDDEN) {
-      promise.resolve(true);
-      shiftNextTask();
+      clearPromiseQueue();
       return;
     }
 
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
+        final Activity activity = getReactApplicationContext().getCurrentActivity();
+
         if (activity == null || activity.isFinishing()) {
-          waitAndRetry(); // Wait for activity to be ready
-          return;
-        }
+          // Wait for activity to be ready
+          final Timer timer = new Timer();
 
-        if (fade) {
-          mStatus = Status.TRANSITIONING;
-        }
+          timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+              hideAndResolveAll(fade);
+              timer.cancel();
+            }
+          }, 250);
+        } else {
+          if (fade) {
+            mStatus = Status.TRANSITIONING;
+          }
 
-        mShouldFade = fade;
-        mShouldKeepOnScreen = false;
+          mShouldFade = fade;
+          mShouldKeepOnScreen = false;
 
-        final Timer timer = new Timer();
+          final Timer timer = new Timer();
 
-        // We cannot rely on setOnExitAnimationListener
-        // See https://issuetracker.google.com/issues/197906327
-        timer.schedule(new TimerTask() {
-          @Override
-          public void run() {
-            mStatus = Status.HIDDEN;
-            timer.cancel();
-            promise.resolve(true);
-            shiftNextTask();
-          }
-        }, ANIMATION_DURATION);
+          // We cannot rely on setOnExitAnimationListener
+          // See https://issuetracker.google.com/issues/197906327
+          timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+              mStatus = Status.HIDDEN;
+              timer.cancel();
+              clearPromiseQueue();
+            }
+          }, ANIMATION_DURATION);
+        }
       }
     });
   }
 
   @ReactMethod
   public void hide(final boolean fade, final Promise promise) {
-    if (mSplashScreen == null || mStatus == Status.HIDDEN) {
-      promise.resolve(true);
-    } else {
-      mTaskQueue.push(new RNBootSplashTask(fade, promise));
-      shiftNextTask();
-    }
+    mPromiseQueue.push(promise);
+    hideAndResolveAll(fade);
   }
 
   @ReactMethod

package/ios/RNBootSplash.h

@@ -1,25 +1,9 @@
 #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;
-@property (nonatomic, readonly, strong) RCTPromiseResolveBlock _Nonnull resolve;
-
-- (instancetype _Nonnull)initWithFade:(BOOL)fade
-                             resolver:(RCTPromiseResolveBlock _Nonnull)resolve;
-
-@end
-
 @interface RNBootSplash : NSObject <RCTBridgeModule>
 
 + (void)initWithStoryboard:(NSString * _Nonnull)storyboardName
-                  rootView:(RCTRootView * _Nonnull)rootView;
+                  rootView:(UIView * _Nullable)rootView;
 
 @end

package/ios/RNBootSplash.m

@@ -3,30 +3,16 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUtils.h>
 
-static NSMutableArray<RNBootSplashTask *> *_taskQueue = nil;
+static NSMutableArray<RCTPromiseResolveBlock> *_resolverQueue = nil;
 static RCTRootView *_rootView = nil;
-static RNBootSplashStatus _status = RNBootSplashStatusHidden;
-
-@implementation RNBootSplashTask
-
-- (instancetype)initWithFade:(BOOL)fade
-                    resolver:(RCTPromiseResolveBlock _Nonnull)resolve {
-  if (self = [super init]) {
-    _fade = fade;
-    _resolve = resolve;
-  }
-
-  return self;
-}
-
-@end
+static bool _isTransitioning = false;
 
 @implementation RNBootSplash
 
 RCT_EXPORT_MODULE();
 
 + (BOOL)requiresMainQueueSetup {
-  return YES;
+  return NO;
 }
 
 - (dispatch_queue_t)methodQueue {
@@ -34,20 +20,29 @@ RCT_EXPORT_MODULE();
 }
 
 + (void)initWithStoryboard:(NSString * _Nonnull)storyboardName
-                  rootView:(RCTRootView * _Nonnull)rootView {
-  _rootView = rootView;
-  _status = RNBootSplashStatusVisible;
-  _taskQueue = [[NSMutableArray alloc] init];
+                  rootView:(UIView * _Nullable)rootView {
+  if (rootView == nil ||
+      ![rootView isKindOfClass:[RCTRootView class]] ||
+      _rootView != nil ||
+      RCTRunningInAppExtension())
+    return;
 
-  UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
-  [_rootView setLoadingView:[[storyboard instantiateInitialViewController] view]];
+  _rootView = (RCTRootView *)rootView;
 
   [[NSNotificationCenter defaultCenter] removeObserver:rootView
                                                   name:RCTContentDidAppearNotification
                                                 object:rootView];
 
+  UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
+  UIView *loadingView = [[storyboard instantiateInitialViewController] view];
+
+  if (_resolverQueue != nil)
+    return; // hide has already been called, abort init
+
+  [_rootView setLoadingView:loadingView];
+
   [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(onJavaScriptDidLoad:)
+                                           selector:@selector(onJavaScriptDidLoad)
                                                name:RCTJavaScriptDidLoadNotification
                                              object:nil];
 
@@ -55,107 +50,85 @@ RCT_EXPORT_MODULE();
                                            selector:@selector(onJavaScriptDidFailToLoad)
                                                name:RCTJavaScriptDidFailToLoadNotification
                                              object:nil];
-
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(shiftNextTask)
-                                               name:UIApplicationDidBecomeActiveNotification
-                                             object:nil];
 }
 
-+ (void)onJavaScriptDidLoad:(NSNotification *)notification {
-  [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                  name:RCTJavaScriptDidLoadNotification
-                                                object:nil];
-
-  [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                  name:RCTJavaScriptDidFailToLoadNotification
-                                                object:nil];
++ (void)onJavaScriptDidLoad {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 + (void)onJavaScriptDidFailToLoad {
-  _status = RNBootSplashStatusHidden;
-
-  if (_rootView != nil) {
-    _rootView.loadingView.hidden = YES;
-    [_rootView.loadingView removeFromSuperview];
-    _rootView.loadingView = nil;
-  }
-
+  [self removeLoadingView];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-+ (void)shiftNextTask {
-  if (_status != RNBootSplashStatusTransitioning &&
-      [_taskQueue count] > 0 &&
-      [[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
-    RNBootSplashTask *task = [_taskQueue objectAtIndex:0];
-    [_taskQueue removeObjectAtIndex:0];
-
-    [self hideWithTask:task];
-  }
++ (bool)isHidden {
+  return _rootView == nil || _rootView.loadingView == nil || [_rootView.loadingView isHidden];
 }
 
-+ (void)hideWithTask:(RNBootSplashTask *)task {
-  if (_status == RNBootSplashStatusHidden) {
-    task.resolve(@(true));
-    return [self shiftNextTask];
-  }
-
-  if (!task.fade) {
-    _status = RNBootSplashStatusHidden;
-
++ (void)removeLoadingView {
+  if (![self isHidden]) {
     _rootView.loadingView.hidden = YES;
+
     [_rootView.loadingView removeFromSuperview];
     _rootView.loadingView = nil;
-
-    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;
+- (void)clearResolverQueue {
+  while ([_resolverQueue count] > 0) {
+    RCTPromiseResolveBlock resolve = [_resolverQueue objectAtIndex:0];
+    [_resolverQueue removeObjectAtIndex:0];
 
-                               task.resolve(@(true));
-                               return [self shiftNextTask];
-                             }];
+    resolve(@(true));
+  }
 }
 
 RCT_REMAP_METHOD(hide,
                  hideWithFade:(BOOL)fade
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
-  if (_rootView == nil || _status == RNBootSplashStatusHidden)
-    return resolve(@(true));
+  if (_resolverQueue == nil)
+    _resolverQueue = [[NSMutableArray alloc] init];
+
+  [_resolverQueue addObject:resolve];
+
+  if ([RNBootSplash isHidden] || RCTRunningInAppExtension())
+    return [self clearResolverQueue];
 
-  RNBootSplashTask *task = [[RNBootSplashTask alloc] initWithFade:fade
-                                                         resolver:resolve];
+  if (!fade) {
+    [RNBootSplash removeLoadingView];
+    return [self clearResolverQueue];
+  }
+
+  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;
 
-  [_taskQueue addObject:task];
-  [RNBootSplash shiftNextTask];
+      _isTransitioning = false;
+
+      return [self clearResolverQueue];
+    }];
+  });
 }
 
 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.1.1",
+  "version": "4.1.4",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",
@@ -60,19 +60,22 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "jimp": "^0.16.1"
   },
+  "resolutions": {
+    "@types/react": "^17"
+  },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "@types/react-native": "^0.66.12",
-    "lint-staged": "^12.1.7",
-    "prettier": "^2.5.1",
+    "@types/react-native": "^0.67.3",
+    "lint-staged": "^12.3.7",
+    "prettier": "^2.6.1",
     "prettier-plugin-organize-imports": "^2.3.4",
     "react": "^17.0.2",
-    "react-native": "^0.66.4",
+    "react-native": "^0.68.0",
     "react-native-builder-bob": "^0.18.2",
     "rescript": "^9.1.4",
-    "typescript": "^4.5.4"
+    "typescript": "^4.6.3"
   }
 }

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

@@ -1,25 +0,0 @@
-package com.zoontek.rnbootsplash;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Promise;
-
-public class RNBootSplashTask {
-
-  private final boolean mFade;
-  @NonNull private final Promise mPromise;
-
-  public RNBootSplashTask(final boolean fade, @NonNull final Promise promise) {
-    mFade = fade;
-    mPromise = promise;
-  }
-
-  public boolean getFade() {
-    return mFade;
-  }
-
-  @NonNull
-  public Promise getPromise() {
-    return mPromise;
-  }
-}