Merge pull request #1012 from mendix/fix/MOO-1251-Splash-Screen-10.18

NikolaSimsic · web-flow · commit 1e2792269def · 2025-05-08T14:04:03.000+02:00
[MOO-1251] Fix splash screen issue [SP-10.18]
diff --git a/ios/Dev/LaunchApp/LaunchAppViewController.swift b/ios/Dev/LaunchApp/LaunchAppViewController.swift
@@ -123,8 +123,11 @@ class LaunchAppViewController: UIViewController, QRViewDelegate {
             isDevModeEnabled: devModeEnabled)
         
         let runtimeUrl: URL = AppUrl.forRuntime(AppPreferences.getAppUrl())!
+        
+        let mxApp = MendixApp.init(nil, bundleUrl: url!, runtimeUrl: runtimeUrl, warningsFilter: devModeEnabled ? WarningsFilter.partial : WarningsFilter.none, isDeveloperApp: true, clearDataAtLaunch: clearDataSwitch.isOn, reactLoading: UIStoryboard(name: "LaunchScreen", bundle: nil))
+        mxApp.splashScreenPresenter = SplashScreenPresenter()
 
-        ReactNative.instance.setup(MendixApp.init(nil, bundleUrl: url!, runtimeUrl: runtimeUrl, warningsFilter: devModeEnabled ? WarningsFilter.partial : WarningsFilter.none, isDeveloperApp: true, clearDataAtLaunch: clearDataSwitch.isOn, reactLoading: UIStoryboard(name: "LaunchScreen", bundle: nil)))
+        ReactNative.instance.setup(mxApp)
     }
 }
 
diff --git a/ios/StoryBoardSplash.m b/ios/StoryBoardSplash.m
@@ -16,7 +16,7 @@ + (void)showStoryBoard:(NSString *)name inRootView:(UIView *)rootView {
 }
 
 + (void)hideStoryBoard {
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
       [UIView animateWithDuration:0.3
            delay:0
          options:UIViewAnimationOptionCurveEaseIn

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,11 @@ class LaunchAppViewController: UIViewController, QRViewDelegate {`
`123`	`123`	`isDevModeEnabled: devModeEnabled)`
`124`	`124`
`125`	`125`	`let runtimeUrl: URL = AppUrl.forRuntime(AppPreferences.getAppUrl())!`
	`126`	`+`
	`127`	`+ let mxApp = MendixApp.init(nil, bundleUrl: url!, runtimeUrl: runtimeUrl, warningsFilter: devModeEnabled ? WarningsFilter.partial : WarningsFilter.none, isDeveloperApp: true, clearDataAtLaunch: clearDataSwitch.isOn, reactLoading: UIStoryboard(name: "LaunchScreen", bundle: nil))`
	`128`	`+ mxApp.splashScreenPresenter = SplashScreenPresenter()`
`126`	`129`
`127`		`- ReactNative.instance.setup(MendixApp.init(nil, bundleUrl: url!, runtimeUrl: runtimeUrl, warningsFilter: devModeEnabled ? WarningsFilter.partial : WarningsFilter.none, isDeveloperApp: true, clearDataAtLaunch: clearDataSwitch.isOn, reactLoading: UIStoryboard(name: "LaunchScreen", bundle: nil)))`
	`130`	`+ ReactNative.instance.setup(mxApp)`
`128`	`131`	`}`
`129`	`132`	`}`
`130`	`133`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ + (void)showStoryBoard:(NSString )name inRootView:(UIView )rootView {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`+ (void)hideStoryBoard {`
`19`		`- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{`
	`19`	`+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{`
`20`	`20`	`[UIView animateWithDuration:0.3`
`21`	`21`	`delay:0`
`22`	`22`	`options:UIViewAnimationOptionCurveEaseIn`