소스 검색

Convert loose app icon collection to an image asset

Felix Paul Kühne 11 년 전
부모
커밋
9a193357ea

+ 2 - 39
Sources/VLC for iOS-Info.plist

@@ -54,46 +54,9 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon120x120</string>
-				<string>AppIcon80x80</string>
-				<string>AppIcon29x29</string>
-				<string>AppIcon57x57</string>
-				<string>Icon.png</string>
-				<string>Icon@2x.png</string>
-				<string>Icon-72.png</string>
-				<string>Icon-72@2x.png</string>
-			</array>
-			<key>UIPrerenderedIcon</key>
-			<true/>
-		</dict>
-	</dict>
+	<dict/>
 	<key>CFBundleIcons~ipad</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon76x76</string>
-				<string>AppIcon72x72</string>
-				<string>AppIcon40x40</string>
-				<string>AppIcon50x50</string>
-				<string>AppIcon80x80</string>
-				<string>AppIcon29x29</string>
-				<string>AppIcon57x57</string>
-				<string>Icon.png</string>
-				<string>Icon@2x.png</string>
-				<string>Icon-72.png</string>
-				<string>Icon-72@2x.png</string>
-			</array>
-			<key>UIPrerenderedIcon</key>
-			<true/>
-		</dict>
-	</dict>
+	<dict/>
 	<key>CFBundleIdentifier</key>
 	<string>org.videolan.vlc-ios</string>
 	<key>CFBundleInfoDictionaryVersion</key>

+ 3 - 0
VLC for iOS.xcodeproj/project.pbxproj

@@ -2485,6 +2485,7 @@
 		7D94FD0B16DE7D1100F2623B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
@@ -2524,6 +2525,7 @@
 		7D94FD0C16DE7D1100F2623B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
@@ -2592,6 +2594,7 @@
 		A7035BC0174519E40057DFA7 /* Distribution */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";

Resources/AppIcon29x29.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29-1.png


BIN
vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png


Resources/AppIcon29x29@2x.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png


BIN
vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png


Resources/AppIcon40x40.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40.png


Resources/AppIcon80x80.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png


BIN
vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png


Resources/AppIcon50x50.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon50x50.png


Resources/AppIcon50x50@2x.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon50x50@2x.png


Resources/AppIcon57x57.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon57x57.png


Resources/AppIcon57x57@2x.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon57x57@2x.png


Resources/AppIcon120x120.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png


Resources/AppIcon72x72.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon72x72.png


Resources/AppIcon72x72@2x.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon72x72@2x.png


Resources/AppIcon76x76.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76.png


Resources/AppIcon76x76@2x.png → vlc-ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png


+ 104 - 0
vlc-ios/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,104 @@
+{
+  "images" : [
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29x29-1.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29x29@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "AppIcon57x57.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "AppIcon57x57@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29x29.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40x40.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40x40@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "filename" : "AppIcon50x50.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "filename" : "AppIcon50x50@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "filename" : "AppIcon72x72.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "filename" : "AppIcon72x72@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon76x76.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon76x76@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}