From eb25e01be5c5d70fda8088e4be40dfd1bdb0dbae Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 24 Sep 2022 14:24:32 -0500 Subject: [PATCH] Update the "Mark as" icons. Fixes #3687 --- .../CloudKitArticleStatusUpdate.swift | 2 +- Mac/AppAssets.swift | 2 +- .../markAllAsRead.imageset/Contents.json | 16 -- .../markAllAsRead.imageset/markAllAsRead.pdf | Bin 4173 -> 0 bytes iOS/AppAssets.swift | 12 +- iOS/Base.lproj/Main.storyboard | 49 +++--- .../markAllAsRead.symbolset/Contents.json | 12 -- .../markAllAsRead.symbolset/markAllAsRead.svg | 142 ------------------ 8 files changed, 33 insertions(+), 202 deletions(-) delete mode 100644 Mac/Resources/Assets.xcassets/markAllAsRead.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/markAllAsRead.imageset/markAllAsRead.pdf delete mode 100644 iOS/Resources/Assets.xcassets/markAllAsRead.symbolset/Contents.json delete mode 100644 iOS/Resources/Assets.xcassets/markAllAsRead.symbolset/markAllAsRead.svg diff --git a/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift b/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift index 9bad6d6d0..8e57a6e99 100644 --- a/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift @@ -31,7 +31,7 @@ struct CloudKitArticleStatusUpdate { let rec = record // This is an invalid status update. The article is required for new and all if article == nil && (rec == .all || rec == .new) { - return nil + fatalError() } } diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 1e2ae11ca..b9e388d8f 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -147,7 +147,7 @@ struct AppAssets { } static var markAllAsReadImage: RSImage = { - return RSImage(named: "markAllAsRead")! + return NSImage(systemSymbolName: "arrow.up.arrow.down.circle", accessibilityDescription: nil)! }() static var nextUnreadImage: RSImage = { diff --git a/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/Contents.json b/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/Contents.json deleted file mode 100644 index 9937c57c5..000000000 --- a/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "markAllAsRead.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/markAllAsRead.pdf b/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/markAllAsRead.pdf deleted file mode 100644 index 420f9d49c1a7280664082f35f6a782e67485f4c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4173 zcmai%2{e@L`^POKj6!8k^(1RqhB1Rg_Gw6COLone!B~s2XDds#>{$vSWLK1R$e#2X zYm$&`*@=)b`HkMU-`oHHzW?)o&U2pUKG%KS*L|P+`d;UJE+IV)EeUB!C|Ia%=IhL2 z!N%j>whk~9fB>!-2k^yvH+^7wd^g>{oPdr$o6AT==t zep1{EK2`}v26H58zlmTNf0dJvwpJ+6o|AM=ugW43m#S^AS;1$av%qPfwH#%UOfD!A zSbpt*>^3elPE5QPW?Z@IK=D?$vKhWmBt3;){kK)$is^!yD@j z3}t+DMtxGM?i-q+vN@j%5^E=MwN_Wt=T5JU_HpenST_;RTCB$HPLLU_<@s_zC35%V z?7Oc9;LFVy$s^|)da~~CtNR9LP2L~*!y?Bv*Eifr(8d9(C&8Pas%5|1#}$ffC`WV% zLL++yBT(IyCCGd=-R3u$b?b^P{a)DubD!X%wyJqAKNYb~e0<67!+c*-)DvUj-_0S} znSSp0itZ^{EjFiiOEDk5s@Z;Emp9dai(^(g3&zo$8GtF9gW_NI?hNK?sK98*}jBvsF7G@ z6sw)_py}9;I)0z-U}{x)S$qJ@@ECBHCf?<^ArY`c_+JB2d1}-i0@8$A)iDW$RGBO37;E&377;FBqshT?_YP*5`766#N3*_$=FC{MBlBu0 zY-2o~(rG#|GFLr3Vz=r)Tt}m~cL&r$Frf{S%{Jj!S!}jAcD%c7n~sN_meqvz)ugR0 z2(hCnXMV5+U$X{%uNe0^7HituzcpJ@+ogKTDWz211b&}42jDBB`c z=#yRUZAKi?2$@bZvn@I>u=D5&4TK}j`t6)>wo`<& z=R+zplO?ECfaWU$P1X3LjZQ+z;Jf!a4gnMC`X((cOt~8neJE|BjGVvHdqou zCw}7ye-QL0{Ww4q5_FlJ{sFz@WjeeH=((!$dm6B+^m|&*yAC&L27`TjL09jXz=$td6=PR z`6ePImpqx_M<2#Wv>D%syeb8d- zkxAio?}l^Z9IJQOn%&nhx6d?!1Nj3_O~jt=XcCEIHUl}{VLS5x5OfkWV&`L;W1@r{ zZIRUveu^Rpgt7aySzyGT-G8szfaDjxn#h3+6XZ4!6icfLHbOcGSPCl%6VD`eUBDvT zcuZBSP-TKyfVB`?!X>>VQDF|0HovCY$W;aHS`{A^AN4$gBTrohO^Q4V`|oO0!{bZiR8S)?`(S zQYcb0JtrA+50j3Gz})=|Yu6WQNC-}-K87k(nXl*<$~(iSHjwAjUsI)9b>Rc<1LPz^ z?g@DyalU=?^cUhLGfoI+J|jBAKf^au`NrT-3*^QQ)POfHIx)IFI(9>Lww5$S8ikkR zt@azllE0sGId?l*AlWvVHaWKF$~D&^j-iYq=OWY~#6j2r?J(j%9+E7MAr+9kGD#WM zvis9};R_XY5xzCM4&PcAlok^C()k+sc=@jJrO0-`c+*|dyV7UU=VUvp?9EtSfXrsh z=3ZDqlG9e+8rcd}Mk!>MmMs@Z^eI0XD^@DCd0J^=mwUCc=eT8pq`91GwMDg|ml{e( z%0$Y#Tz@rNSwE{Z>q!%$$vp7Qt6t#4jVRTJ%}=u7rTvwhl7p{oNKqeq#x^xZS4~`q%s3TR84m-};3(FS6>N|5PKAM`AXuW%^(0cLp z?OdOS-_NrsMVUlpaE)HWf2vFmbM0sMu}&(3b9KY2)7+<}hVb*^@su z`=Yc^V#2d&*JZKiFmzjIou z-&)XOkc&=jPu(;0A~Wo;CFia?kEFP4iSUw7%{A`;Z!eGpMpHw*t^RWC>;Bh>s2DCC zE-$SvM7!n?LRZsIGeuJ;#YEh+a#}0eEE>pH;yQhT(@)UTt#G@4OecJ5=`(n0MG|W9 zpmOPh+l!gPZcX5DfJ zw-*me33(pUr;*ZT8DWDgLvkXg=uoOJK6yO1{u(@8m=u?kD+Vp>EBpf=QngbxpeBTl ztT=B8RT3dewaVr~)a%~hhgPl~&r#`%zar{xYFnRr|HqYYm!kzA3f(njsdRWgZim2S zz0rSrbarz(ecGk_WY6WGxMSS7tFj?w(cz{E=fDBl z82WZb^&Cr8o!ikLCresMi#ZE*O?H9Sff~z~*W*cuP()s5ORUF`;^45{ zQ@JE~OH4w?v#DF1u9Q#T)cuYZ&+9>RYj;5MXB5^yckY~C%{+W@#3$0fXkLVpwe_;s zEYd9d-N$zkFQ35iepmb^=7R<@PWGIXxb$%U_Ga`}T6*OhI~`Jd59gzY3RzwOU)4H7 z*P|l1!!KMXDA!d@_h*zr<7Z**SZys63KhlQi|=$6f70}GyI9mVU(D6r|L5w zST6U`OnZ8)U|2Uj5NZed{JbZ&xdCx93tVUgGKlyt(s+ECM zNII`orL}-4MUbMuN00eF+iYL!j!qev3T+bm@p3!4uQ)5fi%hh`bhWKH_ARDe(jI@> zsIdEP%Xtp_WqQC1znWhVIbPg&X)BnLO}5$WjGtdZ?VysgVlH{zX5RbiE$nPNJFy+I z@h_}=fT{;lMiT|8tpe0mitFQbu~m?&S)EyAz+MibH}^70MZaiX*ggZs^)=r!U8f7H5f!j25lh*=zE~u2)+Q7)_(%N zH$jXF>C`5ZKwYIl5|FA*i z6sY(6KjT5+GSoc(Z=2k2`x4yHcqg3O&o12%?~4Nzs11^lEK|gN~Di2iv L3khkWw7~xXAShKF diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index e91b39487..23e3a4d91 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -162,15 +162,15 @@ struct AppAssets { }() static var markAllAsReadImage: UIImage = { - return UIImage(named: "markAllAsRead")! - }() - - static var markBelowAsReadImage: UIImage = { - return UIImage(systemName: "arrowtriangle.down.circle")! + return UIImage(systemName: "arrow.up.arrow.down.circle")! }() static var markAboveAsReadImage: UIImage = { - return UIImage(systemName: "arrowtriangle.up.circle")! + return UIImage(systemName: "arrow.up.circle")! + }() + + static var markBelowAsReadImage: UIImage = { + return UIImage(systemName: "arrow.down.circle")! }() static var masterFolderImage: IconImage = { diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index 1aaef03a2..d807aea09 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -17,7 +18,7 @@ -