Merge pull request #1083 from mendix/moo/dependency-update/react-native-bootsplash

migrate to react native boot splash

Author: NikolaSimsic

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+- We have migrated from `react-native-splash-screen@3.2.0` to `react-native-bootsplash@^7.7.0` for better splash screen support and autolinking compatibility.
+
 - We added a new property to gradle.properties for scanning QR codes.
 
 - We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features

android/app/build.gradle

@@ -120,7 +120,6 @@ dependencies {
     implementation("com.facebook.react:hermes-android")
 
     implementation project(':react-native-localize')
-    implementation project(":react-native-splash-screen")
     implementation project(":mendixnative-release")
 
     // Explicit add okhttp

android/app/src/appstore/java/com/mendix/nativetemplate/MainActivity.java

@@ -10,13 +10,13 @@
 import com.mendix.mendixnative.config.AppUrl;
 import com.mendix.mendixnative.react.MendixApp;
 import com.mendix.mendixnative.react.MxConfiguration;
+import com.zoontek.rnbootsplash.RNBootSplash;
 
-import org.devio.rn.splashscreen.SplashScreen;
 
 public class MainActivity extends MendixReactActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        SplashScreen.show(this);
+        RNBootSplash.init(this, R.style.BootTheme);
         this.getLifecycle().addObserver(new MendixActivityObserver(this));
         boolean hasDeveloperSupport = ((MainApplication) getApplication()).getUseDeveloperSupport();
         mendixApp = new MendixApp(AppUrl.getUrlFromResource(this), MxConfiguration.WarningsFilter.none, hasDeveloperSupport, false);

android/app/src/dev/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <application
         android:name="com.mendix.nativetemplate.DevApplication"
+        android:label="@string/app_name"
         tools:replace="android:name">
         <activity
             android:name="com.mendix.nativetemplate.MainActivity"

android/app/src/main/java/com/mendix/nativetemplate/MainApplication.java

@@ -9,8 +9,7 @@
 import com.mendix.mendixnative.MendixReactApplication;
 import com.mendix.mendixnative.react.splash.MendixSplashScreenPresenter;
 
-import org.devio.rn.splashscreen.SplashScreen;
-import org.devio.rn.splashscreen.SplashScreenReactPackage;
+import com.zoontek.rnbootsplash.RNBootSplash;
 
 import java.util.List;
 
@@ -27,7 +26,6 @@ public List<ReactPackage> getPackages() {
 
         // Packages that cannot be autolinked yet can be added manually here, for example:
         // packages.add(new MyReactNativePackage());
-        packages.add(new SplashScreenReactPackage());
 
         return packages;
     }
@@ -38,12 +36,12 @@ public MendixSplashScreenPresenter createSplashScreenPresenter() {
             @Override
             public void show(@NonNull Activity activity) {
                 hide(activity);
-                SplashScreen.show(activity, true);
+                RNBootSplash.init(activity, R.style.BootTheme);
             }
 
             @Override
             public void hide(@NonNull Activity activity) {
-                SplashScreen.hide(activity);
+                RNBootSplash.hide(activity);
             }
         };
     }

android/app/src/main/res/values/styles.xml

@@ -20,4 +20,9 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
 
+    <!-- BootSplash theme. -->
+    <style name="BootTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@drawable/splash_screen</item>
+    </style>
+
 </resources>

android/settings.gradle

@@ -6,8 +6,6 @@ rootProject.name = 'nativeTemplate'
 
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
-include ':react-native-splash-screen'
-project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
 include ':mendixnative-release'
 project(':mendixnative-release').projectDir = new File(rootProject.projectDir, '../node_modules/@mendix/native/androidlib')
 

ios/Podfile

@@ -53,7 +53,6 @@ def common_pods
   # RN pods end
 
   # Manually linked dependencies
-  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
 
   # Third party dependencies of dependencies
   pod 'IQKeyboardManager'

ios/Podfile.lock

@@ -1301,8 +1301,6 @@ PODS:
     - Yoga
   - react-native-safe-area-context (5.2.0):
     - React-Core
-  - react-native-splash-screen (3.2.0):
-    - React
   - react-native-video (6.10.0):
     - DoubleConversion
     - glog
