react-native-bootsplash 4.1.3 → 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 ✨.
@@ -138,7 +140,7 @@ You might want to use SVG as input file. For that, you can install a CLI tool to
 
 ```bash
 $ brew install librsvg # available on macOS
-$ rsvg-convert -w 3000 bootsplash_logo.svg bootsplash_logo.png # create a large PNG with generous leeway for 4x Android xxxhdpi devices
+$ 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
 ```
@@ -172,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];
@@ -211,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
@@ -223,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
 
   // …
@@ -266,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>
 
@@ -287,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);
+    }
   }
 }
 ```
@@ -396,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"),
   };
 });

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/ios/RNBootSplash.h

@@ -4,6 +4,6 @@
 @interface RNBootSplash : NSObject <RCTBridgeModule>
 
 + (void)initWithStoryboard:(NSString * _Nonnull)storyboardName
-                  rootView:(RCTRootView * _Nullable)rootView;
+                  rootView:(UIView * _Nullable)rootView;
 
 @end

package/ios/RNBootSplash.m

@@ -20,11 +20,14 @@ RCT_EXPORT_MODULE();
 }
 
 + (void)initWithStoryboard:(NSString * _Nonnull)storyboardName
-                  rootView:(RCTRootView * _Nullable)rootView {
-  if (rootView == nil || _rootView != nil || RCTRunningInAppExtension())
+                  rootView:(UIView * _Nullable)rootView {
+  if (rootView == nil ||
+      ![rootView isKindOfClass:[RCTRootView class]] ||
+      _rootView != nil ||
+      RCTRunningInAppExtension())
     return;
 
-  _rootView = rootView;
+  _rootView = (RCTRootView *)rootView;
 
   [[NSNotificationCenter defaultCenter] removeObserver:rootView
                                                   name:RCTContentDidAppearNotification

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "4.1.3",
+  "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.15",
-    "lint-staged": "^12.3.3",
-    "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.67.2",
+    "react-native": "^0.68.0",
     "react-native-builder-bob": "^0.18.2",
     "rescript": "^9.1.4",
-    "typescript": "^4.5.5"
+    "typescript": "^4.6.3"
   }
 }