Skip to content

Commit c8d5c29

Browse files
author
dsward2
committed
This commit fixes the Assets.xcassets structure for app icons, and moves Info.plist to the correct location for Xcode builds.
1 parent 520ffbb commit c8d5c29

File tree

20 files changed

+82
-122
lines changed

20 files changed

+82
-122
lines changed

‎Assets.xcassets/Contents.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Assets.xcassets/icon_128x128.imageset/Contents.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Assets.xcassets/icon_16x16.imageset/Contents.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Assets.xcassets/icon_256x256.imageset/Contents.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Assets.xcassets/icon_32x32.imageset/Contents.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Assets.xcassets/icon_512x512.imageset/Contents.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎LocalRadio.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
0E274F2021DDCCE600337560 /* libvorbisenc.2.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E274E9D21DDCCC200337560 /* libvorbisenc.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
6969
0E274F2121DDCCE600337560 /* libvorbisfile.3.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E274E9E21DDCCC200337560 /* libvorbisfile.3.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
7070
0E274F2221DDCCE600337560 /* libwavpack.1.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E274E9F21DDCCC200337560 /* libwavpack.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
71-
0E274FCE21DF2D3300337560 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0E274FCD21DF2D3300337560 /* Assets.xcassets */; };
71+
0E274FD021DF546D00337560 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0E274FCF21DF546D00337560 /* Info.plist */; };
72+
0E274FD221DF54F600337560 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0E274FD121DF54F600337560 /* Assets.xcassets */; };
7273
0E28BE6B1F2B6A48005999FB /* UDPStatusListenerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E28BE6A1F2B6A47005999FB /* UDPStatusListenerController.m */; };
7374
0E28BE921F2C0DFA005999FB /* UDPStatusListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E28BE911F2C0DFA005999FB /* UDPStatusListener.m */; };
7475
0E32F8BD1FEB9FC500492813 /* TaskPipelineManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E32F8BC1FEB9FC500492813 /* TaskPipelineManager.m */; };
@@ -1042,8 +1043,8 @@
10421043
0E274E9D21DDCCC200337560 /* libvorbisenc.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisenc.2.dylib; path = Libraries_Modified/libvorbisenc.2.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
10431044
0E274E9E21DDCCC200337560 /* libvorbisfile.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.3.dylib; path = Libraries_Modified/libvorbisfile.3.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
10441045
0E274E9F21DDCCC200337560 /* libwavpack.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libwavpack.1.dylib; path = Libraries_Modified/libwavpack.1.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
1045-
0E274FCB21DF2CE400337560 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1046-
0E274FCD21DF2D3300337560 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
1046+
0E274FCF21DF546D00337560 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1047+
0E274FD121DF54F600337560 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
10471048
0E28BE691F2B6A47005999FB /* UDPStatusListenerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UDPStatusListenerController.h; sourceTree = "<group>"; };
10481049
0E28BE6A1F2B6A47005999FB /* UDPStatusListenerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UDPStatusListenerController.m; sourceTree = "<group>"; };
10491050
0E28BE901F2C0DFA005999FB /* UDPStatusListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UDPStatusListener.h; sourceTree = "<group>"; };
@@ -3228,8 +3229,6 @@
32283229
0EB8CB661F793CDE004B6D05 /* APPNOTES.md */,
32293230
0E3FE8921ECE20D7003BE837 /* LocalRadio.entitlements */,
32303231
0E4ED0511EAB73B000D2157B /* LocalRadio Notes.rtf */,
3231-
0E274FCB21DF2CE400337560 /* Info.plist */,
3232-
0E274FCD21DF2D3300337560 /* Assets.xcassets */,
32333232
0E7309181F3EBB6300004907 /* Automator Scripts */,
32343233
0E4ECFBD1EAB633B00D2157B /* LocalRadio */,
32353234
0E0C69201F1C8C8E00A7EE5E /* rtl_fm_localradio.xcodeproj */,
@@ -3255,6 +3254,8 @@
32553254
0E4ECFBD1EAB633B00D2157B /* LocalRadio */ = {
32563255
isa = PBXGroup;
32573256
children = (
3257+
0E274FD121DF54F600337560 /* Assets.xcassets */,
3258+
0E274FCF21DF546D00337560 /* Info.plist */,
32583259
0E9B3CB021DC0C17004A91E6 /* LocalRadio-Source */,
32593260
0E84C9BB1ED935E00065864B /* SQLiteLibrary-master */,
32603261
0EA212701ED72D17004DE453 /* icecast */,
@@ -6451,12 +6452,13 @@
64516452
0E35F51020AA392B00154E4E /* InterfaceTest-Info.plist in Resources */,
64526453
0E4ECFC81EAB633B00D2157B /* MainMenu.xib in Resources */,
64536454
0E84C9C91ED945E90065864B /* data_skeleton.sqlite3 in Resources */,
6455+
0E274FD221DF54F600337560 /* Assets.xcassets in Resources */,
64546456
0EFFD1211EAE08A60041D2F5 /* icecast.xml in Resources */,
64556457
0EF173871F6410B70067E8C0 /* LocalRadio Clean-Up.workflow in Resources */,
64566458
0EB8CB691F794A2B004B6D05 /* LocalRadio-animation.svg in Resources */,
64576459
0EF1735E1F60D2B30067E8C0 /* zip_lat_long.txt in Resources */,
6458-
0E274FCE21DF2D3300337560 /* Assets.xcassets in Resources */,
64596460
0E35F50A20AA392B00154E4E /* Info.plist in Resources */,
6461+
0E274FD021DF546D00337560 /* Info.plist in Resources */,
64606462
);
64616463
runOnlyForDeploymentPostprocessing = 0;
64626464
};