@@ -1635,6 +1633,8 @@ PODS:
     - React-logger (= 0.77.3)
     - React-perflogger (= 0.77.3)
     - React-utils (= 0.77.3)
+  - RNBootSplash (6.3.10):
+    - React-Core
   - RNCAsyncStorage (2.0.0):
     - React-Core
   - RNCPicker (2.11.0):
@@ -1871,7 +1871,6 @@ DEPENDENCIES:
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
-  - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
   - react-native-video (from `../node_modules/react-native-video`)
   - React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
@@ -1902,6 +1901,7 @@ DEPENDENCIES:
   - ReactAppDependencyProvider (from `build/generated/ios`)
   - ReactCodegen (from `build/generated/ios`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - RNBootSplash (from `../node_modules/react-native-bootsplash`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
   - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
@@ -2017,8 +2017,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-pager-view"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
-  react-native-splash-screen:
-    :path: "../node_modules/react-native-splash-screen"
   react-native-video:
     :path: "../node_modules/react-native-video"
   React-nativeconfig:
@@ -2079,6 +2077,8 @@ EXTERNAL SOURCES:
     :path: build/generated/ios
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNBootSplash:
+    :path: "../node_modules/react-native-bootsplash"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCPicker:
@@ -2110,17 +2110,17 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
-  DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
+  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
   fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
   FBLazyVector: 23d8c5470c648a635893dc0956c6dbaead54b656
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
-  glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
+  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
   hermes-engine: b2187dbe13edb0db8fcb2a93a69c1987a30d98a4
   IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
   libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
-  op-sqlite: 137cd6d3df9b86e147fb7e2f70c8d6f97bd0941b
+  op-sqlite: 7c3a6a7f84f0969b96266dbd143a3793bc2bc9cf
   OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
   RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
   RCTDeprecation: 6ee92578d332db1d4e03267d3ae98bcf8b780863
@@ -2156,7 +2156,6 @@ SPEC CHECKSUMS:
   react-native-image-picker: f104798044ef2c9211c42a48025d0693b5f34981
   react-native-pager-view: c3b8efd9000368320e3710c01f38a83bd2170779
   react-native-safe-area-context: 849d7df29ecb2a7155c769c0b76849ba952c2aa3
-  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
   react-native-video: fcf88c7e93d7736a529f97f70ce92269684596ec
   React-nativeconfig: f77b4627803bf7886a1f2e96b33b8af34e583cc4
   React-NativeModulesApple: 6bfb56c8a05c9181727a4375c6fce152171c038d
@@ -2187,6 +2186,7 @@ SPEC CHECKSUMS:
   ReactAppDependencyProvider: 9b3704075c2fe8fd7c739779655fb88700a1ca30
   ReactCodegen: c9645fb81bcaf5afebaebb25874bcd5224cd40f1
   ReactCommon: 271491c2343c91609d3dc18bb4b4ebe67160de03
+  RNBootSplash: 2c6b226e3ad3c97d16b6d53bd75d0cd281646bfb
   RNCAsyncStorage: d35c79ffba52c1013013e16b1fc295aec2feabb6
   RNCPicker: 4f6d5e8d107064be32dfc8f1bcb5a3741135db0b
   RNDateTimePicker: 40ffda97d071a98a10fdca4fa97e3977102ccd14
@@ -2205,8 +2205,8 @@ SPEC CHECKSUMS:
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
-  Yoga: 92f3bb322c40a86b7233b815854730442e01b8c4
+  Yoga: 7d51419602153919f32aec72812e324d495ee49d
 
-PODFILE CHECKSUM: 0721d8defdcee9bbb168ccd39c73b4972842a2af
+PODFILE CHECKSUM: 3a8acfa5ed60e25f017b7a2eeb4be9c332572cf6
 
 COCOAPODS: 1.16.2

ios/RNSplashScreen+StoryBoardSplash.h

@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
-#import "RNSplashScreen.h"
- 
-@interface RNSplashScreen (StoryBoardSplash)
+#import "RNBootSplash.h"
+
+@interface RNBootSplash (StoryBoardSplash)
 + (void)showStoryBoard:(NSString *)name inRootView:(UIView *)rootView;
 + (void)hideStoryBoard;
 @end