Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitda99ffa

Browse files
author
Jim Puls
committed
Merge pull request#1 from ios/natan/tall-phone-support
Add support for retina4 subtype assets
2 parentsbaf51a7 +6b17b0b commitda99ffa

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

‎assetgen/AGCatalogParser.m

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ - (void)parseImageSetAtURL:(NSURL *)url;
7979
NSArray *variants = [contents[@"images"]sortedArrayUsingComparator:^NSComparisonResult(id obj1,id obj2) {
8080
if (![obj1[@"subtype"]isEqualToString:obj2[@"subtype"]]) {
8181
if (obj1[@"subtype"]) {
82-
returnNSOrderedAscending;
82+
returnNSOrderedDescending;
8383
}
8484
if (obj2[@"subtype"]) {
85-
returnNSOrderedDescending;
85+
returnNSOrderedAscending;
8686
}
8787
}
8888

@@ -127,15 +127,17 @@ - (void)parseImageSetAtURL:(NSURL *)url;
127127
continue;
128128
}
129129
BOOL isUniversal = [variant[@"idiom"]isEqualToString:@"universal"];
130+
BOOL isRetina4Inch = [variant[@"subtype"]isEqualToString:@"retina4"];
130131
NSString *indentation =@"";
131132
if (!isUniversal) {
132133
NSString *idiom = [variant[@"idiom"]isEqualToString:@"iphone"] ?@"UIUserInterfaceIdiomPhone" :@"UIUserInterfaceIdiomPad";
133-
[implementationappendFormat:@" if (UI_USER_INTERFACE_IDIOM() ==%@) {\n", idiom];
134+
[implementationappendFormat:@" if (UI_USER_INTERFACE_IDIOM() ==%@%@) {\n", idiom, isRetina4Inch ?@" && [UIScreen mainScreen].bounds.size.height == 568.0f" :@""];
134135
indentation =@"";
135136
}
136137

137138
CGFloat scale = [variant[@"scale"]floatValue];
138-
NSString *filename = [variant[@"filename"]stringByReplacingOccurrencesOfString:[NSStringstringWithFormat:@"@%@", variant[@"scale"]]withString:@""];
139+
NSString *sizeExtension = isRetina4Inch ?@"-568h" :@"";
140+
NSString *filename = [variant[@"filename"]stringByReplacingOccurrencesOfString:[NSStringstringWithFormat:@"@%@", variant[@"scale"]]withString:sizeExtension];
139141
NSString *scaleIndentation = [indentationstringByAppendingString:@""];
140142
[implementationappendFormat:@"%@if ([UIScreen mainScreen].scale ==%.1ff) {\n", scaleIndentation, scale];
141143
[implementationappendFormat:@"%@ image = [UIImage imageNamed:@\"%@\"];\n", scaleIndentation, filename];

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp