Rename all images with @2x/@3x.

Summary: Images should be named following the @2x/@3x convention. Addresses https://github.com/google/material-components-ios/issues/227 Test Plan: Check that all images load in the correct resolution. Reviewers: #mdc_ios_owners, featherless Reviewed By: #mdc_ios_owners, featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D752
material-components · Apr 26, 2016 · 2df5344 · 2df5344
1 parent 7598638
commit 2df5344
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 45 deletions.
diff --git a/catalog/MDCCatalog/Assets.xcassets/AppIcon.appiconset/Contents.json b/catalog/MDCCatalog/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -3,37 +3,37 @@
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "logo_mdc_ios_color_29pt_2x.png",
+      "filename" : "logo_mdc_ios_color_29pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "logo_mdc_ios_color_29pt_3x.png",
+      "filename" : "logo_mdc_ios_color_29pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "logo_mdc_ios_color_40pt_2x.png",
+      "filename" : "logo_mdc_ios_color_40pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "logo_mdc_ios_color_40pt_3x.png",
+      "filename" : "logo_mdc_ios_color_40pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "logo_mdc_ios_color_40pt_3x.png",
+      "filename" : "logo_mdc_ios_color_40pt@3x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "logo_mdc_ios_color_60pt_3x.png",
+      "filename" : "logo_mdc_ios_color_60pt@3x.png",
       "scale" : "3x"
     },
     {
@@ -45,7 +45,7 @@
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "logo_mdc_ios_color_29pt_2x.png",
+      "filename" : "logo_mdc_ios_color_29pt@2x.png",
       "scale" : "2x"
     },
     {
@@ -57,7 +57,7 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "logo_mdc_ios_color_40pt_2x.png",
+      "filename" : "logo_mdc_ios_color_40pt@2x.png",
       "scale" : "2x"
     },
     {
@@ -69,18 +69,18 @@
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "logo_mdc_ios_color_76pt_2x.png",
+      "filename" : "logo_mdc_ios_color_76pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "logo_mdc_ios_color_83_5pt_2x.png",
+      "filename" : "logo_mdc_ios_color_83_5pt@2x.png",
       "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...appiconset/logo_mdc_ios_color_29pt_2x.png → ...appiconset/logo_mdc_ios_color_29pt@2x.png b/...appiconset/logo_mdc_ios_color_29pt_2x.png → ...appiconset/logo_mdc_ios_color_29pt@2x.png
diff --git a/...appiconset/logo_mdc_ios_color_29pt_3x.png → ...appiconset/logo_mdc_ios_color_29pt@3x.png b/...appiconset/logo_mdc_ios_color_29pt_3x.png → ...appiconset/logo_mdc_ios_color_29pt@3x.png
diff --git a/...appiconset/logo_mdc_ios_color_40pt_2x.png → ...appiconset/logo_mdc_ios_color_40pt@2x.png b/...appiconset/logo_mdc_ios_color_40pt_2x.png → ...appiconset/logo_mdc_ios_color_40pt@2x.png
diff --git a/...appiconset/logo_mdc_ios_color_40pt_3x.png → ...appiconset/logo_mdc_ios_color_40pt@3x.png b/...appiconset/logo_mdc_ios_color_40pt_3x.png → ...appiconset/logo_mdc_ios_color_40pt@3x.png
diff --git a/...appiconset/logo_mdc_ios_color_60pt_3x.png → ...appiconset/logo_mdc_ios_color_60pt@3x.png b/...appiconset/logo_mdc_ios_color_60pt_3x.png → ...appiconset/logo_mdc_ios_color_60pt@3x.png
diff --git a/...appiconset/logo_mdc_ios_color_76pt_2x.png → ...appiconset/logo_mdc_ios_color_76pt@2x.png b/...appiconset/logo_mdc_ios_color_76pt_2x.png → ...appiconset/logo_mdc_ios_color_76pt@2x.png
diff --git a/...piconset/logo_mdc_ios_color_83_5pt_2x.png → ...piconset/logo_mdc_ios_color_83_5pt@2x.png b/...piconset/logo_mdc_ios_color_83_5pt_2x.png → ...piconset/logo_mdc_ios_color_83_5pt@2x.png
diff --git a/.../examples/resources/CollectionCellsExample.xcassets/ic_description.imageset/Contents.json b/.../examples/resources/CollectionCellsExample.xcassets/ic_description.imageset/Contents.json
@@ -6,12 +6,12 @@
             "scale": "1x"
         },
         {
-            "filename": "ic_description_2x.png",
+            "filename": "ic_description@2x.png",
             "idiom": "universal",
             "scale": "2x"
         },
         {
-            "filename": "ic_description_3x.png",
+            "filename": "ic_description@3x.png",
             "idiom": "universal",
             "scale": "3x"
         }

