Refactor

bartoszj · Apr 28, 2019 · 82b633e · 82b633e
1 parent fbc055c
commit 82b633e
Show file tree

Hide file tree

Showing 55 changed files with 256 additions and 1,642 deletions.
diff --git a/Images.xcassets/devices/d_iphone4.imageset/Contents.json b/Images.xcassets/devices/d_iphone4.imageset/Contents.json
@@ -4,6 +4,11 @@
       "idiom" : "iphone",
       "scale" : "1x"
     },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "1x"
+    },
     {
       "idiom" : "iphone",
       "filename" : "green@2x-1.png",
@@ -18,6 +23,11 @@
     {
       "idiom" : "iphone",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/Images.xcassets/devices/d_tv.imageset/Contents.json b/Images.xcassets/devices/d_tv.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "cyan.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/Images.xcassets/devices/d_watch.imageset/Contents.json b/Images.xcassets/devices/d_watch.imageset/Contents.json
@@ -11,11 +11,21 @@
       "screen-width" : "<=145",
       "scale" : "2x"
     },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
     {
       "idiom" : "watch",
       "filename" : "cyan@3x.png",
       "screen-width" : ">145",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
     }
   ],
   "info" : {

diff --git a/Images.xcassets/devices/mix/d_iphone_ipad_mac.imageset/Contents.json b/Images.xcassets/devices/mix/d_iphone_ipad_mac.imageset/Contents.json
@@ -5,6 +5,11 @@
       "filename" : "green.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "1x"
+    },
     {
       "idiom" : "iphone",
       "filename" : "green@2x.png",
@@ -21,6 +26,11 @@
       "filename" : "green@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "3x"
+    },
     {
       "idiom" : "ipad",
       "filename" : "blue.png",

diff --git a/Images.xcassets/devices/mix/d_iphone_ipad_mac_watch.imageset/Contents.json b/Images.xcassets/devices/mix/d_iphone_ipad_mac_watch.imageset/Contents.json
@@ -5,6 +5,11 @@
       "filename" : "green.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "1x"
+    },
     {
       "idiom" : "iphone",
       "filename" : "green@2x.png",
@@ -21,6 +26,11 @@
       "filename" : "green@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "3x"
+    },
     {
       "idiom" : "ipad",
       "filename" : "blue.png",
@@ -42,12 +52,22 @@
       "screen-width" : "<=145",
       "scale" : "2x"
     },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
     {
       "idiom" : "watch",
       "filename" : "cyan@3x.png",
       "screen-width" : ">145",
       "scale" : "2x"
     },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
+    },
     {
       "idiom" : "mac",
       "filename" : "image.png",

diff --git a/Images.xcassets/pdf/v_device.imageset/Contents.json b/Images.xcassets/pdf/v_device.imageset/Contents.json
@@ -26,11 +26,19 @@
       "filename" : "facebook-4.pdf",
       "screen-width" : "<=145"
     },
+    {
+      "idiom" : "watch",
+      "screen-width" : ">161"
+    },
     {
       "idiom" : "watch",
       "filename" : "facebook-5.pdf",
       "screen-width" : ">145"
     },
+    {
+      "idiom" : "watch",
+      "screen-width" : ">183"
+    },
     {
       "idiom" : "tv",
       "filename" : "facebook-6.pdf"

diff --git a/Images.xcassets/pdf/v_overrides.imageset/Contents.json b/Images.xcassets/pdf/v_overrides.imageset/Contents.json
@@ -33,6 +33,11 @@
       "filename" : "green.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "1x"
+    },
     {
       "idiom" : "iphone",
       "filename" : "green@2x.png",
@@ -49,6 +54,11 @@
       "filename" : "green@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "3x"
+    },
     {
       "idiom" : "ipad",
       "filename" : "facebook-1-1.pdf"
@@ -72,11 +82,19 @@
       "filename" : "facebook-4.pdf",
       "screen-width" : "<=145"
     },
+    {
+      "idiom" : "watch",
+      "screen-width" : ">161"
+    },
     {
       "idiom" : "watch",
       "filename" : "facebook-5.pdf",
       "screen-width" : ">145"
     },
+    {
+      "idiom" : "watch",
+      "screen-width" : ">183"
+    },
     {
       "idiom" : "watch",
       "filename" : "cyan.png",
@@ -88,12 +106,22 @@
       "screen-width" : "<=145",
       "scale" : "2x"
     },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">161"
+    },
     {
       "idiom" : "watch",
       "filename" : "cyan@3x.png",
       "screen-width" : ">145",
       "scale" : "2x"
     },
+    {
+      "idiom" : "watch",
+      "scale" : "2x",
+      "screen-width" : ">183"
+    },
     {
       "idiom" : "tv",
       "filename" : "facebook-6.pdf"
@@ -103,6 +131,10 @@
       "filename" : "image.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    },
     {
       "idiom" : "mac",
       "filename" : "facebook-1-1-1.pdf"

diff --git a/MacTestApp/AppDelegate.swift b/MacTestApp/AppDelegate.swift