Skip to content

Embed launch storyboard vc into RNNSplashScreen #6803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 2, 2020
Merged

Embed launch storyboard vc into RNNSplashScreen #6803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e39ea10
Simplified resolving status bar style
danilobuerger Dec 1, 2020
7a9f5d5
Support UIStatusBarStyleDarkContent in splash screen
danilobuerger Dec 1, 2020
e6fa5ab
Embed launch storyboard vc into RNNSplashScreen
danilobuerger Dec 1, 2020
52470bb
Merge branch 'master' into statusbarstyle
guyca Dec 1, 2020
09bfa36
Merge branch 'master' into statusbarstyle
guyca Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions lib/ios/RNNBasePresenter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,9 @@ - (UIStatusBarStyle)getStatusBarStyle {
} else if (@available(iOS 13.0, *)) {
if ([statusBarStyle isEqualToString:@"dark"]) {
return UIStatusBarStyleDarkContent;
} else {
return UIStatusBarStyleDefault;
}
} else {
return UIStatusBarStyleDefault;
}
return UIStatusBarStyleDefault;
}

- (BOOL)getStatusBarVisibility {
Expand Down
15 changes: 12 additions & 3 deletions lib/ios/RNNSplashScreen.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ + (void)showOnWindow:(UIWindow *)window {
@try {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:launchStoryBoard
bundle:nil];
viewController = [storyboard instantiateInitialViewController];
UIViewController *launchVC = [storyboard instantiateInitialViewController];

viewController = [[RNNSplashScreen alloc] init];
[viewController addChildViewController:launchVC];
[viewController.view addSubview:launchVC.view];
[launchVC didMoveToParentViewController:viewController];
} @catch (NSException *e) {
UIView *splashView = [[NSBundle mainBundle] loadNibNamed:launchStoryBoard
owner:self
Expand Down Expand Up @@ -85,9 +90,13 @@ + (void)showOnWindow:(UIWindow *)window {
- (UIStatusBarStyle)preferredStatusBarStyle {
NSString *styleString = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIStatusBarStyle"];

if ([styleString isEqualToString:@"UIStatusBarStyleLightContent"])
if ([styleString isEqualToString:@"UIStatusBarStyleLightContent"]) {
return UIStatusBarStyleLightContent;

} else if (@available(iOS 13.0, *)) {
if ([styleString isEqualToString:@"UIStatusBarStyleDarkContent"]) {
return UIStatusBarStyleDarkContent;
}
}
return UIStatusBarStyleDefault;
}

Expand Down