diff --git a/lib/prepare.js b/lib/prepare.js index ab9746b53..0d7eb2bc2 100644 --- a/lib/prepare.js +++ b/lib/prepare.js @@ -313,34 +313,8 @@ function handleBuildSettings (platformConfig, locations, infoPlist) { } function mapIconResources (icons, iconsDir) { - // See https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/MobileHIG/IconMatrix.html - // for launch images sizes reference. const platformIcons = [ - { dest: 'icon-20.png', width: 20, height: 20 }, - { dest: 'icon-20@2x.png', width: 40, height: 40 }, - { dest: 'icon-20@3x.png', width: 60, height: 60 }, - { dest: 'icon-40.png', width: 40, height: 40 }, - { dest: 'icon-40@2x.png', width: 80, height: 80 }, - { dest: 'icon-50.png', width: 50, height: 50 }, - { dest: 'icon-50@2x.png', width: 100, height: 100 }, - { dest: 'icon-60@2x.png', width: 120, height: 120 }, - { dest: 'icon-60@3x.png', width: 180, height: 180 }, - { dest: 'icon-72.png', width: 72, height: 72 }, - { dest: 'icon-72@2x.png', width: 144, height: 144 }, - { dest: 'icon-76.png', width: 76, height: 76 }, - { dest: 'icon-76@2x.png', width: 152, height: 152 }, - { dest: 'icon-83.5@2x.png', width: 167, height: 167 }, - { dest: 'icon-1024.png', width: 1024, height: 1024 }, - { dest: 'icon-29.png', width: 29, height: 29 }, - { dest: 'icon-29@2x.png', width: 58, height: 58 }, - { dest: 'icon-29@3x.png', width: 87, height: 87 }, - { dest: 'icon.png', width: 57, height: 57 }, - { dest: 'icon@2x.png', width: 114, height: 114 }, - { dest: 'icon-24@2x.png', width: 48, height: 48 }, - { dest: 'icon-27.5@2x.png', width: 55, height: 55 }, - { dest: 'icon-44@2x.png', width: 88, height: 88 }, - { dest: 'icon-86@2x.png', width: 172, height: 172 }, - { dest: 'icon-98@2x.png', width: 196, height: 196 } + { dest: 'icon-1024.png', width: 1024, height: 1024 } ]; const pathMap = {}; diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/Contents.json b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/Contents.json index 2ce78c1b3..3bf46a585 100644 --- a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,241 +1,20 @@ { "images" : [ { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "icon-20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "icon-20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "icon-40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "icon-60@2x.png", - "scale" : "3x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "icon-60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "icon-60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "icon-20.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "icon-20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "icon-29.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "icon-29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "icon-40.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "icon-40@2x.png", - "scale" : "2x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50.png", - "scale" : "1x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50@2x.png", - "scale" : "2x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72.png", - "scale" : "1x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "icon-76.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "icon-76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "icon-83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", "filename" : "icon-1024.png", - "scale" : "1x" - }, - { - "size" : "24x24", - "idiom" : "watch", - "filename" : "icon-24@2x.png", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "38mm" - }, - { - "size" : "27.5x27.5", - "idiom" : "watch", - "filename" : "icon-27.5@2x.png", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "42mm" - }, - { - "size" : "29x29", - "idiom" : "watch", - "filename" : "icon-29@2x.png", - "role" : "companionSettings", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "watch", - "filename" : "icon-29@3x.png", - "role" : "companionSettings", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "watch", - "filename" : "icon-40@2x.png", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "38mm" - }, - { - "size" : "44x44", - "idiom" : "watch", - "filename" : "icon-44@2x.png", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "40mm" - }, - { - "size" : "50x50", - "idiom" : "watch", - "filename" : "icon-50@2x.png", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "44mm" - }, - { - "size" : "86x86", - "idiom" : "watch", - "filename" : "icon-86@2x.png", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "38mm" - }, - { - "size" : "98x98", - "idiom" : "watch", - "filename" : "icon-98@2x.png", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "42mm" - }, - { - "size" : "108x108", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "44mm" + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" }, { - "size" : "1024x1024", - "idiom" : "watch-marketing", "filename" : "icon-1024.png", - "scale" : "1x" + "idiom" : "universal", + "platform" : "watchos", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20.png deleted file mode 100644 index 5788eed9f..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png deleted file mode 100644 index 4feefdf8c..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png deleted file mode 100644 index 69ce592c2..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-24@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-24@2x.png deleted file mode 100644 index f0babf9d3..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-24@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-27.5@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-27.5@2x.png deleted file mode 100644 index 78f21bb35..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-27.5@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29.png deleted file mode 100644 index 5dff98e93..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png deleted file mode 100644 index 34b390857..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png deleted file mode 100644 index c63fd7766..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-40.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-40.png deleted file mode 100644 index 4feefdf8c..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-40.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png deleted file mode 100644 index 328973636..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-44@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-44@2x.png deleted file mode 100644 index 01c5af720..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-44@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-50.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-50.png deleted file mode 100644 index 81f93f16c..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-50.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png deleted file mode 100644 index a980efe1c..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png deleted file mode 100644 index 1e794a481..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png deleted file mode 100644 index db10c5532..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-72.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-72.png deleted file mode 100644 index 097f5b40a..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-72.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png deleted file mode 100644 index e3d49a2f1..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-76.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-76.png deleted file mode 100644 index aa6810c37..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-76.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png deleted file mode 100644 index da3a050ff..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png deleted file mode 100644 index 039a02aef..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-86@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-86@2x.png deleted file mode 100644 index f32a034a0..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-86@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-98@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-98@2x.png deleted file mode 100644 index 85ec9e369..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon-98@2x.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon.png deleted file mode 100644 index bbdba9ee0..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon.png and /dev/null differ diff --git a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon@2x.png b/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon@2x.png deleted file mode 100644 index 41e6be4a6..000000000 Binary files a/templates/project/__PROJECT_NAME__/Assets.xcassets/AppIcon.appiconset/icon@2x.png and /dev/null differ diff --git a/tests/spec/unit/fixtures/ios-config-xml/SampleApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/tests/spec/unit/fixtures/ios-config-xml/SampleApp/Assets.xcassets/AppIcon.appiconset/Contents.json index d19e65fdb..15745a2d7 100644 --- a/tests/spec/unit/fixtures/ios-config-xml/SampleApp/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/tests/spec/unit/fixtures/ios-config-xml/SampleApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,178 +1,16 @@ { "images" : [ { - "idiom" : "iphone", - "size" : "29x29", - "filename" : "icon-small.png", - "scale" : "1x" + "filename" : "icon-1024.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" }, { - "idiom" : "iphone", - "size" : "29x29", - "filename" : "icon-small@2x.png", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "filename" : "icon-small@3x.png", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "filename" : "icon-40@2x.png", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "filename" : "icon-60@2x.png", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "57x57", - "filename" : "icon.png", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "size" : "57x57", - "filename" : "icon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "filename" : "icon-60@2x.png", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "filename" : "icon-60@3x.png", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "filename" : "icon-small.png", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "filename" : "icon-small@2x.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "filename" : "icon-40.png", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "filename" : "icon-40@2x.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "50x50", - "filename" : "icon-50.png", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "50x50", - "filename" : "icon-50@2x.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "72x72", - "filename" : "icon-72.png", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "72x72", - "filename" : "icon-72@2x.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "filename" : "icon-76.png", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "filename" : "icon-76@2x.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "83.5x83.5", - "filename" : "icon-83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "24x24", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "38mm" - }, - { - "size" : "27.5x27.5", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "42mm" - }, - { - "size" : "29x29", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "watch", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "38mm" - }, - { - "size" : "44x44", - "idiom" : "watch", - "scale" : "2x", - "role" : "longLook", - "subtype" : "42mm" - }, - { - "size" : "86x86", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "38mm" - }, - { - "size" : "98x98", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "42mm" + "filename" : "icon-1024.png", + "idiom" : "universal", + "platform" : "watchos", + "size" : "1024x1024" } ], "info" : {