react-native-bootsplash 4.4.0 → 4.4.2

package/README.md

@@ -40,7 +40,7 @@ $ npm install --save react-native-bootsplash
 $ yarn add react-native-bootsplash
 ```
 
-Don't forget going into the `ios` directory to execute a `pod install`.
+_⚠️  Don't forget going into the `ios` directory to execute a `pod install`._
 
 ## 🆘 Manual linking
 
@@ -104,6 +104,8 @@ public class MainApplication extends Application implements ReactApplication {
 
 ## Setup
 
+ℹ️ For `react-native` < `0.71` setup, follow the [`v4.4.0 README.md`](https://github.com/zoontek/react-native-bootsplash/blob/4.4.0/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 ✨.
@@ -181,7 +183,7 @@ _⚠️  Only `.storyboard` files are supported ([Apple has deprecated other m
 
 ---
 
-Edit the `ios/YourProjectName/AppDelegate.m(m)` file:
+Edit the `ios/YourProjectName/AppDelegate.mm` file:
 
 ```obj-c
 #import "AppDelegate.h"
@@ -193,13 +195,11 @@ Edit the `ios/YourProjectName/AppDelegate.m(m)` file:
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  // …
-
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
+  self.moduleName = @"RNBootSplashExample";
+  self.initialProps = @{};
+  [super application:application didFinishLaunchingWithOptions:launchOptions];
 
-  [RNBootSplash initWithStoryboard:@"BootSplash" rootView:rootView]; // <- initialization using the storyboard file name
+  [RNBootSplash initWithStoryboard:@"BootSplash" rootView:self.window.rootViewController.view]; // <- initialization using the storyboard file name
 
   return YES;
 }
@@ -217,32 +217,21 @@ _⚠️  On Android >= 12, the splash screen will not appear if you start your
 
 ---
 
-1. As this library only support Android 6+, you probably have to edit your `android/build.gradle` file:
-
-```gradle
-buildscript {
-  ext {
-    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
-
-    // …
-```
-
-2. Then edit your `android/app/build.gradle` file:
+1. Edit your `android/app/build.gradle` file:
 
 ```gradle
 dependencies {
   // …
 
-  implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-  implementation "androidx.core:core-splashscreen:1.0.0" // Add this line
+  implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+  implementation("androidx.core:core-splashscreen:1.0.0") // Add this line
 
   // …
 ```
 
-3. Edit your `android/app/src/main/res/values/styles.xml` file:
+_⚠️  Don't forget going into the `android` directory to execute a `./gradlew clean && ./gradlew build` (or perform a Gradle sync in Android Studio)._
+
+2. Edit your `android/app/src/main/res/values/styles.xml` file:
 
 ```xml
 <resources>
@@ -261,7 +250,7 @@ dependencies {
 </resources>
 ```
 
-4. Edit your `android/app/src/main/AndroidManifest.xml` file:
+3. Edit your `android/app/src/main/AndroidManifest.xml` file:
 
 ```xml
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -282,7 +271,7 @@ dependencies {
 
 ```
 
-5. Finally edit your `android/app/src/main/java/com/yourprojectname/MainActivity.java` file:
+4. Finally edit your `android/app/src/main/java/com/yourprojectname/MainActivity.java` file:
 
 ```java
 // …
@@ -310,7 +299,7 @@ public class MainActivity extends ReactActivity {
 #### Method type
 
 ```ts
