From 92c71ae385d9770e7ac3db4c9a072151e923012d Mon Sep 17 00:00:00 2001
From: Andrey Filipenkov <[EMAIL REDACTED]>
Date: Wed, 5 Oct 2022 21:59:08 +0300
Subject: [PATCH] [iOS] respect initial status bar configuration when
displaying the launch storyboard
---
src/video/uikit/SDL_uikitappdelegate.m | 58 +++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 1 deletion(-)
diff --git a/src/video/uikit/SDL_uikitappdelegate.m b/src/video/uikit/SDL_uikitappdelegate.m
index 37bd4c78604..3186cc6e8a9 100644
--- a/src/video/uikit/SDL_uikitappdelegate.m
+++ b/src/video/uikit/SDL_uikitappdelegate.m
@@ -33,6 +33,14 @@
#include "../../events/SDL_events_c.h"
+#if !TARGET_OS_TV
+#include <AvailabilityVersions.h>
+
+# ifndef __IPHONE_13_0
+# define __IPHONE_13_0 130000
+# endif
+#endif
+
#ifdef main
#undef main
#endif
@@ -116,6 +124,53 @@ int SDL_UIKitRunApp(int argc, char *argv[], SDL_main_func mainFunction)
return image;
}
+
+@interface SDLLaunchStoryboardViewController : UIViewController
+@property (nonatomic, strong) UIViewController *storyboardViewController;
+- (instancetype)initWithStoryboardViewController:(UIViewController *)storyboardViewController;
+@end
+
+@implementation SDLLaunchStoryboardViewController
+
+- (instancetype)initWithStoryboardViewController:(UIViewController *)storyboardViewController {
+ self = [super init];
+ self.storyboardViewController = storyboardViewController;
+ return self;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ [self addChildViewController:self.storyboardViewController];
+ [self.view addSubview:self.storyboardViewController.view];
+ self.storyboardViewController.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ self.storyboardViewController.view.frame = self.view.bounds;
+ [self.storyboardViewController didMoveToParentViewController:self];
+
+ UIApplication.sharedApplication.statusBarHidden = self.prefersStatusBarHidden;
+ UIApplication.sharedApplication.statusBarStyle = self.preferredStatusBarStyle;
+}
+
+- (BOOL)prefersStatusBarHidden {
+ return [[NSBundle.mainBundle objectForInfoDictionaryKey:@"UIStatusBarHidden"] boolValue];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+ NSString *statusBarStyle = [NSBundle.mainBundle objectForInfoDictionaryKey:@"UIStatusBarStyle"];
+ if ([statusBarStyle isEqualToString:@"UIStatusBarStyleLightContent"]) {
+ return UIStatusBarStyleLightContent;
+ }
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
+ if (@available(iOS 13.0, *)) {
+ if ([statusBarStyle isEqualToString:@"UIStatusBarStyleDarkContent"]) {
+ return UIStatusBarStyleDarkContent;
+ }
+ }
+#endif
+ return UIStatusBarStyleDefault;
+}
+
+@end
#endif /* !TARGET_OS_TV */
@interface SDLLaunchScreenController ()
@@ -374,7 +429,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
* Xcode. We'll try to load it as a storyboard first, as it's more
* modern. */
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:screenname bundle:bundle];
- vc = [storyboard instantiateInitialViewController];
+ __auto_type storyboardVc = [storyboard instantiateInitialViewController];
+ vc = [[SDLLaunchStoryboardViewController alloc] initWithStoryboardViewController:storyboardVc];
}
@catch (NSException *exception) {
/* Do nothing (there's more code to execute below). */