Skip to content
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

Jump to bottom

[TIMOB-25504] iOS: Fix default-image selection between iPhone 6/7 Plus and iPhone X #9592

Merged
merged 2 commits into from
Nov 13, 2017
Merged

[TIMOB-25504] iOS: Fix default-image selection between iPhone 6/7 Plus and iPhone X #9592

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b602c20
[TIMOB-25504] Fix default-image selection
hansemannn Nov 13, 2017
b5a6548
Merge branch 'master' into TIMOB-25504
ewieberappc Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 20 additions & 19 deletions iphone/Classes/TiUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,58 +783,59 @@ + (NSURL *)checkFor2XImage:(NSURL *)url
return url;
}

//NOTE; I'm not sure the order here.. the docs don't necessarily
//specify the exact order
NSFileManager *fm = [NSFileManager defaultManager];
NSString *partial = [path stringByDeletingPathExtension];

NSString *os = [TiUtils isIPad] ? @"~ipad" : @"~iphone";

if ([TiUtils isRetinaHDDisplay]) {
// first try -736h@3x iphone6 Plus specific
NSString *testpath = [NSString stringWithFormat:@"%@-736h@3x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}

// second try -2436h@3x iPhone X specific
testpath = [NSString stringWithFormat:@"%@-2436h@3x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
if ([TiUtils isRetinaiPhoneX]) {
// -2436h@3x iPhone X specific
NSString *testpath = [NSString stringWithFormat:@"%@-2436h@3x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}
} else if ([TiUtils isRetinaiPhone6]) {
// -736h@3x iPhone 6/7 Plus specific
NSString *testpath = [NSString stringWithFormat:@"%@-736h@3x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}
}

// third try plain @3x
testpath = [NSString stringWithFormat:@"%@@3x.%@", partial, ext];
// Plain @3x
NSString *testpath = [NSString stringWithFormat:@"%@@3x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}
}
if ([TiUtils isRetinaDisplay]) {
if ([TiUtils isRetinaiPhone6]) {
// first try -667h@2x iphone6 specific
// -667h@2x iPhone 6/7 specific
NSString *testpath = [NSString stringWithFormat:@"%@-667h@2x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}
} else if ([TiUtils isRetinaFourInch]) {
// first try -568h@2x iphone5 specific
// -568h@2x iPhone 5 specific
NSString *testpath = [NSString stringWithFormat:@"%@-568h@2x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}
}
// first try 2x device specific
// @2x device specific
NSString *testpath = [NSString stringWithFormat:@"%@@2x%@.%@", partial, os, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}
// second try plain 2x
// Plain @2x
testpath = [NSString stringWithFormat:@"%@@2x.%@", partial, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
}
}
// third try just device specific normal res

// Fallback: Just device specific normal res
NSString *testpath = [NSString stringWithFormat:@"%@%@.%@", partial, os, ext];
if ([fm fileExistsAtPath:testpath]) {
return [NSURL fileURLWithPath:testpath];
Expand Down