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

package/ios/RNBootSplash.m

@@ -1,26 +1,19 @@
 #import "RNBootSplash.h"
 
 #import <React/RCTBridge.h>
-#import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 
 static NSMutableArray<RNBootSplashTask *> *_taskQueue = nil;
-static NSString *_storyboardName = @"BootSplash";
 static RCTRootView *_rootView = nil;
 static RNBootSplashStatus _status = RNBootSplashStatusHidden;
-static UIViewController *_splashVC = nil;
 
 @implementation RNBootSplashTask
 
-- (instancetype)initWithType:(RNBootSplashTaskType)type
-                        fade:(BOOL)fade
-                    resolver:(RCTPromiseResolveBlock _Nonnull)resolve
-                    rejecter:(RCTPromiseRejectBlock _Nonnull)reject {
+- (instancetype)initWithFade:(BOOL)fade
+                    resolver:(RCTPromiseResolveBlock _Nonnull)resolve {
   if (self = [super init]) {
-    _type = type;
     _fade = fade;
     _resolve = resolve;
-    _reject = reject;
   }
 
   return self;
@@ -42,36 +35,17 @@ RCT_EXPORT_MODULE();
 
 + (void)initWithStoryboard:(NSString * _Nonnull)storyboardName
                   rootView:(RCTRootView * _Nonnull)rootView {
-  UIViewController *rootVC = RCTPresentedViewController();
-
-  if (!rootVC) {
-    RCTLogWarn(@"react-native-bootsplash has been initialized too early: rootViewController must be set");
-    return;
-  }
-
   _rootView = rootView;
   _status = RNBootSplashStatusVisible;
-  _storyboardName = storyboardName;
   _taskQueue = [[NSMutableArray alloc] init];
 
-  UIStoryboard *storyboard = [UIStoryboard storyboardWithName:_storyboardName bundle:nil];
+  UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
   [_rootView setLoadingView:[[storyboard instantiateInitialViewController] view]];
 
   [[NSNotificationCenter defaultCenter] removeObserver:rootView
                                                   name:RCTContentDidAppearNotification
                                                 object:rootView];
 
-  _splashVC = [storyboard instantiateInitialViewController];
-  [_splashVC setModalPresentationStyle:UIModalPresentationOverFullScreen];
-  [_splashVC setModalTransitionStyle:UIModalTransitionStyleCrossDissolve];
-
-  [rootVC presentViewController:_splashVC animated:false completion:^{
-    [_rootView.loadingView removeFromSuperview];
-    _rootView.loadingView = nil;
-
-    [self shiftNextTask]; // JS thread might started pushing tasks
-  }];
-
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(onJavaScriptDidLoad:)
                                                name:RCTJavaScriptDidLoadNotification
@@ -99,20 +73,19 @@ RCT_EXPORT_MODULE();
 }
 
 + (void)onJavaScriptDidFailToLoad {
-  if (_splashVC != nil) {
-    [_splashVC dismissViewControllerAnimated:false
-                                  completion:^{
-      _splashVC = nil;
-    }];
+  _status = RNBootSplashStatusHidden;
+
+  if (_rootView != nil) {
+    _rootView.loadingView.hidden = YES;
+    [_rootView.loadingView removeFromSuperview];
+    _rootView.loadingView = nil;
   }
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 + (void)shiftNextTask {
-  bool shouldSkipTick = _rootView.loadingView != nil
-    || _status == RNBootSplashStatusTransitioningToVisible
-    || _status == RNBootSplashStatusTransitioningToHidden
+  bool shouldSkipTick = _status == RNBootSplashStatusTransitioning
     || [_taskQueue count] == 0
     || [[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground;
 
@@ -121,81 +94,54 @@ RCT_EXPORT_MODULE();
   RNBootSplashTask *task = [_taskQueue objectAtIndex:0];
   [_taskQueue removeObjectAtIndex:0];
 
-  switch (task.type) {
-    case RNBootSplashTaskTypeShow:
-      return [self showWithTask:task];
-    case RNBootSplashTaskTypeHide:
-      return [self hideWithTask:task];
-  }
+  return [self hideWithTask:task];
 }
 
-+ (void)showWithTask:(RNBootSplashTask *)task {
-  if (_splashVC != nil) {
-    task.resolve(@(true)); // splash screen is already visible
-    [self shiftNextTask];
-  } else {
-    _status = RNBootSplashStatusTransitioningToVisible;
-
-    _splashVC = [[UIStoryboard storyboardWithName:_storyboardName bundle:nil] instantiateInitialViewController];
-    [_splashVC setModalPresentationStyle:UIModalPresentationOverFullScreen];
-    [_splashVC setModalTransitionStyle:UIModalTransitionStyleCrossDissolve];
-
-    [RCTPresentedViewController() presentViewController:_splashVC
-                                               animated:task.fade
-                                             completion:^{
-      _status = RNBootSplashStatusVisible;
-
-      task.resolve(@(true));
-      [self shiftNextTask];
-    }];
++ (void)hideWithTask:(RNBootSplashTask *)task {
+  if (_status == RNBootSplashStatusHidden) {
+    task.resolve(@(true));
+    return [self shiftNextTask];
   }
-}
 
-+ (void)hideWithTask:(RNBootSplashTask *)task {
-  if (_splashVC == nil) {
-    task.resolve(@(true)); // splash screen is already hidden
-    [self shiftNextTask];
-  } else {
-    _status = RNBootSplashStatusTransitioningToHidden;
-
-    [_splashVC dismissViewControllerAnimated:task.fade
-                                  completion:^{
-      _splashVC = nil;
-      _status = RNBootSplashStatusHidden;
-
-      task.resolve(@(true));
-      [self shiftNextTask];
-    }];
+  if (!task.fade) {
+    _status = RNBootSplashStatusHidden;
+
+    _rootView.loadingView.hidden = YES;
+    [_rootView.loadingView removeFromSuperview];
+    _rootView.loadingView = nil;
+
+    task.resolve(@(true));
+    return [self shiftNextTask];
   }
-}
 
-RCT_REMAP_METHOD(show,
-                 showWithFade:(BOOL)fade
-                 resolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject) {
-  if (_rootView == nil)
-    return reject(@"uninitialized_module", @"react-native-bootsplash has not been initialized, or has been too early", nil);
+  _status = RNBootSplashStatusTransitioning;
 
-  RNBootSplashTask *task = [[RNBootSplashTask alloc] initWithType:RNBootSplashTaskTypeShow
-                                                             fade:fade
-                                                         resolver:resolve
-                                                         rejecter:reject];
+  [UIView transitionWithView:_rootView
+                    duration:0.220
+                     options:UIViewAnimationOptionTransitionCrossDissolve
+                  animations:^{
+                               _rootView.loadingView.hidden = YES;
+                             }
+                  completion:^(__unused BOOL finished) {
+                               _status = RNBootSplashStatusHidden;
 
-  [_taskQueue addObject:task];
-  [RNBootSplash shiftNextTask];
+                               [_rootView.loadingView removeFromSuperview];
+                               _rootView.loadingView = nil;
+
+                               task.resolve(@(true));
+                               return [self shiftNextTask];
+                             }];
 }
 
 RCT_REMAP_METHOD(hide,
                  hideWithFade:(BOOL)fade
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
-  if (_rootView == nil)
-    return reject(@"uninitialized_module", @"react-native-bootsplash has not been initialized, or has been too early", nil);
+  if (_rootView == nil || _status == RNBootSplashStatusHidden)
+    return resolve(@(true));
 
-  RNBootSplashTask *task = [[RNBootSplashTask alloc] initWithType:RNBootSplashTaskTypeHide
-                                                             fade:fade
-                                                         resolver:resolve
-                                                         rejecter:reject];
+  RNBootSplashTask *task = [[RNBootSplashTask alloc] initWithFade:fade
+                                                         resolver:resolve];
 
   [_taskQueue addObject:task];
   [RNBootSplash shiftNextTask];
@@ -209,8 +155,7 @@ RCT_REMAP_METHOD(getVisibilityStatus,
       return resolve(@"visible");
     case RNBootSplashStatusHidden:
       return resolve(@"hidden");
-    case RNBootSplashStatusTransitioningToVisible:
-    case RNBootSplashStatusTransitioningToHidden:
+    case RNBootSplashStatusTransitioning:
       return resolve(@"transitioning");
   }
 }

package/ios/RNBootSplash.xcodeproj/project.pbxproj

@@ -133,7 +133,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -174,7 +174,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "react-native-bootsplash",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",
   "homepage": "https://github.com/zoontek/react-native-bootsplash",
-  "types": "dist/typescript/index.d.ts",
   "main": "dist/commonjs/index.js",
   "module": "dist/module/index.js",
+  "types": "dist/typescript/index.d.ts",
   "files": [
     "/android",
     "/dist",
     "/ios",
     "/src",
     "RNBootSplash.podspec",
-    "ReactNativeBootsplash.res",
+    "RNBootSplash.res",
     "bsconfig.json",
     "package.json",
     "react-native.config.js"
@@ -37,9 +37,10 @@
   ],
   "scripts": {
     "format": "prettier '**/*.{js,json,md,ts,tsx}' --write",
-    "prepare": "bob build"
+    "setup-hooks": "git config --local core.hooksPath .hooks",
+    "prepare": "yarn setup-hooks && bob build"
   },
-  "@react-native-community/bob": {
+  "react-native-builder-bob": {
     "source": "src",
     "output": "dist",
     "targets": [
@@ -48,16 +49,14 @@
       "typescript"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+  "prettier": {
+    "trailingComma": "all"
   },
   "lint-staged": {
     "**/*.{js,json,md,ts,tsx}": "prettier --write"
   },
   "peerDependencies": {
-    "react-native": ">=0.60.0"
+    "react-native": ">=0.65.0"
   },
   "dependencies": {
     "chalk": "^4.1.2",
@@ -65,16 +64,15 @@
     "jimp": "^0.16.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@react-native-community/bob": "^0.17.1",
-    "@types/fs-extra": "^9.0.12",
-    "@types/react-native": "^0.64.13",
-    "bs-platform": "^9.0.2",
-    "husky": "^4.3.8",
-    "lint-staged": "^11.1.2",
-    "prettier": "^2.3.2",
-    "react": "17.0.2",
-    "react-native": "^0.63.4",
-    "typescript": "^4.3.5"
+    "@types/fs-extra": "^9.0.13",
+    "@types/react-native": "^0.66.4",
+    "lint-staged": "^12.0.2",
+    "prettier": "^2.4.1",
+    "prettier-plugin-organize-imports": "^2.3.4",
+    "react": "^17.0.2",
+    "react-native": "^0.66.3",
+    "react-native-builder-bob": "^0.18.2",
+    "rescript": "^9.1.4",
+    "typescript": "^4.4.4"
   }
 }

package/react-native.config.js

@@ -16,7 +16,7 @@ module.exports = {
         {
           name: "--logo-width <width>",
           description:
-            "logo width at @1x (in dp - we recommand approximately ~100)",
+            "logo width at @1x (in dp - we recommend approximately ~100)",
           default: 100,
           parse: (value) => parseInt(value, 10),
         },
@@ -37,21 +37,34 @@ module.exports = {
         { project: { android, ios } },
         { backgroundColor, logoWidth, assetsPath, flavor },
       ) => {
-        const workingDirectory =
+        const workingPath =
           process.env.INIT_CWD || process.env.PWD || process.cwd();
 
+        if (logoWidth > 288) {
+          console.log(
+            "❌  Logo width can't be superior to 288dp as it will be cropped on Android. Exiting…\n",
+          );
+
+          process.exit(1);
+        } else if (logoWidth > 192) {
+          console.log(
+            "⚠️   As logo width is superior to 192dp, it might be cropped on Android.\n",
+          );
+        }
+
         return generate({
           android,
           ios,
 
-          workingDirectory,
-          logoPath: path.resolve(workingDirectory, logoPath),
-          backgroundColor,
-          logoWidth,
-          flavor,
+          workingPath,
+          logoPath: path.resolve(workingPath, logoPath),
           assetsPath: assetsPath
-            ? path.resolve(workingDirectory, assetsPath)
+            ? path.resolve(workingPath, assetsPath)
             : undefined,
+
+          backgroundColor,
+          flavor,
+          logoWidth,
         }).catch((error) => {
           console.error(error);
         });