diff --git a/...escription.imageset/ic_description_2x.png → ...escription.imageset/ic_description@2x.png b/...escription.imageset/ic_description_2x.png → ...escription.imageset/ic_description@2x.png
diff --git a/...escription.imageset/ic_description_3x.png → ...escription.imageset/ic_description@3x.png b/...escription.imageset/ic_description_3x.png → ...escription.imageset/ic_description@3x.png
diff --git a/...ollectionCells/src/MaterialCollectionCells.xcassets/mdc_cell_check.imageset/Contents.json b/...ollectionCells/src/MaterialCollectionCells.xcassets/mdc_cell_check.imageset/Contents.json
@@ -6,12 +6,12 @@
             "scale": "1x"
         },
         {
-            "filename": "mdc_cell_check_2x.png",
+            "filename": "mdc_cell_check@2x.png",
             "idiom": "universal",
             "scale": "2x"
         },
         {
-            "filename": "mdc_cell_check_3x.png",
+            "filename": "mdc_cell_check@3x.png",
             "idiom": "universal",
             "scale": "3x"
         }

diff --git a/...nCells/src/MaterialCollectionCells.xcassets/mdc_cell_chevron_right.imageset/Contents.json b/...nCells/src/MaterialCollectionCells.xcassets/mdc_cell_chevron_right.imageset/Contents.json
@@ -6,12 +6,12 @@
             "scale": "1x"
         },
         {
-            "filename": "mdc_cell_chevron_right_2x.png",
+            "filename": "mdc_cell_chevron_right@2x.png",
             "idiom": "universal",
             "scale": "2x"
         },
         {
-            "filename": "mdc_cell_chevron_right_3x.png",
+            "filename": "mdc_cell_chevron_right@3x.png",
             "idiom": "universal",
             "scale": "3x"
         }

diff --git a/...CollectionCells/src/MaterialCollectionCells.xcassets/mdc_cell_info.imageset/Contents.json b/...CollectionCells/src/MaterialCollectionCells.xcassets/mdc_cell_info.imageset/Contents.json
@@ -6,12 +6,12 @@
             "scale": "1x"
         },
         {
-            "filename": "mdc_cell_info_2x.png",
+            "filename": "mdc_cell_info@2x.png",
             "idiom": "universal",
             "scale": "2x"
         },
         {
-            "filename": "mdc_cell_info_3x.png",
+            "filename": "mdc_cell_info@3x.png",
             "idiom": "universal",
             "scale": "3x"
         }

diff --git a/...ples/resources/SpritedAnimationView.xcassets/mdc_sprite_grid__list.imageset/Contents.json b/...ples/resources/SpritedAnimationView.xcassets/mdc_sprite_grid__list.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
     "images": [
         {
-            "filename": "mdc_sprite_grid__list.png", 
-            "idiom": "universal", 
+            "filename": "mdc_sprite_grid__list.png",
+            "idiom": "universal",
             "scale": "1x"
-        }, 
+        },
         {
-            "filename": "mdc_sprite_grid__list_2x.png", 
-            "idiom": "universal", 
+            "filename": "mdc_sprite_grid__list@2x.png",
+            "idiom": "universal",
             "scale": "2x"
-        }, 
+        },
         {
-            "filename": "mdc_sprite_grid__list_3x.png", 
-            "idiom": "universal", 
+            "filename": "mdc_sprite_grid__list@3x.png",
+            "idiom": "universal",
             "scale": "3x"
         }
-    ], 
+    ],
     "info": {
-        "author": "xcode", 
+        "author": "xcode",
         "version": 1
     }
