Xcode: Automatic images xcassets adjustment

vlc-ios/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -149,10 +149,16 @@
     {
       "size" : "44x44",
       "idiom" : "watch",
-      "filename" : "AppIcon44@2x.png",
       "scale" : "2x",
-      "role" : "longLook",
-      "subtype" : "42mm"
+      "role" : "appLauncher",
+      "subtype" : "40mm"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "44mm"
     },
     {
       "size" : "86x86",
@@ -171,10 +177,25 @@
       "subtype" : "42mm"
     },
     {
+      "size" : "108x108",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "44mm"
+    },
+    {
       "size" : "1024x1024",
       "idiom" : "watch-marketing",
       "filename" : "AppIcon1024@1x.png",
       "scale" : "1x"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "filename" : "AppIcon44@2x.png",
+      "scale" : "2x",
+      "role" : "longLook",
+      "subtype" : "42mm"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/Library View/folderIcon.imageset/Contents.json

@@ -2,13 +2,13 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "scale" : "1x",
-      "filename" : "folderIcon.png"
+      "filename" : "folderIcon.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "2x",
-      "filename" : "folderIcon@2x.png"
+      "filename" : "folderIcon@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "iphone",
@@ -16,13 +16,13 @@
     },
     {
       "idiom" : "ipad",
-      "scale" : "1x",
-      "filename" : "folderIcon~ipad.png"
+      "filename" : "folderIcon~ipad.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "ipad",
-      "scale" : "2x",
-      "filename" : "folderIcon@2x~ipad.png"
+      "filename" : "folderIcon@2x~ipad.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "watch",
@@ -30,13 +30,23 @@
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{130,145}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : "<=145"
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{146,165}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/Library View/gradient-cell-ios7.imageset/Contents.json

@@ -2,13 +2,13 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "scale" : "1x",
-      "filename" : "gradient-cell-ios7.png"
+      "filename" : "gradient-cell-ios7.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "2x",
-      "filename" : "gradient-cell-ios7@2x.png"
+      "filename" : "gradient-cell-ios7@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "iphone",
@@ -16,13 +16,13 @@
     },
     {
       "idiom" : "ipad",
-      "scale" : "1x",
-      "filename" : "gradient-cell-ios7-ipad.png"
+      "filename" : "gradient-cell-ios7-ipad.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "ipad",
-      "scale" : "2x",
-      "filename" : "gradient-cell-ios7-ipad@2x.png"
+      "filename" : "gradient-cell-ios7-ipad@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "watch",
@@ -30,13 +30,23 @@
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{130,145}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : "<=145"
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{146,165}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/Library View/tvShow.imageset/Contents.json

@@ -2,13 +2,13 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "scale" : "1x",
-      "filename" : "tvShow.png"
+      "filename" : "tvShow.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "2x",
-      "filename" : "tvShow@2x.png"
+      "filename" : "tvShow@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "iphone",
@@ -16,13 +16,13 @@
     },
     {
       "idiom" : "ipad",
-      "scale" : "1x",
-      "filename" : "tvShow~iPad.png"
+      "filename" : "tvShow~iPad.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "ipad",
-      "scale" : "2x",
-      "filename" : "tvShow@2x~ipad.png"
+      "filename" : "tvShow@2x~ipad.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "watch",
@@ -30,13 +30,23 @@
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{130,145}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : "<=145"
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{146,165}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/PlayingExternally.imageset/Contents.json

@@ -2,28 +2,28 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "scale" : "1x",
-      "filename" : "PlayingExternally~iphone.png"
+      "filename" : "PlayingExternally~iphone.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "2x",
-      "filename" : "PlayingExternally@2x~iphone.png"
+      "filename" : "PlayingExternally@2x~iphone.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "3x",
-      "filename" : "PlayingExternally@3x~iphone.png"
+      "filename" : "PlayingExternally@3x~iphone.png",
+      "scale" : "3x"
     },
     {
       "idiom" : "ipad",
-      "scale" : "1x",
-      "filename" : "PlayingExternally~ipad.png"
+      "filename" : "PlayingExternally~ipad.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "ipad",
-      "scale" : "2x",
-      "filename" : "PlayingExternally@2x~ipad.png"
+      "filename" : "PlayingExternally@2x~ipad.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "watch",
@@ -31,13 +31,23 @@
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{130,145}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : "<=145"
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{146,165}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/TVBroadcastIcon.imageset/Contents.json

@@ -37,7 +37,17 @@
     {
       "idiom" : "watch",
       "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
       "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/cloudServices/audio.imageset/Contents.json

@@ -36,7 +36,17 @@
     {
       "idiom" : "watch",
       "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
       "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/cloudServices/blank.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "scale" : "1x",
-      "filename" : "blank.png"
+      "filename" : "blank.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "2x",
-      "filename" : "blank@2x.png"
+      "filename" : "blank@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "3x",
-      "filename" : "blank@3x.png"
+      "filename" : "blank@3x.png",
+      "scale" : "3x"
     },
     {
       "idiom" : "ipad",
@@ -21,8 +21,8 @@
     },
     {
       "idiom" : "ipad",
-      "scale" : "2x",
-      "filename" : "blank@2x~ipad.png"
+      "filename" : "blank@2x~ipad.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "watch",
@@ -30,13 +30,23 @@
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{130,145}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : "<=145"
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{146,165}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/cloudServices/folder.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "scale" : "1x",
-      "filename" : "folder.png"
+      "filename" : "folder.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "2x",
-      "filename" : "folder@2x.png"
+      "filename" : "folder@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "3x",
-      "filename" : "folder@3x.png"
+      "filename" : "folder@3x.png",
+      "scale" : "3x"
     },
     {
       "idiom" : "ipad",
@@ -21,8 +21,8 @@
     },
     {
       "idiom" : "ipad",
-      "scale" : "2x",
-      "filename" : "folder@2x~ipad.png"
+      "filename" : "folder@2x~ipad.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "watch",
@@ -30,13 +30,23 @@
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{130,145}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : "<=145"
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{146,165}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/cloudServices/movie.imageset/Contents.json

@@ -36,7 +36,17 @@
     {
       "idiom" : "watch",
       "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
       "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

vlc-ios/Images.xcassets/menu/serverIcon.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "scale" : "1x",
-      "filename" : "serverIcon@1x.png"
+      "filename" : "serverIcon@1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "2x",
-      "filename" : "serverIcon@2x.png"
+      "filename" : "serverIcon@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "iphone",
-      "scale" : "3x",
-      "filename" : "serverIcon@3x.png"
+      "filename" : "serverIcon@3x.png",
+      "scale" : "3x"
     },
     {
       "idiom" : "ipad",
@@ -21,8 +21,8 @@
     },
     {
       "idiom" : "ipad",
-      "scale" : "2x",
-      "filename" : "serverIcon@4x.png"
+      "filename" : "serverIcon@4x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "watch",
@@ -30,13 +30,23 @@
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{130,145}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : "<=145"
     },
     {
       "idiom" : "watch",
-      "screenWidth" : "{146,165}",
-      "scale" : "2x"
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">145"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {