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

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Mathieu Acthernoene
+Copyright (c) 2021 Mathieu Acthernoene
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -22,10 +22,8 @@ Show a bootsplash during app startup. Hide it when you are ready.
 
 | version | react-native version |
 | ------- | -------------------- |
+| 4.0.0+  | 0.65.0+              |
 | 3.0.0+  | 0.63.0+              |
-| 2.0.0+  | 0.60.0+              |
-
-For 0.59-, you should use [`jetify -r`](https://github.com/mikehardy/jetifier/blob/master/README.md#to-reverse-jetify--convert-node_modules-dependencies-to-support-libraries)
 
 ## Installation
 
@@ -39,7 +37,7 @@ Don't forget going into the `ios` directory to execute a `pod install`.
 
 ## 🆘 Manual linking
 
-Because this package targets React Native 0.60.0+, you will probably don't need to link it manually. Otherwise if it's not the case, follow this additional instructions:
+Because this package targets React Native 0.65.0+, you will probably don't need to link it manually. Otherwise if it's not the case, follow this additional instructions:
 
 <details>
   <summary><b>👀 See manual linking instructions</b></summary>
@@ -139,7 +137,6 @@ yarn react-native generate-bootsplash assets/bootsplash_logo_original.png \
 This tool relies on the naming conventions that are used in the `/example` project and will therefore create the following files:
 
 ```bash
-android/app/src/main/res/drawable/bootsplash.xml
 android/app/src/main/res/values/colors.xml (creation and edition)
 android/app/src/main/res/mipmap-hdpi/bootsplash_logo.png
 android/app/src/main/res/mipmap-mdpi/bootsplash_logo.png
@@ -198,42 +195,34 @@ Set the `BootSplash.storyboard` as launch screen file:
 
 ### Android
 
-1. Edit the `android/app/src/main/java/com/yourprojectname/MainActivity.java` file:
-
-```java
-import android.os.Bundle; // <- add this necessary import
-
-import com.facebook.react.ReactActivity;
-import com.zoontek.rnbootsplash.RNBootSplash; // <- add this necessary import
-
-public class MainActivity extends ReactActivity {
+1. As this library only support Android 6+, you probably have to edit your `android/build.gradle` file:
 
-  // …
+```gradle
+buildscript {
+  ext {
+    buildToolsVersion = "30.0.2"
+    minSdkVersion = 23 // <- set at least 23
+    compileSdkVersion = 31 // <- set at least 31
+    targetSdkVersion = 31 // <- set at least 31
 
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    RNBootSplash.init(R.drawable.bootsplash, MainActivity.this); // <- display the generated bootsplash.xml drawable over our MainActivity
-  }
+    // …
 ```
 
-As Android will not create our main activity before launching the app, we need to display a different activity at start, then switch to our main one.
-
 2. Edit the `android/app/src/main/res/values/styles.xml` file:
 
 ```xml
 <resources>
 
-  <!-- Base application theme -->
-  <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-    <!-- Your base theme customization -->
-  </style>
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <!-- Your base theme customization -->
+    </style>
 
-  <!-- Add the following lines (BootTheme should inherit from AppTheme) -->
-  <style name="BootTheme" parent="AppTheme">
-    <!-- set the generated bootsplash.xml drawable as activity background -->
-    <item name="android:background">@drawable/bootsplash</item>
-  </style>
+    <!-- BootTheme should inherit from Theme.SplashScreen -->
+    <style name="BootTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
 
 </resources>
 ```
@@ -244,72 +233,65 @@ As Android will not create our main activity before launching the app, we need t
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.rnbootsplashexample">
 
-  <!-- … -->
-
-  <application
-    android:name=".MainApplication"
-    android:label="@string/app_name"
-    android:icon="@mipmap/ic_launcher"
-    android:roundIcon="@mipmap/ic_launcher_round"
-    android:allowBackup="false"
-    android:theme="@style/AppTheme">
-
-    <activity
-      android:name=".MainActivity"
-      android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-      android:label="@string/app_name"
-      android:windowSoftInputMode="adjustResize"
-      android:exported="true"
-      android:launchMode="singleTask">
-      <!-- ⚠️ add android:exported="true" and android:launchMode="singleTask" above -->
-      <!-- remove the <intent-filter> from .MainActivity -->
-    </activity>
-
-    <!-- add the following lines (use the theme you created at step 2) -->
-    <activity
-      android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"
-      android:theme="@style/BootTheme"
-      android:launchMode="singleTask">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-
     <!-- … -->
 
-  </application>
-
+    <application
+        android:name=".MainApplication"
+        android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
+        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>
-```
-
-## API
 
-### hide()
+```
 
-#### Method type
+4. Finally edit your `android/app/src/main/java/com/yourprojectname/MainActivity.java` file:
 
-```ts
-type hide = (config?: { fade?: boolean }) => Promise<void>;
-```
+```java
+import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate; // <- add this necessary import
+import com.zoontek.rnbootsplash.RNBootSplash; // <- add this necessary import
 
-#### Usage
+public class MainActivity extends ReactActivity {
 
-```js
-import RNBootSplash from "react-native-bootsplash";
+  // …
 
-RNBootSplash.hide(); // immediate
-RNBootSplash.hide({ fade: true }); // fade
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return new ReactActivityDelegate(this, getMainComponentName()) {
+
+      @Override
+      protected void loadApp(String appKey) {
+        RNBootSplash.init(R.drawable.bootsplash, MainActivity.this); // <- initialize the splash screen
+        super.loadApp(appKey);
+      }
+    };
+  }
+}
 ```
 
----
+## API
 
-### show()
+### hide()
 
 #### Method type
 
 ```ts
-type show = (config?: { fade?: boolean }) => Promise<void>;
+type hide = (config?: { fade?: boolean }) => Promise<void>;
 ```
 
 #### Usage
@@ -317,8 +299,8 @@ type show = (config?: { fade?: boolean }) => Promise<void>;
 ```js
 import RNBootSplash from "react-native-bootsplash";
 
-RNBootSplash.show(); // immediate
-RNBootSplash.show({ fade: true }); // fade
+RNBootSplash.hide(); // immediate
+RNBootSplash.hide({ fade: true }); // fade
 ```
 
 ---
@@ -365,62 +347,6 @@ function App() {
 
 **🤙 A more complex example is available in the [`/example` folder](example).**
 
-## Guides
-
-### Handle deep linking (on Android)
-
-If you want to correctly handle [deep linking](https://developer.android.com/training/app-links/deep-linking) with this package, you should edit the `android/app/src/main/AndroidManifest.xml` file like this:
-
-```xml
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.rnbootsplashexample">
-
-  <!-- … -->
-
-  <application
-    android:name=".MainApplication"
-    android:label="@string/app_name"
-    android:icon="@mipmap/ic_launcher"
-    android:roundIcon="@mipmap/ic_launcher_round"
-    android:allowBackup="false"
-    android:theme="@style/AppTheme">
-
-    <activity
-      android:name=".MainActivity"
-      android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-      android:label="@string/app_name"
-      android:windowSoftInputMode="adjustResize"
-      android:exported="true"
-      android:launchMode="singleTask">
-      <!-- ⚠️ add android:exported="true" and android:launchMode="singleTask" above -->
-      <!-- remove the <intent-filter> from .MainActivity -->
-    </activity>
-
-    <activity
-      android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"
-      android:theme="@style/BootTheme"
-      android:launchMode="singleTask">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-
-      <!-- add your deep linking instructions inside the RNBootSplashActivity declaration -->
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="YOUR APP SCHEME" /> <!-- replace this with your custom scheme -->
-      </intent-filter>
-    </activity>
-
-    <!-- … -->
-
-  </application>
-
-</manifest>
-```
-
 ### Testing with Jest
 
 Testing code which uses this library required some setup since we need to mock the native methods.
@@ -430,7 +356,6 @@ To add the mocks, create a file _jest/setup.js_ (or any other file name) contain
 ```js
 jest.mock("react-native-bootsplash", () => {
   return {
-    hide: jest.fn().mockResolvedValueOnce(),
     show: jest.fn().mockResolvedValueOnce(),
     getVisibilityStatus: jest.fn().mockResolvedValue("hidden"),
   };

package/RNBootSplash.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors         = package["author"]
   s.homepage        = package["homepage"]
 
-  s.platforms       = { :ios => "9.0", :tvos => "11.0" }
+  s.platforms       = { :ios => "11.0" }
   s.requires_arc    = true
 
   s.source          = { :git => package["repository"]["url"], :tag => s.version }

package/ReactNativeBootsplash.res

@@ -1,22 +1,18 @@
 type config = {fade: bool}
 
-@bs.module("react-native-bootsplash") @bs.scope("default")
+@module("react-native-bootsplash") @scope("default")
 external hide: config => Js.Promise.t<unit> = "hide"
 
-@bs.module("react-native-bootsplash") @bs.scope("default")
-external show: config => Js.Promise.t<unit> = "show"
-
 // Note that this binding requires BuckleScript >= 8.2.0
 type visibilityStatus = [#visible | #hidden | #transitioning]
 
-@bs.module("react-native-bootsplash") @bs.scope("default")
+@module("react-native-bootsplash") @scope("default")
 external getVisibilityStatus: unit => Js.Promise.t<visibilityStatus> = "getVisibilityStatus"
 /*
 ## Usage
 
 ```rescript
  ReactNativeBootsplash.hide({fade: true})->ignore
- ReactNativeBootSplash.show({fade: false})->ignore
 ```
 
 Or

package/android/build.gradle

@@ -8,23 +8,23 @@ buildscript {
     // module dependency in an application project.
     if (project == rootProject) {
         repositories {
-            mavenCentral()
             google()
+            mavenCentral()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:4.1.0'
+            classpath("com.android.tools.build:gradle:4.2.2")
         }
     }
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 29)
-    buildToolsVersion safeExtGet('buildToolsVersion', '29.0.3')
+    compileSdkVersion safeExtGet("compileSdkVersion", 31)
+    buildToolsVersion safeExtGet("buildToolsVersion", "30.0.2")
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 29)
+        minSdkVersion safeExtGet("minSdkVersion", 23)
+        targetSdkVersion safeExtGet("targetSdkVersion", 31)
     }
     lintOptions {
         abortOnError false
@@ -32,20 +32,22 @@ android {
 }
 
 repositories {
-    mavenLocal()
     mavenCentral()
+    mavenLocal()
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
+        url("$rootDir/../node_modules/react-native/android")
     }
     maven {
         // Android JSC is installed from npm
-        url "$rootDir/../node_modules/jsc-android/dist"
+        url("$rootDir/../node_modules/jsc-android/dist")
     }
     google()
+    maven { url "https://www.jitpack.io" }
 }
 
 dependencies {
     //noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-native:+' // From node_modules
+    implementation "com.facebook.react:react-native:+" // From node_modules
+    implementation "androidx.core:core-splashscreen:${safeExtGet("androidXSplashScreenVersion", "1.0.0-alpha02")}"
 }

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

@@ -2,20 +2,11 @@ package com.zoontek.rnbootsplash;
 
 import android.app.Activity;
 
-import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
 
 public class RNBootSplash {
 
-  public static void init(@NonNull final Activity activity,
-                          @StyleRes final int bootThemeResId) {
-    RNBootSplashModule.init(activity, bootThemeResId, android.R.color.white);
-  }
-
-  public static void init(@NonNull final Activity activity,
-                          @StyleRes final int bootThemeResId,
-                          @ColorRes final int backgroundColorResId) {
-    RNBootSplashModule.init(activity, bootThemeResId, backgroundColorResId);
+  public static void init(@NonNull final Activity activity) {
+    RNBootSplashModule.init(activity);
   }
 }