Skip to content

Commit 9b7807b

Browse files
committed
Migrate to Asset Catalogs
1 parent 482975d commit 9b7807b

File tree

8 files changed

+118
-12
lines changed

8 files changed

+118
-12
lines changed

WorldFacts/WorldFacts.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
53A87BE7157FA30A000DBAC9 /* Country+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A87BE6157FA30A000DBAC9 /* Country+Extensions.m */; };
2727
53A87BF1157FAD42000DBAC9 /* Country.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A87BF0157FAD42000DBAC9 /* Country.m */; };
2828
53AE171015FA5BBE00911A7C /* CountryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53A87BFA157FD530000DBAC9 /* CountryCell.xib */; };
29+
53E7826D1A3658590075A619 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 53E7826C1A3658590075A619 /* Images.xcassets */; };
2930
/* End PBXBuildFile section */
3031

3132
/* Begin PBXFileReference section */
@@ -57,6 +58,7 @@
5758
53A87BF0157FAD42000DBAC9 /* Country.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Country.m; sourceTree = "<group>"; };
5859
53A87BF8157FC55A000DBAC9 /* UYLCountryTableViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UYLCountryTableViewController.xib; sourceTree = "<group>"; };
5960
53A87BFA157FD530000DBAC9 /* CountryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CountryCell.xib; sourceTree = "<group>"; };
61+
53E7826C1A3658590075A619 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
6062
/* End PBXFileReference section */
6163

6264
/* Begin PBXFrameworksBuildPhase section */
@@ -112,6 +114,7 @@
112114
538A7998157E56A30007B8A5 /* Controllers */,
113115
538A7985157E567F0007B8A5 /* Supporting Files */,
114116
53524B241691D45C00719AF8 /* Resources */,
117+
53E7826C1A3658590075A619 /* Images.xcassets */,
115118
);
116119
path = WorldFacts;
117120
sourceTree = "<group>";
@@ -215,6 +218,7 @@
215218
538A7989157E567F0007B8A5 /* InfoPlist.strings in Resources */,
216219
538A79A9157E5ABD0007B8A5 /* Country.storyboard in Resources */,
217220
538A79B2157E80D40007B8A5 /* countries.plist in Resources */,
221+
53E7826D1A3658590075A619 /* Images.xcassets in Resources */,
218222
532CADEB158D1286002BEDC8 /* README in Resources */,
219223
53AE171015FA5BBE00911A7C /* CountryCell.xib in Resources */,
220224
53524B401691E77100719AF8 /* [email protected] in Resources */,
@@ -339,6 +343,8 @@
339343
538A7996157E567F0007B8A5 /* Debug */ = {
340344
isa = XCBuildConfiguration;
341345
buildSettings = {
346+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
347+
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
342348
GCC_PRECOMPILE_PREFIX_HEADER = NO;
343349
INFOPLIST_FILE = "WorldFacts/WorldFacts-Info.plist";
344350
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -350,6 +356,8 @@
350356
538A7997157E567F0007B8A5 /* Release */ = {
351357
isa = XCBuildConfiguration;
352358
buildSettings = {
359+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
360+
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
353361
GCC_PRECOMPILE_PREFIX_HEADER = NO;
354362
INFOPLIST_FILE = "WorldFacts/WorldFacts-Info.plist";
355363
PRODUCT_NAME = "$(TARGET_NAME)";
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"scale" : "2x",
6+
"size" : "60x60"
7+
},
8+
{
9+
"idiom" : "ipad",
10+
"scale" : "1x",
11+
"size" : "76x76"
12+
},
13+
{
14+
"idiom" : "ipad",
15+
"scale" : "2x",
16+
"size" : "76x76"
17+
},
18+
{
19+
"idiom" : "iphone",
20+
"scale" : "2x",
21+
"size" : "40x40"
22+
},
23+
{
24+
"idiom" : "ipad",
25+
"scale" : "1x",
26+
"size" : "40x40"
27+
},
28+
{
29+
"idiom" : "ipad",
30+
"scale" : "2x",
31+
"size" : "40x40"
32+
},
33+
{
34+
"size" : "29x29",
35+
"idiom" : "iphone",
36+
"filename" : "[email protected]",
37+
"scale" : "2x"
38+
},
39+
{
40+
"size" : "29x29",
41+
"idiom" : "ipad",
42+
"filename" : "Icon-Small.png",
43+
"scale" : "1x"
44+
},
45+
{
46+
"size" : "29x29",
47+
"idiom" : "ipad",
48+
"filename" : "[email protected]",
49+
"scale" : "2x"
50+
}
51+
],
52+
"info" : {
53+
"version" : 1,
54+
"author" : "xcode"
55+
}
56+
}
Loading
Loading
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"images" : [
3+
{
4+
"orientation" : "portrait",
5+
"idiom" : "ipad",
6+
"minimum-system-version" : "7.0",
7+
"extent" : "full-screen",
8+
"scale" : "1x"
9+
},
10+
{
11+
"orientation" : "portrait",
12+
"idiom" : "ipad",
13+
"minimum-system-version" : "7.0",
14+
"extent" : "full-screen",
15+
"scale" : "2x"
16+
},
17+
{
18+
"orientation" : "landscape",
19+
"idiom" : "ipad",
20+
"minimum-system-version" : "7.0",
21+
"extent" : "full-screen",
22+
"scale" : "1x"
23+
},
24+
{
25+
"orientation" : "landscape",
26+
"idiom" : "ipad",
27+
"minimum-system-version" : "7.0",
28+
"extent" : "full-screen",
29+
"scale" : "2x"
30+
},
31+
{
32+
"orientation" : "portrait",
33+
"idiom" : "iphone",
34+
"filename" : "[email protected]",
35+
"minimum-system-version" : "7.0",
36+
"scale" : "2x"
37+
},
38+
{
39+
"orientation" : "portrait",
40+
"idiom" : "iphone",
41+
"filename" : "[email protected]",
42+
"minimum-system-version" : "7.0",
43+
"subtype" : "retina4",
44+
"scale" : "2x"
45+
}
46+
],
47+
"info" : {
48+
"version" : 1,
49+
"author" : "xcode"
50+
}
51+
}
Loading
Loading

WorldFacts/WorldFacts/WorldFacts-Info.plist

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,9 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIcons</key>
12-
<dict>
13-
<key>CFBundlePrimaryIcon</key>
14-
<dict>
15-
<key>CFBundleIconFiles</key>
16-
<array>
17-
<string>Icon.png</string>
18-
<string>[email protected]</string>
19-
<string>Icon-Small.png</string>
20-
<string>[email protected]</string>
21-
</array>
22-
</dict>
23-
</dict>
12+
<dict/>
13+
<key>CFBundleIcons~ipad</key>
14+
<dict/>
2415
<key>CFBundleIdentifier</key>
2516
<string>com.useyourloaf.${PRODUCT_NAME:rfc1034identifier}</string>
2617
<key>CFBundleInfoDictionaryVersion</key>

0 commit comments

Comments
 (0)