‎LocalRadio/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"images" : [
3+
{
4+
"size" : "16x16",
5+
"idiom" : "mac",
6+
"filename" : "icon_16x16.png",
7+
"scale" : "1x"
8+
},
9+
{
10+
"size" : "16x16",
11+
"idiom" : "mac",
12+
"filename" : "[email protected]",
13+
"scale" : "2x"
14+
},
15+
{
16+
"size" : "32x32",
17+
"idiom" : "mac",
18+
"filename" : "icon_32x32.png",
19+
"scale" : "1x"
20+
},
21+
{
22+
"size" : "32x32",
23+
"idiom" : "mac",
24+
"filename" : "[email protected]",
25+
"scale" : "2x"
26+
},
27+
{
28+
"size" : "128x128",
29+
"idiom" : "mac",
30+
"filename" : "icon_128x128.png",
31+
"scale" : "1x"
32+
},
33+
{
34+
"size" : "128x128",
35+
"idiom" : "mac",
36+
"filename" : "[email protected]",
37+
"scale" : "2x"
38+
},
39+
{
40+
"size" : "256x256",
41+
"idiom" : "mac",
42+
"filename" : "icon_256x256.png",
43+
"scale" : "1x"
44+
},
45+
{
46+
"size" : "256x256",
47+
"idiom" : "mac",
48+
"filename" : "[email protected]",
49+
"scale" : "2x"
50+
},
51+
{
52+
"size" : "512x512",
53+
"idiom" : "mac",
54+
"filename" : "icon_512x512.png",
55+
"scale" : "1x"
56+
},
57+
{
58+
"size" : "512x512",
59+
"idiom" : "mac",
60+
"filename" : "[email protected]",
61+
"scale" : "2x"
62+
}
63+
],
64+
"info" : {
65+
"version" : 1,
66+
"author" : "xcode"
67+
}
68+
}

‎Assets.xcassets/icon_128x128.imageset/icon_128x128.png‎ renamed to ‎LocalRadio/Assets.xcassets/AppIcon.appiconset/icon_128x128.png‎

File renamed without changes.

‎Assets.xcassets/icon_128x128.imageset/[email protected]‎ renamed to ‎LocalRadio/Assets.xcassets/AppIcon.appiconset/[email protected]‎

File renamed without changes.

0 commit comments

Comments
 (0)