-type hide = (config?: { fade?: boolean, duration?: boolean }) => Promise<void>;
+type hide = (config?: { fade?: boolean; duration?: number }) => Promise<void>;
 ```
 
 Note: Only durations above 220ms are visually noticeable. Smaller values will be ignored and the default duration will be used.
@@ -387,7 +376,7 @@ function App() {
 
 ## With react-native-bars
 
-In order to keep fully transparent status and navigation bars on Android once the splash screen is hidden (and control them), this library play nicely with [react-native-bars](https://github.com/zoontek/react-native-bars). Check the [README](https://github.com/zoontek/react-native-bars/blob/main/README.md#with-react-native-bootsplash) for more informations.
+In order to keep fully transparent status and navigation bars on Android once the splash screen is hidden (and control them), this library play nicely with [react-native-bars](https://github.com/zoontek/react-native-bars). Check its [README](https://github.com/zoontek/react-native-bars/blob/main/README.md#with-react-native-bootsplash) for more informations.
 
 ## Testing with Jest
 

package/android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
             mavenCentral()
         }
         dependencies {
-            classpath("com.android.tools.build:gradle:7.2.1")
+            classpath("com.android.tools.build:gradle:7.3.1")
         }
     }
 }
@@ -20,11 +20,11 @@ buildscript {
 apply plugin: "com.android.library"
 
 android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 31)
-    buildToolsVersion safeExtGet("buildToolsVersion", "31.0.0")
+    compileSdkVersion safeExtGet("compileSdkVersion", 33)
+    buildToolsVersion safeExtGet("buildToolsVersion", "33.0.0")
     defaultConfig {
         minSdkVersion safeExtGet("minSdkVersion", 23)
-        targetSdkVersion safeExtGet("targetSdkVersion", 31)
+        targetSdkVersion safeExtGet("targetSdkVersion", 33)
     }
     lintOptions {
         abortOnError false

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

@@ -41,9 +41,8 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule {
 
   private static final RNBootSplashQueue<Promise> mPromiseQueue = new RNBootSplashQueue<>();
   private static Status mStatus = Status.HIDDEN;
-  private static boolean mShouldFade = false;
+  private static int mFadeDuration = 0;
   private static boolean mShouldKeepOnScreen = true;
-  private static int mAnimationDuration;
 
   public RNBootSplashModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -79,9 +78,9 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule {
 
         splashScreenView
           .animate()
+          .setDuration(mFadeDuration)
           // Crappy hack to avoid automatic layout transitions
-          .setDuration(mShouldFade ? mAnimationDuration: 0)
-          .setStartDelay(mShouldFade ? 0 : mAnimationDuration)
+          .setStartDelay(Math.min(0, mFadeDuration))
           .alpha(0.0f)
           .setInterpolator(new AccelerateInterpolator())
           .setListener(new AnimatorListenerAdapter() {
@@ -110,7 +109,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule {
     }
   }
 
-  private void hideAndResolveAll(final boolean fade) {
+  private void hideAndResolveAll() {
     if (mSplashScreen == null || mStatus == Status.HIDDEN) {
       clearPromiseQueue();
       return;
@@ -128,16 +127,15 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule {
           timer.schedule(new TimerTask() {
             @Override
             public void run() {
-              hideAndResolveAll(fade);
+              hideAndResolveAll();
               timer.cancel();
             }
           }, 250);
         } else {
-          if (fade) {
+          if (mFadeDuration > 0) {
             mStatus = Status.TRANSITIONING;
           }
 
-          mShouldFade = fade;
           mShouldKeepOnScreen = false;
 
           final Timer timer = new Timer();
@@ -151,17 +149,17 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule {
               timer.cancel();
               clearPromiseQueue();
             }
-          }, mAnimationDuration);
+          }, mFadeDuration);
         }
       }
     });
   }
 
   @ReactMethod
-  public void hide(final boolean fade, final int fadeDuration, final Promise promise) {
-    mAnimationDuration = fadeDuration;
+  public void hide(final double duration, final Promise promise) {
+    mFadeDuration = (int) Math.round(duration);
     mPromiseQueue.push(promise);
-    hideAndResolveAll(fade);
+    hideAndResolveAll();
   }
 
   @ReactMethod

package/dist/commonjs/index.js

@@ -8,14 +8,13 @@ exports.getVisibilityStatus = getVisibilityStatus;
 exports.hide = hide;
 var _reactNative = require("react-native");
 const NativeModule = _reactNative.NativeModules.RNBootSplash;
-const DEFAULT_DURATION = 220;
 function hide() {
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     fade = false,
-    duration = DEFAULT_DURATION
+    duration = 0
   } = config;
-  return NativeModule.hide(fade, Math.max(duration, DEFAULT_DURATION)).then(() => {});
+  return NativeModule.hide(fade ? Math.max(duration, 220) : 0).then(() => {});
 }
 function getVisibilityStatus() {
   return NativeModule.getVisibilityStatus();

package/dist/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModule","NativeModules","RNBootSplash","DEFAULT_DURATION","hide","config","fade","duration","Math","max","then","getVisibilityStatus"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;AAAA;AAKA,MAAMA,YAGL,GAAGC,0BAAa,CAACC,YAAY;AAE9B,MAAMC,gBAAgB,GAAG,GAAG;AAErB,SAASC,IAAI,GAAqC;EAAA,IAApCC,MAAc,uEAAG,CAAC,CAAC;EACtC,MAAM;IAAEC,IAAI,GAAG,KAAK;IAAEC,QAAQ,GAAGJ;EAAiB,CAAC,GAAGE,MAAM;EAC5D,OAAOL,YAAY,CAACI,IAAI,CAACE,IAAI,EAAEE,IAAI,CAACC,GAAG,CAACF,QAAQ,EAAEJ,gBAAgB,CAAC,CAAC,CAACO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACrF;AAEO,SAASC,mBAAmB,GAA8B;EAC/D,OAAOX,YAAY,CAACW,mBAAmB,EAAE;AAC3C;AAAC,eAEc;EACbP,IAAI;EACJO;AACF,CAAC;AAAA"}
+{"version":3,"names":["NativeModule","NativeModules","RNBootSplash","hide","config","fade","duration","Math","max","then","getVisibilityStatus"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;AAAA;AAKA,MAAMA,YAGL,GAAGC,0BAAa,CAACC,YAAY;AAEvB,SAASC,IAAI,GAAqC;EAAA,IAApCC,MAAc,uEAAG,CAAC,CAAC;EACtC,MAAM;IAAEC,IAAI,GAAG,KAAK;IAAEC,QAAQ,GAAG;EAAE,CAAC,GAAGF,MAAM;EAC7C,OAAOJ,YAAY,CAACG,IAAI,CAACE,IAAI,GAAGE,IAAI,CAACC,GAAG,CAACF,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAACG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7E;AAEO,SAASC,mBAAmB,GAA8B;EAC/D,OAAOV,YAAY,CAACU,mBAAmB,EAAE;AAC3C;AAAC,eAEc;EACbP,IAAI;EACJO;AACF,CAAC;AAAA"}

package/dist/module/index.js

@@ -1,13 +1,12 @@
 import { NativeModules } from "react-native";
 const NativeModule = NativeModules.RNBootSplash;
-const DEFAULT_DURATION = 220;
 export function hide() {
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     fade = false,
-    duration = DEFAULT_DURATION
+    duration = 0
   } = config;
-  return NativeModule.hide(fade, Math.max(duration, DEFAULT_DURATION)).then(() => {});
+  return NativeModule.hide(fade ? Math.max(duration, 220) : 0).then(() => {});
 }
 export function getVisibilityStatus() {
   return NativeModule.getVisibilityStatus();

package/dist/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","NativeModule","RNBootSplash","DEFAULT_DURATION","hide","config","fade","duration","Math","max","then","getVisibilityStatus"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAK5C,MAAMC,YAGL,GAAGD,aAAa,CAACE,YAAY;AAE9B,MAAMC,gBAAgB,GAAG,GAAG;AAE5B,OAAO,SAASC,IAAI,GAAqC;EAAA,IAApCC,MAAc,uEAAG,CAAC,CAAC;EACtC,MAAM;IAAEC,IAAI,GAAG,KAAK;IAAEC,QAAQ,GAAGJ;EAAiB,CAAC,GAAGE,MAAM;EAC5D,OAAOJ,YAAY,CAACG,IAAI,CAACE,IAAI,EAAEE,IAAI,CAACC,GAAG,CAACF,QAAQ,EAAEJ,gBAAgB,CAAC,CAAC,CAACO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACrF;AAEA,OAAO,SAASC,mBAAmB,GAA8B;EAC/D,OAAOV,YAAY,CAACU,mBAAmB,EAAE;AAC3C;AAEA,eAAe;EACbP,IAAI;EACJO;AACF,CAAC"}
+{"version":3,"names":["NativeModules","NativeModule","RNBootSplash","hide","config","fade","duration","Math","max","then","getVisibilityStatus"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAK5C,MAAMC,YAGL,GAAGD,aAAa,CAACE,YAAY;AAE9B,OAAO,SAASC,IAAI,GAAqC;EAAA,IAApCC,MAAc,uEAAG,CAAC,CAAC;EACtC,MAAM;IAAEC,IAAI,GAAG,KAAK;IAAEC,QAAQ,GAAG;EAAE,CAAC,GAAGF,MAAM;EAC7C,OAAOH,YAAY,CAACE,IAAI,CAACE,IAAI,GAAGE,IAAI,CAACC,GAAG,CAACF,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAACG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7E;AAEA,OAAO,SAASC,mBAAmB,GAA8B;EAC/D,OAAOT,YAAY,CAACS,mBAAmB,EAAE;AAC3C;AAEA,eAAe;EACbP,IAAI;EACJO;AACF,CAAC"}

package/dist/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,QAAQ,GAAG,eAAe,CAAC;AACtE,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAS3D,wBAAgB,IAAI,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGvD;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAE/D;;;;;AAED,wBAGE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,QAAQ,GAAG,eAAe,CAAC;AACtE,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAO3D,wBAAgB,IAAI,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGvD;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAE/D;;;;;AAED,wBAGE"}

package/ios/RNBootSplash.m

@@ -84,8 +84,7 @@ RCT_EXPORT_MODULE();
 }
 
 RCT_REMAP_METHOD(hide,
-                 hideWithFade:(BOOL)fade
-                 duration:(NSInteger)duration
+                 hideWithDuration:(double)duration
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
   if (_resolverQueue == nil)
@@ -96,7 +95,9 @@ RCT_REMAP_METHOD(hide,
   if ([RNBootSplash isHidden] || RCTRunningInAppExtension())
     return [self clearResolverQueue];
 
-  if (!fade) {
+  float roundedDuration = lroundf((float)duration);
+
+  if (roundedDuration <= 0) {
     [RNBootSplash removeLoadingView];
     return [self clearResolverQueue];
   }
@@ -105,7 +106,7 @@ RCT_REMAP_METHOD(hide,
     _isTransitioning = true;
 
     [UIView transitionWithView:_rootView
-                      duration:duration / 1000.0
+                      duration:roundedDuration / 1000.0
                        options:UIViewAnimationOptionTransitionCrossDissolve
                     animations:^{
       _rootView.loadingView.hidden = YES;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",
@@ -64,15 +64,14 @@
     "picocolors": "^1.0.0"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "@types/react-native": "^0.70.7",
-    "lint-staged": "^13.0.4",
-    "prettier": "^2.8.0",
-    "prettier-plugin-organize-imports": "^3.2.1",
-    "react": "18.1.0",
-    "react-native": "0.70.6",
-    "react-native-builder-bob": "^0.20.2",
-    "rescript": "^10.0.1",
-    "typescript": "^4.9.3"
+    "@types/fs-extra": "^11.0.1",
+    "lint-staged": "^13.1.0",
+    "prettier": "^2.8.3",
+    "prettier-plugin-organize-imports": "^3.2.2",
+    "react": "18.2.0",
+    "react-native": "0.71.1",
+    "react-native-builder-bob": "^0.20.3",
+    "rescript": "^10.1.2",
+    "typescript": "^4.9.5"
   }
 }

package/src/index.ts

@@ -1,18 +1,16 @@
 import { NativeModules } from "react-native";
 
 export type VisibilityStatus = "visible" | "hidden" | "transitioning";
-export type Config = { fade?: boolean, duration?: number };
+export type Config = { fade?: boolean; duration?: number };
 
 const NativeModule: {
-  hide: (fade: boolean, duration: number) => Promise<true>;
+  hide: (duration: number) => Promise<true>;
   getVisibilityStatus: () => Promise<VisibilityStatus>;
 } = NativeModules.RNBootSplash;
 
-const DEFAULT_DURATION = 220;
-
 export function hide(config: Config = {}): Promise<void> {
-  const { fade = false, duration = DEFAULT_DURATION } = config;
-  return NativeModule.hide(fade, Math.max(duration, DEFAULT_DURATION)).then(() => {});
+  const { fade = false, duration = 0 } = config;
+  return NativeModule.hide(fade ? Math.max(duration, 220) : 0).then(() => {});
 }
 
 export function getVisibilityStatus(): Promise<VisibilityStatus> {

package/android/.npmignore

@@ -1,11 +0,0 @@
-.gradle/
-.idea/
-build/
-gradle/
-
-.DS_Store
-.npmignore
-gradlew
-gradlew.bat
-*.iml
-local.properties

package/ios/.npmignore

@@ -1,8 +0,0 @@
-Pods/
-build/
-
-*/project.xcworkspace/
-*/xcuserdata/
-
-.DS_Store
-.npmignore