Merge pull request #1305 from jeapostrophe/master

Fix dumb asset names and duplication

apple/iOS/Resources/Media.xcassets/AppIcon.appiconset/Contents.json

@@ -57,13 +57,13 @@
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-29-1-1.png",
+      "filename" : "Icon-29-1.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-29-2-1.png",
+      "filename" : "Icon-29-2.png",
       "scale" : "2x"
     },
     {
@@ -75,7 +75,7 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-40-2-1.png",
+      "filename" : "Icon-40-2.png",
       "scale" : "2x"
     },
     {
@@ -120,6 +120,6 @@
     "author" : "xcode"
   },
   "properties" : {
-    "pre-rendered" : true
+    "pre-rendered" : false
   }
-}
+}

apple/iOS/Resources/Media.xcassets/LaunchImage.launchimage/Contents.json

@@ -4,7 +4,7 @@
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "736h",
-      "filename" : "blackimage.png",
+      "filename" : "portrait-1242x2208.png",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
       "scale" : "3x"
@@ -13,7 +13,7 @@
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "736h",
-      "filename" : "blackimage-2.png",
+      "filename" : "landscape-2208x1242.png",
       "minimum-system-version" : "8.0",
       "orientation" : "landscape",
       "scale" : "3x"
@@ -22,7 +22,7 @@
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "667h",
-      "filename" : "blackimage-1.png",
+      "filename" : "portrait-750x1334.png",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
       "scale" : "2x"
@@ -32,14 +32,14 @@
       "idiom" : "iphone",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "Default@2x.png",
+      "filename" : "portrait-640x960.png",
       "scale" : "2x"
     },
     {
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "retina4",
-      "filename" : "Default-568h@2x.png",
+      "filename" : "portrait-640x1136.png",
       "minimum-system-version" : "7.0",
       "orientation" : "portrait",
       "scale" : "2x"
@@ -49,7 +49,7 @@
       "idiom" : "ipad",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "blackimage-3.png",
+      "filename" : "portrait-768x1024.png",
       "scale" : "1x"
     },
     {
@@ -57,7 +57,7 @@
       "idiom" : "ipad",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "blackimage-5.png",
+      "filename" : "landscape-1024x768.png",
       "scale" : "1x"
     },
     {
@@ -65,7 +65,7 @@
       "idiom" : "ipad",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "blackimage-4.png",
+      "filename" : "portrait-1536x2048.png",
       "scale" : "2x"
     },
     {
@@ -73,28 +73,28 @@
       "idiom" : "ipad",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "blackimage-6.png",
+      "filename" : "landscape-2048x1536.png",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
       "extent" : "full-screen",
-      "filename" : "Default.png",
+      "filename" : "portrait-320x480.png",
       "scale" : "1x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
       "extent" : "full-screen",
-      "filename" : "Default@2x.png",
+      "filename" : "portrait-640x960.png",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
       "extent" : "full-screen",
-      "filename" : "Default-568h@2x.png",
+      "filename" : "portrait-640x1136.png",
       "subtype" : "retina4",
       "scale" : "2x"
     },
@@ -102,28 +102,28 @@
       "orientation" : "portrait",
       "idiom" : "ipad",
       "extent" : "to-status-bar",
-      "filename" : "blackimage-7.png",
+      "filename" : "portrait-768x1004.png",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
       "extent" : "to-status-bar",
-      "filename" : "blackimage-9.png",
+      "filename" : "landscape-1024x748.png",
       "scale" : "1x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
       "extent" : "to-status-bar",
-      "filename" : "blackimage-8.png",
+      "filename" : "portrait-1536x2008.png",
       "scale" : "2x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
       "extent" : "to-status-bar",
-      "filename" : "blackimage-10.png",
+      "filename" : "landscape-2048x1496.png",
       "scale" : "2x"
     }
   ],
@@ -131,4 +131,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

media/render-ios-icons.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x
 
-DEST=$1
+DEST=${1:-../apple/iOS/Resources/Media.xcassets/AppIcon.appiconset}
 
 for pt in 29 40 57 60 50 72 76 ; do
     for scale in 1 2 3 ; do