diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/Contents.json b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/Contents.json index 4c005a7ef..2ce78c1b3 100644 --- a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,146 +1,146 @@ { "images" : [ { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", "filename" : "icon-20@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", "filename" : "icon-20@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "29x29", - "filename" : "icon-small.png", + "idiom" : "iphone", + "filename" : "icon-29.png", "scale" : "1x" }, { - "idiom" : "iphone", "size" : "29x29", - "filename" : "icon-small@2x.png", + "idiom" : "iphone", + "filename" : "icon-29@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "29x29", - "filename" : "icon-small@3x.png", + "idiom" : "iphone", + "filename" : "icon-29@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", "filename" : "icon-40@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", "filename" : "icon-60@2x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "57x57", + "idiom" : "iphone", "filename" : "icon.png", "scale" : "1x" }, { - "idiom" : "iphone", "size" : "57x57", + "idiom" : "iphone", "filename" : "icon@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", "filename" : "icon-60@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", "filename" : "icon-60@3x.png", "scale" : "3x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", "filename" : "icon-20.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", "filename" : "icon-20@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "29x29", - "filename" : "icon-small.png", + "idiom" : "ipad", + "filename" : "icon-29.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "29x29", - "filename" : "icon-small@2x.png", + "idiom" : "ipad", + "filename" : "icon-29@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", "filename" : "icon-40.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", "filename" : "icon-40@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "50x50", + "idiom" : "ipad", "filename" : "icon-50.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "50x50", + "idiom" : "ipad", "filename" : "icon-50@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "72x72", + "idiom" : "ipad", "filename" : "icon-72.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "72x72", + "idiom" : "ipad", "filename" : "icon-72@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", "filename" : "icon-76.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", "filename" : "icon-76@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "83.5x83.5", + "idiom" : "ipad", "filename" : "icon-83.5@2x.png", "scale" : "2x" }, @@ -153,7 +153,7 @@ { "size" : "24x24", "idiom" : "watch", - "filename" : "AppIcon24x24@2x.png", + "filename" : "icon-24@2x.png", "scale" : "2x", "role" : "notificationCenter", "subtype" : "38mm" @@ -161,7 +161,7 @@ { "size" : "27.5x27.5", "idiom" : "watch", - "filename" : "AppIcon27.5x27.5@2x.png", + "filename" : "icon-27.5@2x.png", "scale" : "2x", "role" : "notificationCenter", "subtype" : "42mm" @@ -169,21 +169,21 @@ { "size" : "29x29", "idiom" : "watch", - "filename" : "AppIcon29x29@2x.png", + "filename" : "icon-29@2x.png", "role" : "companionSettings", "scale" : "2x" }, { "size" : "29x29", "idiom" : "watch", - "filename" : "AppIcon29x29@3x.png", + "filename" : "icon-29@3x.png", "role" : "companionSettings", "scale" : "3x" }, { "size" : "40x40", "idiom" : "watch", - "filename" : "AppIcon40x40@2x.png", + "filename" : "icon-40@2x.png", "scale" : "2x", "role" : "appLauncher", "subtype" : "38mm" @@ -191,15 +191,23 @@ { "size" : "44x44", "idiom" : "watch", - "filename" : "AppIcon44x44@2x.png", + "filename" : "icon-44@2x.png", "scale" : "2x", - "role" : "longLook", - "subtype" : "42mm" + "role" : "appLauncher", + "subtype" : "40mm" + }, + { + "size" : "50x50", + "idiom" : "watch", + "filename" : "icon-50@2x.png", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "44mm" }, { "size" : "86x86", "idiom" : "watch", - "filename" : "AppIcon86x86@2x.png", + "filename" : "icon-86@2x.png", "scale" : "2x", "role" : "quickLook", "subtype" : "38mm" @@ -207,11 +215,18 @@ { "size" : "98x98", "idiom" : "watch", - "filename" : "AppIcon98x98@2x.png", + "filename" : "icon-98@2x.png", "scale" : "2x", "role" : "quickLook", "subtype" : "42mm" }, + { + "size" : "108x108", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "44mm" + }, { "size" : "1024x1024", "idiom" : "watch-marketing", @@ -223,4 +238,4 @@ "version" : 1, "author" : "xcode" } -} +} \ No newline at end of file diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-1024.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-1024.png new file mode 100644 index 000000000..1b9cbb91e Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-1024.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20.png new file mode 100644 index 000000000..fe8282fb3 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20@2x.png new file mode 100644 index 000000000..9dd5c11ed Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20@3x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20@3x.png new file mode 100644 index 000000000..69ca1175c Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-24@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-24@2x.png new file mode 100644 index 000000000..751272673 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-24@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-27.5@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-27.5@2x.png new file mode 100644 index 000000000..591abab3a Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-27.5@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29.png new file mode 100644 index 000000000..ba210ff25 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29@2x.png new file mode 100644 index 000000000..028f4170f Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29@3x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29@3x.png new file mode 100644 index 000000000..a557cf0a0 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40.png index e865adbc5..9dd5c11ed 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40@2x.png index 6d07dce53..2a673a75c 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40@2x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-44@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-44@2x.png new file mode 100644 index 000000000..3da10c316 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-44@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50.png index 98a9d96d5..e0d06da01 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50@2x.png index bac693f7f..6074ef2f5 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50@2x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-50@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@2x.png index 955af362d..6ece84833 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@2x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@3x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@3x.png index e1268916b..decbe114f 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@3x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72.png index 8c6e5df34..e6f6cd4de 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72@2x.png index dd819da61..7f0aa089f 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72@2x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-72@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76.png index 63afe7f17..b644bc05a 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76@2x.png index 4cff29a2b..df539152d 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76@2x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png index 3c1a01154..77baa3325 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-86@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-86@2x.png new file mode 100644 index 000000000..9db8f7a28 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-86@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-98@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-98@2x.png new file mode 100644 index 000000000..f239b1f16 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-98@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small.png deleted file mode 100644 index 0ea1c42f9..000000000 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small.png and /dev/null differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@2x.png deleted file mode 100644 index 2c72038ef..000000000 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@2x.png and /dev/null differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@3x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@3x.png deleted file mode 100644 index 5c37dfc2a..000000000 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@3x.png and /dev/null differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon.png index b2571a719..f5554577c 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon@2x.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon@2x.png index d75098f5a..cfc5c9183 100644 Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon@2x.png and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon@2x.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Default-2436h.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Default-2436h.png new file mode 100644 index 000000000..93883ae4c Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Default-2436h.png differ diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2436h.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2436h.png new file mode 100644 index 000000000..d9d12f465 Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2436h.png differ diff --git a/bin/templates/scripts/cordova/lib/prepare.js b/bin/templates/scripts/cordova/lib/prepare.js index 8ef347be2..29f6cc2e7 100644 --- a/bin/templates/scripts/cordova/lib/prepare.js +++ b/bin/templates/scripts/cordova/lib/prepare.js @@ -344,19 +344,16 @@ function mapIconResources (icons, iconsDir) { { 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-small.png', width: 29, height: 29 }, - { dest: 'icon-small@2x.png', width: 58, height: 58 }, - { dest: 'icon-small@3x.png', width: 87, height: 87 }, + { 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: 'AppIcon24x24@2x.png', width: 48, height: 48 }, - { dest: 'AppIcon27.5x27.5@2x.png', width: 55, height: 55 }, - { dest: 'AppIcon29x29@2x.png', width: 58, height: 58 }, - { dest: 'AppIcon29x29@3x.png', width: 87, height: 87 }, - { dest: 'AppIcon40x40@2x.png', width: 80, height: 80 }, - { dest: 'AppIcon44x44@2x.png', width: 88, height: 88 }, - { dest: 'AppIcon86x86@2x.png', width: 172, height: 172 }, - { dest: 'AppIcon98x98@2x.png', width: 196, height: 196 } + { 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 } ]; var pathMap = {};