-}
+}
diff --git a/...ist.imageset/mdc_sprite_grid__list_2x.png → ...ist.imageset/mdc_sprite_grid__list@2x.png b/...ist.imageset/mdc_sprite_grid__list_2x.png → ...ist.imageset/mdc_sprite_grid__list@2x.png
diff --git a/...ist.imageset/mdc_sprite_grid__list_3x.png → ...ist.imageset/mdc_sprite_grid__list@3x.png b/...ist.imageset/mdc_sprite_grid__list_3x.png → ...ist.imageset/mdc_sprite_grid__list@3x.png
diff --git a/...ples/resources/SpritedAnimationView.xcassets/mdc_sprite_list__grid.imageset/Contents.json b/...ples/resources/SpritedAnimationView.xcassets/mdc_sprite_list__grid.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
     "images": [
         {
-            "filename": "mdc_sprite_list__grid.png", 
-            "idiom": "universal", 
+            "filename": "mdc_sprite_list__grid.png",
+            "idiom": "universal",
             "scale": "1x"
-        }, 
+        },
         {
-            "filename": "mdc_sprite_list__grid_2x.png", 
-            "idiom": "universal", 
+            "filename": "mdc_sprite_list__grid@2x.png",
+            "idiom": "universal",
             "scale": "2x"
-        }, 
+        },
         {
-            "filename": "mdc_sprite_list__grid_3x.png", 
-            "idiom": "universal", 
+            "filename": "mdc_sprite_list__grid@3x.png",
+            "idiom": "universal",
             "scale": "3x"
         }
-    ], 
+    ],
     "info": {
-        "author": "xcode", 
+        "author": "xcode",
         "version": 1
     }
-}
+}
diff --git a/...rid.imageset/mdc_sprite_list__grid_2x.png → ...rid.imageset/mdc_sprite_list__grid@2x.png b/...rid.imageset/mdc_sprite_list__grid_2x.png → ...rid.imageset/mdc_sprite_list__grid@2x.png
diff --git a/...rid.imageset/mdc_sprite_list__grid_3x.png → ...rid.imageset/mdc_sprite_list__grid@3x.png b/...rid.imageset/mdc_sprite_list__grid_3x.png → ...rid.imageset/mdc_sprite_list__grid@3x.png
diff --git a/demos/Pesto/Pesto/Assets.xcassets/mdc_sprite_arrow_back__menu.imageset/Contents.json b/demos/Pesto/Pesto/Assets.xcassets/mdc_sprite_arrow_back__menu.imageset/Contents.json
@@ -6,12 +6,12 @@
             "scale": "1x"
         },
         {
-            "filename": "goo_sprite_arrow_back__menu_2x.png",
+            "filename": "goo_sprite_arrow_back__menu@2x.png",
             "idiom": "universal",
             "scale": "2x"
         },
         {
-            "filename": "goo_sprite_arrow_back__menu_3x.png",
+            "filename": "goo_sprite_arrow_back__menu@3x.png",
             "idiom": "universal",
             "scale": "3x"
         }

diff --git a/...ageset/goo_sprite_arrow_back__menu_2x.png → ...ageset/goo_sprite_arrow_back__menu@2x.png b/...ageset/goo_sprite_arrow_back__menu_2x.png → ...ageset/goo_sprite_arrow_back__menu@2x.png
diff --git a/...ageset/goo_sprite_arrow_back__menu_3x.png → ...ageset/goo_sprite_arrow_back__menu@3x.png b/...ageset/goo_sprite_arrow_back__menu_3x.png → ...ageset/goo_sprite_arrow_back__menu@3x.png
diff --git a/demos/Pesto/Pesto/Assets.xcassets/mdc_sprite_menu__arrow_back.imageset/Contents.json b/demos/Pesto/Pesto/Assets.xcassets/mdc_sprite_menu__arrow_back.imageset/Contents.json
@@ -6,12 +6,12 @@
             "scale": "1x"
         },
         {
-            "filename": "goo_sprite_menu__arrow_back_2x.png",
+            "filename": "goo_sprite_menu__arrow_back@2x.png",
             "idiom": "universal",
             "scale": "2x"
         },
         {
-            "filename": "goo_sprite_menu__arrow_back_3x.png",
+            "filename": "goo_sprite_menu__arrow_back@3x.png",
             "idiom": "universal",
             "scale": "3x"
         }

diff --git a/...ageset/goo_sprite_menu__arrow_back_2x.png → ...ageset/goo_sprite_menu__arrow_back@2x.png b/...ageset/goo_sprite_menu__arrow_back_2x.png → ...ageset/goo_sprite_menu__arrow_back@2x.png
diff --git a/...ageset/goo_sprite_menu__arrow_back_3x.png → ...ageset/goo_sprite_menu__arrow_back@3x.png b/...ageset/goo_sprite_menu__arrow_back_3x.png → ...ageset/goo_sprite_menu__arrow_back@3x.png