Fix appIcon detection and test for iPhone PLUS devices

This commit is contained in:
Benjamin Scholtysik (Reimold)
2016-10-18 17:40:18 -07:00
parent 05342cd9f3
commit ccc966eb17
2 changed files with 3 additions and 3 deletions

View File

@@ -617,7 +617,7 @@ NSString *bit_validAppIconStringFromIcons(NSBundle *resourceBundle, NSArray *ico
BOOL useHighResIcon = NO;
BOOL useiPadIcon = NO;
if ([UIScreen mainScreen].scale == 2.0f) useHighResIcon = YES;
if ([UIScreen mainScreen].scale >= 2.0f) useHighResIcon = YES;
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) useiPadIcon = YES;
NSString *currentBestMatch = nil;
@@ -1047,7 +1047,7 @@ UIImage *bit_appIcon() {
if (icons) {
BOOL useHighResIcon = NO;
if ([UIScreen mainScreen].scale == 2.0f) useHighResIcon = YES;
if ([UIScreen mainScreen].scale >= 2.0f) useHighResIcon = YES;
for(NSString *icon in icons) {
iconString = icon;

View File

@@ -116,7 +116,7 @@
// Regular icon names
NSString *validIconPath = @"AppIcon";
NSString *validIconPath2x = @"AppIcon@2x";
NSString *expected = ([UIScreen mainScreen].scale == 2.0f) ? validIconPath2x : validIconPath;
NSString *expected = ([UIScreen mainScreen].scale >= 2.0f) ? validIconPath2x : validIconPath;
// No valid icons defined at all