Merge pull request #8 from josh/app-icon

App icon
josh · Dec 29, 2015 · a4417dd · a4417dd
2 parents a47bd76 + ee8e0ed
commit a4417dd
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 12 deletions.
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/Contents.json b/Aware/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,53 +1,63 @@
 {
   "images" : [
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512@2x.png",
       "scale" : "2x"
     }
   ],

diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
diff --git a/Aware/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/Aware/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
diff --git a/Aware/Assets.xcassets/Contents.json b/Aware/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Aware/Info.plist b/Aware/Info.plist
@@ -6,8 +6,6 @@
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>