Skip to content

[iOS] Add support for storyboard launch screen with preserving original functionality #2476

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

Closed
krystofcelba wants to merge 3 commits into from
Closed

[iOS] Add support for storyboard launch screen with preserving original functionality #2476

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cd8cc8
Add support for storyboard launch screen
krystofcelba Jan 4, 2018
5f53532
Merge branch 'master' into launchscreen-storyboards
krystofcelba Jan 5, 2018
b78a2a8
Merge branch 'master' into launchscreen-storyboards
krystofcelba Jan 12, 2018
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
28 changes: 18 additions & 10 deletions ios/RCCManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,33 @@ -(void)initBridgeWithBundleURL:(NSURL *)bundleURL launchOptions:(NSDictionary *)
-(void)showSplashScreen
{
CGRect screenBounds = [UIScreen mainScreen].bounds;
UIView *splashView = nil;
UIViewController *splashViewController = nil;

NSString* launchStoryBoard = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
if (launchStoryBoard != nil)
{//load the splash from the storyboard that's defined in the info.plist as the LaunchScreen
@try
{
splashView = [[NSBundle mainBundle] loadNibNamed:launchStoryBoard owner:self options:nil][0];
UIView * splashView = [[NSBundle mainBundle] loadNibNamed:launchStoryBoard owner:self options:nil][0];
if (splashView != nil)
{
splashView.frame = CGRectMake(0, 0, screenBounds.size.width, screenBounds.size.height);

splashViewController = [[UIViewController alloc] init];
splashViewController.view = splashView;
}
}
@catch(NSException *e)
{
splashView = nil;
@try
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:launchStoryBoard bundle:[NSBundle mainBundle]];
splashViewController = [storyboard instantiateInitialViewController];
}
@catch(NSException *e)
{
splashViewController = nil;
}
}
}
else
Expand Down Expand Up @@ -218,17 +229,14 @@ -(void)showSplashScreen

if (image != nil)
{
splashView = [[UIImageView alloc] initWithImage:image];
splashViewController = [[UIViewController alloc] init];
splashViewController.view = [[UIImageView alloc] initWithImage:image];
}
}

if (splashView != nil)
{
UIViewController *splashVC = [[UIViewController alloc] init];
splashVC.view = splashView;

if (splashViewController != nil) {
id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
appDelegate.window.rootViewController = splashVC;
appDelegate.window.rootViewController = splashViewController;
[appDelegate.window makeKeyAndVisible];
}
}
Expand Down