Skip to content

Commit e250038

Browse files
kyo504Daniel Jung
authored andcommitted
[RS-1732] Fix launch image matching for iPhone XR/XS Max portrait (#10)
1 parent a428d71 commit e250038

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

ios/RCCManager.m

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ + (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)scree
241241
//load the splash from the default image or from LaunchImage in the xcassets
242242

243243
CGFloat screenHeight = screenBounds.size.height;
244+
CGFloat screenScale = [UIScreen mainScreen].scale;
244245

245246
NSString* imageName = @"Default";
246247
if (screenHeight == 568)
@@ -249,7 +250,9 @@ + (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)scree
249250
imageName = [imageName stringByAppendingString:@"-667h"];
250251
else if (screenHeight == 736)
251252
imageName = [imageName stringByAppendingString:@"-736h"];
252-
253+
else if (screenHeight == 812)
254+
imageName = [imageName stringByAppendingString:@"-812h"];
255+
253256
//xcassets LaunchImage files
254257
UIImage *image = [UIImage imageNamed:imageName];
255258
if (image == nil)
@@ -264,12 +267,12 @@ + (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)scree
264267
imageName = [imageName stringByAppendingString:@"-800-667h"];
265268
else if (screenHeight == 736)
266269
imageName = [imageName stringByAppendingString:@"-800-Portrait-736h"];
267-
else if (screenHeight == 768)
268-
imageName = [imageName stringByAppendingString:@"-Landscape"];
269270
else if (screenHeight == 812)
270271
imageName = [imageName stringByAppendingString:@"-1100-Portrait-2436h"];
271-
else if (screenHeight == 1024)
272-
imageName = [imageName stringByAppendingString:@"-Portrait"];
272+
else if (screenHeight == 828)
273+
imageName = [imageName stringByAppendingString:@"-1200-Portrait-1792h"];
274+
else if (screenHeight == 896)
275+
imageName = [imageName stringByAppendingString:screenScale == 2. ? @"-1200-Portrait-1792h" : @"-1200-Portrait-2688h"];
273276

274277
image = [UIImage imageNamed:imageName];
275278
}

0 commit comments

Comments
 (0)