You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2015/10/13 07:35:51 UTC
ios commit: CB-9754: Icon and launch image warnings
Repository: cordova-ios
Updated Branches:
refs/heads/master 8a9877fdf -> 68af7ea20
CB-9754: Icon and launch image warnings
Signed-off-by: Shazron Abdullah <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/68af7ea2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/68af7ea2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/68af7ea2
Branch: refs/heads/master
Commit: 68af7ea209b32ef499223cb3f2046eaf97f601ec
Parents: 8a9877f
Author: mmartiarena <mm...@service2media.com>
Authored: Thu Oct 8 10:48:14 2015 +0200
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Oct 12 22:27:10 2015 -0700
----------------------------------------------------------------------
.../AppIcon.appiconset/Contents.json | 7 ++-----
.../AppIcon.appiconset/icon-60.png | Bin 5811 -> 0 bytes
.../AppIcon.appiconset/icon-small@3x.png | Bin 0 -> 7040 bytes
.../LaunchImage.launchimage/Contents.json | 20 +++++++++----------
4 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/68af7ea2/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/Contents.json
----------------------------------------------------------------------
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 648d396..83a6ba6 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
@@ -15,6 +15,7 @@
{
"idiom" : "iphone",
"size" : "29x29",
+ "filename" : "icon-small@3x.png",
"scale" : "3x"
},
{
@@ -26,6 +27,7 @@
{
"idiom" : "iphone",
"size" : "40x40",
+ "filename" : "icon-60@2x.png",
"scale" : "3x"
},
{
@@ -113,11 +115,6 @@
"scale" : "2x"
},
{
- "idiom" : "car",
- "size" : "120x120",
- "scale" : "1x"
- },
- {
"size" : "24x24",
"idiom" : "watch",
"scale" : "2x",
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/68af7ea2/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60.png b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60.png
deleted file mode 100644
index 39a2b52..0000000
Binary files a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-60.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/68af7ea2/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@3x.png
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..5c37dfc
Binary files /dev/null and b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/icon-small@3x.png differ
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/68af7ea2/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Contents.json
----------------------------------------------------------------------
diff --git a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Contents.json b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Contents.json
index 7ca43cd..175f378 100644
--- a/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/bin/templates/project/__PROJECT_NAME__/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -30,9 +30,9 @@
{
"orientation" : "portrait",
"idiom" : "iphone",
+ "filename" : "Default@2x~iphone.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "Default@2x~iphone.png",
"scale" : "2x"
},
{
@@ -47,54 +47,54 @@
{
"orientation" : "portrait",
"idiom" : "ipad",
+ "filename" : "Default-Portrait~ipad.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "Default-Portrait~ipad.png",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
+ "filename" : "Default-Landscape~ipad.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "Default-Landscape~ipad.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
+ "filename" : "Default-Portrait@2x~ipad.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "Default-Portrait@2x~ipad.png",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
+ "filename" : "Default-Landscape@2x~ipad.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "Default-Landscape@2x~ipad.png",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
- "extent" : "full-screen",
"filename" : "Default~iphone.png",
+ "extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
- "extent" : "full-screen",
"filename" : "Default@2x~iphone.png",
+ "extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
+ "filename" : "Default-568h@2x~iphone.png",
"extent" : "full-screen",
- "filename" : "Default@2x~iphone.png",
"subtype" : "retina4",
"scale" : "2x"
},
@@ -107,8 +107,8 @@
{
"orientation" : "portrait",
"idiom" : "ipad",
- "extent" : "full-screen",
"filename" : "Default-Portrait~ipad.png",
+ "extent" : "full-screen",
"scale" : "1x"
},
{
@@ -132,8 +132,8 @@
{
"orientation" : "portrait",
"idiom" : "ipad",
- "extent" : "full-screen",
"filename" : "Default-Portrait@2x~ipad.png",
+ "extent" : "full-screen",
"scale" : "2x"
},
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org