From 4446fa0ca92242d5c048d4d52385ed45d461c4a9 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sun, 19 Jul 2020 17:44:41 -0500
Subject: [PATCH] Change mark all as read image to be a PNG, since SwiftUI on
 AppKit sucks at handling vector resources

---
 Multiplatform/Shared/AppAssets.swift          |   6 ++---
 .../MarkAllAsReadPDF.imageset/Contents.json   |  16 -------------
 .../MarkAllAsReadPDF.pdf                      | Bin 4179 -> 0 bytes
 .../MarkAllAsReadPNG.imageset/Contents.json   |  21 ++++++++++++++++++
 .../mark-all-as-read.png                      | Bin 0 -> 1194 bytes
 .../Shared/SceneNavigationView.swift          |   6 ++---
 6 files changed, 26 insertions(+), 23 deletions(-)
 delete mode 100644 Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPDF.imageset/Contents.json
 delete mode 100644 Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPDF.imageset/MarkAllAsReadPDF.pdf
 create mode 100644 Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPNG.imageset/Contents.json
 create mode 100644 Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPNG.imageset/mark-all-as-read.png

diff --git a/Multiplatform/Shared/AppAssets.swift b/Multiplatform/Shared/AppAssets.swift
index da20e0d01..b84d713c7 100644
--- a/Multiplatform/Shared/AppAssets.swift
+++ b/Multiplatform/Shared/AppAssets.swift
@@ -167,10 +167,10 @@ struct AppAssets {
 		return Image("MarkAllAsRead")
 	}()
 	
-	static var markAllAsReadImagePDF: Image = {
-		return Image("MarkAllAsReadPDF")
+	static var markAllAsReadImagePNG: Image = {
+		return Image("MarkAllAsReadPNG")
 	}()
-	
+
 	static var nextUnreadArticleImage: Image = {
 		return Image(systemName: "chevron.down.circle")
 	}()
diff --git a/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPDF.imageset/Contents.json b/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPDF.imageset/Contents.json
deleted file mode 100644
index f23296bcc..000000000
--- a/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPDF.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "MarkAllAsReadPDF.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPDF.imageset/MarkAllAsReadPDF.pdf b/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPDF.imageset/MarkAllAsReadPDF.pdf
deleted file mode 100644
index e2a044d563efa11c16626ef66db1589a2f15e443..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4179
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
O0E2^tg*ElH!2bhrMoa(z

diff --git a/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPNG.imageset/Contents.json b/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPNG.imageset/Contents.json
new file mode 100644
index 000000000..57b502628
--- /dev/null
+++ b/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPNG.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mark-all-as-read.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPNG.imageset/mark-all-as-read.png b/Multiplatform/Shared/Assets.xcassets/MarkAllAsReadPNG.imageset/mark-all-as-read.png
new file mode 100644
index 0000000000000000000000000000000000000000..c78a44c1b17dba17adb3331cfc59233648f01b8c
GIT binary patch
literal 1194
zcmV;b1XcTqP)<h;3K|Lk000e1NJLTq000~S001cn1^@s6Cb~(A00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR919H0XL1ONa40RR91DF6Tf01bS@Q~&@36iGxuR9FeMmurYsRTO|nGs{Qj
zgo=-HMy)IaA7I8rmZgS}K@kxQ&4^GCl;rD2snIQpB!Zx~1obN-L_~i`k=X<Pgq2Ve
zT0uz<HI-0FWqgp|cid~dbLU*|ojZ3He0Qz0_TFpl_c?b!LuDC2l@@piW<fJdfMc*9
zeuHhW6%InpVxo4~2me>WIqG~2Q=qIEG*52C`60|sh5w>=z%KX)4#Q9w1I=(ZIQoHb
z2402&*wKnIj~XVh@+V+0167hyR9FLc$hMndI9yWZQhFMG1=p<>8A7A=;1qujgCJL~
z!)xz8f{H!MjnLhBCyz(qt?urNPunqFw@TADf;u<Dc(@EMC9bQ>v#7MvJvhFGyZ~;D
z$HD1|wRMf;EO;#5g!z!y{to=Rq1!+{!*M+n%Sawxg-(bBm2?Mn?}bu%4abAwbZTCV
zhol{`Ti*n3qOagtaB7^UYr&&)J3IpK!=DfxD&3*OD0>?+d5qtQ$yPaio~7gP3XFql
z#527Zc7ln2fF=kjU<~%*VSkdep{?xs8=HK!s8$*sg}rcf3gFB*D-Cm#;}-NOSO?{9
zpj5Rg<>>Z+op-}{9<#IU8tQNg)<QY46U}fNxB*<x=@28p>>)14&#*L=Oo$pwFg$~K
z;<kPV_Jh-1$~k-<sTJV$Rw_5(_yxRyy5tM2Yr38;7&B0xLTLh@U7yaJGX2j$x8OW4
zhesikoA_Os>`==v&O#(}1W&<KxDphn*byxR5B?#D`afb%f)Fo+cjMs+jK=g}5T`F1
zev3U1s*&MTD!@swz2~?ELRMpV9vkit5BhnCWE-$AFDk3nbo>7S#yJ9$LGegT(}-R?
zfE~%!ThIp?N83o+f$f?)d$&TiS#-qJv=w`x1$`7p8q>Qb#p>FaPvdZOC&1p-O9})s
z?lBk*nK;zHz=D@DPyK$}NU?iYMc6qQv366!Sx5awioY{r7LwzqaMW2ZNb$Xq8r>X|
zQi9z{*IRv`0-CGIA1`mkyRtvT&yvm*c)SU-(~ouw_m@QMVJ19~vW)GgY=ep0m|`C=
zVN7Lna@Jcl6$Q+4wc_wtc<4)CD@Ao{HlL)W@tsKrn7y%2qjh?p)?0QE(AXP_18+&r
z@6g^n^%6fLO(u602legl!L(pWaX}yKLA3n_jJZ88&IhT`wVah#p_e|t0!-$YLvFmQ
zDDd57B`@=tP>Z-EFMx4m1(X%9xwzf`!)}A#tf{Y{O%Tc6!>%ZksSzW!;V!rju7Gml
zUxnx3I7BjEbv-)U!$Bp*>3tpAAv-&0NBkx1gM%;>d|A6b#nbQM_Ooy!^jh4#esaV)
zjo#;J6RiU~QdY{1u(ZKQ9E+g^e7iU@FXX@Bci0AT1Tf3XdC`^!bj=);M*si-07*qo
IM6N<$f_bA3Q~&?~

literal 0
HcmV?d00001

diff --git a/Multiplatform/Shared/SceneNavigationView.swift b/Multiplatform/Shared/SceneNavigationView.swift
index 9105551f3..1aeb052cc 100644
--- a/Multiplatform/Shared/SceneNavigationView.swift
+++ b/Multiplatform/Shared/SceneNavigationView.swift
@@ -94,10 +94,8 @@ struct SceneNavigationView: View {
 				Button {
 					sceneModel.markAllAsRead()
 				} label: {
-					AppAssets.markAllAsReadImagePDF
-						.resizable()
-						.scaledToFit()
-						.frame(width: 20, height: 20, alignment: .center)
+					AppAssets.markAllAsReadImagePNG
+						.offset(y: 7)
 				}
 				.disabled(sceneModel.markAllAsReadButtonState == nil)
 				.help("Mark All as Read")