Skip to content

[RS-1732] Fix launch image matching for iPhone XR/XS Max portrait #10

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 1 commit into from
Mar 7, 2019
Merged

[RS-1732] Fix launch image matching for iPhone XR/XS Max portrait #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions ios/RCCManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ + (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)scree
//load the splash from the default image or from LaunchImage in the xcassets

CGFloat screenHeight = screenBounds.size.height;
CGFloat screenScale = [UIScreen mainScreen].scale;

NSString* imageName = @"Default";
if (screenHeight == 568)
Expand All @@ -240,7 +241,9 @@ + (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)scree
imageName = [imageName stringByAppendingString:@"-667h"];
else if (screenHeight == 736)
imageName = [imageName stringByAppendingString:@"-736h"];

else if (screenHeight == 812)
imageName = [imageName stringByAppendingString:@"-812h"];

//xcassets LaunchImage files
UIImage *image = [UIImage imageNamed:imageName];
if (image == nil)
Expand All @@ -255,12 +258,12 @@ + (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)scree
imageName = [imageName stringByAppendingString:@"-800-667h"];
else if (screenHeight == 736)
imageName = [imageName stringByAppendingString:@"-800-Portrait-736h"];
else if (screenHeight == 768)
imageName = [imageName stringByAppendingString:@"-Landscape"];
else if (screenHeight == 812)
imageName = [imageName stringByAppendingString:@"-1100-Portrait-2436h"];
else if (screenHeight == 1024)
imageName = [imageName stringByAppendingString:@"-Portrait"];
else if (screenHeight == 828)
imageName = [imageName stringByAppendingString:@"-1200-Portrait-1792h"];
else if (screenHeight == 896)
imageName = [imageName stringByAppendingString:screenScale == 2. ? @"-1200-Portrait-1792h" : @"-1200-Portrait-2688h"];

image = [UIImage imageNamed:imageName];
}
Expand Down