dev:合并dev_icon,设置了App的logo和显示名称

RainesGit · Nov 13, 2015 · 7622756 · 7622756
2 parents b27599a + 6bb640d
commit 7622756
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 12 deletions.
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/Contents.json b/Oncenote/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,63 +1,75 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon-29@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "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-40@3x.png",
       "scale" : "3x"
     },
     {
-      "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" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon-29.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon-29@2x-1.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-1.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"
     }
   ],

diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29@2x-1.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29@2x-1.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40@2x-1.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40@2x-1.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-76.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-76.png
diff --git a/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/Oncenote/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png