From b29eb631b47af11892cd40a91d009928c906d3de Mon Sep 17 00:00:00 2001 From: Michal Rentka Date: Fri, 4 Oct 2024 14:29:31 +0200 Subject: [PATCH] Added missing icons to items list and detail --- .../ShareViewController.swift | 2 +- .../attachment-detail-document.png | Bin 242 -> 0 bytes .../attachment-detail-document@2x.png | Bin 361 -> 0 bytes .../attachment-detail-document@3x.png | Bin 511 -> 0 bytes .../detail-document.imageset/document-1.png | Bin 213 -> 0 bytes .../document@2x-1.png | Bin 315 -> 0 bytes .../document@3x-1.png | Bin 446 -> 0 bytes .../Contents.json | 56 -------- .../attachment-detail-linked-document.png | Bin 414 -> 0 bytes .../attachment-detail-linked-document@2x.png | Bin 739 -> 0 bytes .../attachment-detail-linked-document@3x.png | Bin 1072 -> 0 bytes .../document-linked.png | Bin 352 -> 0 bytes .../document-linked@2x.png | Bin 589 -> 0 bytes .../document-linked@3x.png | Bin 884 -> 0 bytes .../attachment-detail-linked-pdf.png | Bin 490 -> 0 bytes .../attachment-detail-linked-pdf@2x.png | Bin 817 -> 0 bytes .../attachment-detail-linked-pdf@3x.png | Bin 1155 -> 0 bytes .../pdf-linked-1.png | Bin 405 -> 0 bytes .../pdf-linked@2x-1.png | Bin 651 -> 0 bytes .../pdf-linked@3x-1.png | Bin 951 -> 0 bytes .../detail-linked-url.imageset/Contents.json | 56 -------- .../attachment-detail-linked-url.png | Bin 519 -> 0 bytes .../attachment-detail-linked-url@2x.png | Bin 972 -> 0 bytes .../attachment-detail-linked-url@3x.png | Bin 1551 -> 0 bytes .../web-page-linked-1.png | Bin 443 -> 0 bytes .../web-page-linked@2x-1.png | Bin 808 -> 0 bytes .../web-page-linked@3x-1.png | Bin 1384 -> 0 bytes .../attachment-detail-pdf.png | Bin 304 -> 0 bytes .../attachment-detail-pdf@2x.png | Bin 443 -> 0 bytes .../attachment-detail-pdf@3x.png | Bin 583 -> 0 bytes .../Attachments/detail-pdf.imageset/pdf-1.png | Bin 259 -> 0 bytes .../detail-pdf.imageset/pdf@2x-1.png | Bin 370 -> 0 bytes .../detail-pdf.imageset/pdf@3x-1.png | Bin 498 -> 0 bytes .../Contents.json | 56 -------- .../attachment-detail-webpage-snapshot.png | Bin 508 -> 0 bytes .../attachment-detail-webpage-snapshot@2x.png | Bin 966 -> 0 bytes .../attachment-detail-webpage-snapshot@3x.png | Bin 1521 -> 0 bytes .../web-page-snapshot-1.png | Bin 443 -> 0 bytes .../web-page-snapshot@2x-1.png | Bin 828 -> 0 bytes .../web-page-snapshot@3x-1.png | Bin 1405 -> 0 bytes .../Contents.json | 12 +- .../list-epub.imageset/list-epub-1.png | Bin 0 -> 256 bytes .../list-epub.imageset/list-epub.png | Bin 0 -> 306 bytes .../list-epub.imageset/list-epub@2x-1.png | Bin 0 -> 376 bytes .../list-epub.imageset/list-epub@2x.png | Bin 0 -> 441 bytes .../list-epub.imageset/list-epub@3x-1.png | Bin 0 -> 474 bytes .../list-epub.imageset/list-epub@3x.png | Bin 0 -> 547 bytes .../dataset.imageset/28_dark_dataset.png | Bin 243 -> 0 bytes .../dataset.imageset/28_dark_dataset@2x.png | Bin 318 -> 0 bytes .../dataset.imageset/28_light_dataset.png | Bin 255 -> 0 bytes .../dataset.imageset/28_light_dataset@2x.png | Bin 334 -> 0 bytes .../Item types/dataset.imageset/Contents.json | 40 +----- .../dataset.imageset/dark_dataset.svg | 1 + .../Item types/dataset.imageset/dataset.svg | 1 + .../epub-linked.imageset}/Contents.json | 12 +- .../epub-linked.imageset/epub-linked-1.png | Bin 0 -> 1110 bytes .../epub-linked.imageset/epub-linked.png | Bin 0 -> 602 bytes .../epub-linked.imageset/epub-linked@2x-1.png | Bin 0 -> 1577 bytes .../epub-linked.imageset/epub-linked@2x.png | Bin 0 -> 1139 bytes .../epub-linked.imageset/epub-linked@3x-1.png | Bin 0 -> 2131 bytes .../epub-linked.imageset/epub-linked@3x.png | Bin 0 -> 1621 bytes .../epub.imageset}/Contents.json | 12 +- .../Item types/epub.imageset/epub-1.png | Bin 0 -> 948 bytes .../Item types/epub.imageset/epub.png | Bin 0 -> 429 bytes .../Item types/epub.imageset/epub@2x-1.png | Bin 0 -> 1201 bytes .../Item types/epub.imageset/epub@2x.png | Bin 0 -> 644 bytes .../Item types/epub.imageset/epub@3x-1.png | Bin 0 -> 1548 bytes .../Item types/epub.imageset/epub@3x.png | Bin 0 -> 972 bytes .../standard.imageset/28_dark_standard.png | Bin 600 -> 0 bytes .../standard.imageset/28_dark_standard@2x.png | Bin 1092 -> 0 bytes .../standard.imageset/28_light_standard.png | Bin 646 -> 0 bytes .../28_light_standard@2x.png | Bin 1215 -> 0 bytes .../standard.imageset/Contents.json | 40 +----- .../standard.imageset/dark_standard.svg | 1 + .../Item types/standard.imageset/standard.svg | 1 + Zotero/Extensions/Assets.swift | 9 +- Zotero/Models/ItemTypes.swift | 31 ++++- .../Detail/Items/Models/ItemCellModel.swift | 9 +- .../Detail/Lookup/Views/LookupItemCell.swift | 2 +- .../General/Views/FileAttachmentView.swift | 121 +++++++++++++----- .../General/Views/NoteEditorTitleView.swift | 2 +- 81 files changed, 159 insertions(+), 305 deletions(-) delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/document-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/document@2x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/document@3x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/Contents.json delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/attachment-detail-linked-document.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/attachment-detail-linked-document@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/attachment-detail-linked-document@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/document-linked.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/document-linked@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/document-linked@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/attachment-detail-linked-pdf.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/attachment-detail-linked-pdf@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/attachment-detail-linked-pdf@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/pdf-linked-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/pdf-linked@2x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/pdf-linked@3x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/Contents.json delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/attachment-detail-linked-url.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/attachment-detail-linked-url@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/attachment-detail-linked-url@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/web-page-linked-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/web-page-linked@2x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/web-page-linked@3x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/attachment-detail-pdf.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/attachment-detail-pdf@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/attachment-detail-pdf@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/pdf-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/pdf@2x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/pdf@3x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/Contents.json delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/attachment-detail-webpage-snapshot.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/attachment-detail-webpage-snapshot@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/attachment-detail-webpage-snapshot@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/web-page-snapshot-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/web-page-snapshot@2x-1.png delete mode 100644 Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/web-page-snapshot@3x-1.png rename Zotero/Assets/Images.xcassets/Attachments/{detail-pdf.imageset => list-epub.imageset}/Contents.json (76%) create mode 100644 Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub-1.png create mode 100644 Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub.png create mode 100644 Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@2x-1.png create mode 100644 Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@2x.png create mode 100644 Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@3x-1.png create mode 100644 Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/dataset.imageset/28_dark_dataset.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/dataset.imageset/28_dark_dataset@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/dataset.imageset/28_light_dataset.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/dataset.imageset/28_light_dataset@2x.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/dataset.imageset/dark_dataset.svg create mode 100644 Zotero/Assets/Images.xcassets/Item types/dataset.imageset/dataset.svg rename Zotero/Assets/Images.xcassets/{Attachments/detail-document.imageset => Item types/epub-linked.imageset}/Contents.json (74%) create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked-1.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@2x-1.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@2x.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@3x-1.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@3x.png rename Zotero/Assets/Images.xcassets/{Attachments/detail-linked-pdf.imageset => Item types/epub.imageset}/Contents.json (73%) create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub-1.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub@2x-1.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub@2x.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub@3x-1.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub@3x.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/standard.imageset/28_dark_standard.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/standard.imageset/28_dark_standard@2x.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/standard.imageset/28_light_standard.png delete mode 100644 Zotero/Assets/Images.xcassets/Item types/standard.imageset/28_light_standard@2x.png create mode 100644 Zotero/Assets/Images.xcassets/Item types/standard.imageset/dark_standard.svg create mode 100644 Zotero/Assets/Images.xcassets/Item types/standard.imageset/standard.svg diff --git a/ZShare/View Controllers/ShareViewController.swift b/ZShare/View Controllers/ShareViewController.swift index e22c1ff77..5e4b193de 100644 --- a/ZShare/View Controllers/ShareViewController.swift +++ b/ZShare/View Controllers/ShareViewController.swift @@ -324,7 +324,7 @@ final class ShareViewController: UIViewController { private func setItem(title: String, type: String) { self.itemTitleLabel.text = title - self.itemIcon.image = UIImage(named: ItemTypes.iconName(for: type, contentType: nil)) + self.itemIcon.image = UIImage(named: ItemTypes.iconName(for: type)) } private func setAttachment(title: String, file: File, state: ExtensionViewModel.State.AttachmentState) { diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document.png b/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document.png deleted file mode 100644 index 0b4d366091159c0cfeed221b79dca1d2d432888b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zoCO|{#S9GGLLkg|>2BR0px_cu z7sn8f&g2varqy9>&0}U3iXN?XTy*zP`S`CTi;`q4}~tBELBJ zBqSwoZrQS>CNeUz`(vb+DYv78heyYPr6F4@^Cx<#nu}s zDJeDY@9+OVt+DZ;MX0Wcnb|SbqhgJ3zX=Y|-hS;;|PiFNTI|XzvgQu&X%Q~loCIF0xT73Wj diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document@2x.png b/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document@2x.png deleted file mode 100644 index c9db8ef09b445b688e635a205bf6ec998ed02c0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_&H|6fVg?2=RS;(M3{v^Pz`!W& z>EalY(fIb(Uf!kviPndU7anYBYPxi-Z4zq?liP;tj&Dj^P7CQBU=mX~!kCwy>!Z;V z_;dHg>NAzrJO0@I)Xe$}d`t>04C+U}mQWV&$A;|f{Vi>HpN)YiIAT((kp$@T*VJaZNHvK|t=l&v76 zu$MhaX%bThr-zh+o6^b#iN+<&NeYvMIv7tpFz>$}d)Z`fpZBB`Sr*1y`PXF|-afW^ z%ObzKe)qQ7-Oo+mtIbHgx#IJyU3EME>#P0HWV|Un!Ins3@45Xtr#9IbN&l~IV#q64 X7jSy}-KjOeuw(Fa^>bP0l+XkKpm&kf diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document@3x.png b/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/attachment-detail-document@3x.png deleted file mode 100644 index dc6408683b9f0a0dd2b9a2b91f3011b85a3307b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!&H|6fVg?39a}Z`Uj+kG?z`(fC z)5S5QV$Rz;8*>jiNH{#SSLB_?(6uG5fprs0&jdyz=T~1&a-?D5$!VN zP?v+@hj$8hs+X2->h~|-R>Eq2aq+UuxZgdyFW4zRN;R8Z`*g;=xAh`c8-90GWX)Q3 z>f;6>2W9nF2czq(=Gv*v6}*zPv141V{k7L$tDpCs-2Ojw{e_1G5&g#>x1U@3MEmQj z?SI5dO{7wtbsxz_T`x7eqU6Bd>}Yl+Xy2!s0o{zfJ}X=s-Po=?a!@wRnz&%1z}AQh z9xYKO87dCCawZ8Oj`fQISl_xV;QF;XIFR-3Ma>mW?_Ne+*C6&3mc$TyHPVoBV$+=dI1US@S1`?|!O2nX~Tv)1sfxCBil4EGTF?#L1;T u5RCE<@`-1kf8Or>Kk)e(QJ@2BR0pkTYF zi(`mK=i6(JTn!2WtQYJrF5TtbZ6>?Qw`BGUrr2di`4_h?$$a23`=_*Hi5wTR@&~6P zr${luNc(UN#=EhTj8E#7uG6f!Xe`}e*t+f1gSz#6u5YTh9@L3q_F1&`KzNAs8|7;D z21bV)dR(;n^DMmfOEN_#mg0Myy}5YV(@hJb6Mw< G&;$VNn@J=9 diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/document@2x-1.png b/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/document@2x-1.png deleted file mode 100644 index 0a0a2cf7d2423f1085972ca10cfc8072eb019166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_&H|6fVg?2=RS;(M3{v?36nyLH z;uwqGNnUDg%G)!DWkd(A)EmB}?+GBgxni;XNZ+tj~jzhWZio9PP` z4^B97SAXSJ`zy>Avv2DDT5-0iBfgZu@7=!cdl^MdX=N+6yjEaktG3V`F!@NTd0uC1=r)ZTwNc-}#xb4czoo?%n$W92#UE&hhbYN2MzZ`|n^{Jc_ z!u>awF&@%QyHb7seC7S#vW|}H*KQRa`DFH8W6OqI7n|?*$is}?+uZPj}5G;A@K)m^PC?e;MrPLw^^ zX&0#c=;@_yzZbi<1PtL+rocwYm0dv~1OZ ej@Z=kgW=he*4_nC(>#F@!raE)V diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/Contents.json b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/Contents.json deleted file mode 100644 index 0041fe8ab..000000000 --- a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/Contents.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "images" : [ - { - "filename" : "attachment-detail-linked-document.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "document-linked.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "attachment-detail-linked-document@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "document-linked@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "attachment-detail-linked-document@3x.png", - "idiom" : "universal", - "scale" : "3x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "document-linked@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/attachment-detail-linked-document.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/attachment-detail-linked-document.png deleted file mode 100644 index 5607c16701fef7d846fcccde7e35c6ce2581a07b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmV;P0b%}$P)KmalGvKoG`1nu2c7h}NQ-aHg&a`s~`))t1z(yPR9c z*{iCCCOiSjxf87D8*F%hCbd=9%w-|mQMfCAs`%W@x0&C}?grLCMNt&3(NAxTvF+Iv z2)OI0EX%%=Bzcdb=&p@%(Q~3whGAH)>&{Knd})IY1|-?GeG)n-@Eqviz*EpsfNjvr zAt8C5AEzwGapp>?PXOCNfu83zS(Z|&3`X11CQZNzH~}Z%IAV-F{VTAlULWr?O(CT$ zl#W@c;19ibK080QL0B)s}3jkN-AA0~6LWu4Y>h71E^Oa6*sGyWG z)N#!N5cd5aQlV=A>K88*LhRw3b3;#BpD>Q&*ET|NRJdH+Sadn$f#PW1ZLbqa4ojTK&JUpip7$lH?*#e-;G^rhztc|jTqDFjodLM=Jnu!?8y$>br_*_xk<&+MI-SDz{ju-+ zKeLErE+gnTPODTZz04w#c}-E&>-9_^a|>837Bhj&Eg&+2%rzh~fXqE0QbHO5h!l{< z03sozQGiGQX&fM8LK+E(7?1@$?j6>0xjbrIrBZ1X3I)*F^$NhH+HY(GRf)4JeLM^H ztWdTi>1vFh2&~#Zq)0Nxb zMdQkK-FIOoHbqUBU4u`l)oO*wWP1NVw2eliE!+WpVvKDc!e~iR;iLk051Wjx+jIp&khI1}b?H0frF;=832>4h#adFPSojihp2t0C9h}tgI zNG7oZ@c!h0N@2JOb5e@>Za`5_Vh7;0&MGRuWszEC0KWi~!v=0P8}(yPt}jJv#+Va! zZ@Ui;27|9@CJ3GpX}=OWmu-|*4(GfTFn=W~BE4Tzgu9Hf{()(C_tp`?J9@pQ)Z9sI z(DDNCL#!diW*lXwiu$glUF1gpRH7(-r`t!B`?6B*LHit%*qt1Z9O)@e+*8$)h2fkc zAk%DjD&d^pDk*!Eofbemb~Z{oxR`c*#+W$S=&PdSxJW&@CRK^Hiy&MKyDc05`~#OD VGebwXB)|Xw002ovPDHLkV1hftLs0+# diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/attachment-detail-linked-document@3x.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/attachment-detail-linked-document@3x.png deleted file mode 100644 index 8695fea996c3ab2566554c0ce0b63defbf53ebfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!&H|6fVg?39a}Z`Uj+kG?z`*>- z)5S5QV$Rz+`~5{6MUL<9;=S&`*~-GbPTBIXy~0EOhPLd3Zqetmtele!r^c+Fy3M`m z!Ue%C?H*3*oN^Htyp$JS+Ee;XraiL!-MhD^HoTvlv+3sSYV*%Kzo(_Q%YPSeSbn)u z_|m&+pLh?vPTTx*anHNE{TBn~+pv6Cbou3#Q$IFnak$P5`mOi#>C>m_t=~F24^HDTQ@lcPPpR5?aCOWtuJyW$aO`d z_bQI94<=|i$+k_^aKw&s!()pcuSp|7m%7`NvP5s946NrKL?uE-Ra+y6oC7^@dyqYp<2% z`@XyVKF^Z5p}M+y$DTcBa;?qG+FDy%UG&0z7-AW8mtNUcYj|qXa>xAK+*UrDO!v1h zYhw%bIR8DhsKF+d1V)cdZ%xy3C_CNEpvPfo%=qgQouj{?`YdS;k z1cvL^ufJQ$Th95UZduT)!npWFCoW9by6{?+RmigjmZN=68n!Q=ES&NxEmcq0aU(F{ zojrSYJ8PL$arhk@_vI#MW_{3Kq2jyDFTEw6aYNR*%c}mnrsaIC4&L{3UA=^@Agqdp?^yd)4dk({S=W z*QpDC81wHE>OaHu`$Wpk9hyf)&lfFUJ7v@U853q`?lfF1+?B(qcxS>%S!1t-KXemL zzWI=%J27X^?$@qIdcrcgX1*6&`?UY8ef__~a>57nFTFap>&UYd9$*o`;OXk;vd$@? F2>^!?`wsvB diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/document-linked.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-document.imageset/document-linked.png deleted file mode 100644 index abb1eba216b52f11d0da9a56c33c4e73abd1097a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 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 diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/attachment-detail-linked-pdf@3x.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/attachment-detail-linked-pdf@3x.png deleted file mode 100644 index 551c950e9d61ecb70ad4ac0f2a686cb613dc4bb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1155 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!&H|6fVg?39a}Z`Uj+kG?z`$ba z>EaktG3V`^js7BzBJK4Yyw@F47YG;#YI&Z!5b61YdC9}54Hu_vHn=P()ZN*7A#3T| zi3%nqEV^5oDo#eqax#etXlJU3xO~2LvpAyc?%v(otIxgtJ;`_4-kasd_xGAx@0R(p zz*B4Lsnu!cUmDzJ*rPMm%YO5VW4-@xvIuWyuvr_T)v9w(hu>-9(kt7%>hkj58CLht zxN-aT;h#S%|2}#0WUr{<*H7LweNQ}JUAPdC7F2B5?&sr^ zqGl@YR9#(dJbBji)ipp-Wf4iwvr_|76imyVCT_YC!{yo)RIDwc>3Mc*z!HV6>HpvT zjo%aN({8=B-}mU!>dN^SFJ8RyZTj@-E3Uu(dinC@ZSVdT&tGU4GgHe+*J8=HoA!5N zs-^{nM?e1ksr$_R%hSDnhyDB=lzckg$fTvrD73}x!m2C#R*3KFT)cSkH1}W)kr#@l zYt;YG3t>2a_?CB@n!=-#^%_bhiYlg_r`PHJT)9&7+YEMg_KmqJ&NBrUp6LikbI~wX znj$H9s)r-ht;MJ~HSvDu@zlF*DInpQ`#$Q=pY`j~TJ889Z$&0yQLpTT)fiOanK3oT z=XD3I{Gy^a1#B+dy2pP)_l2!atgpX+yQ!zYzxwu*Co0}PYfb;=H}W#f_F8G4_}uFE zd6vu#w{PFJu(s~bwKgzlm^o9@UoYH;p`GEB*Gk^s3nr`jH^;@t`&$*Pm)*Mj^Nu7Y z3FZ%e*?W`ZOZ+r=Ys$;bD|UF@WJ(sLfW-EQ4ENeqXom)Y3XF0D_VP^i%m=LMC zRqE25e^nKs*?Sop*lakIr+U?=q#VgEsj0c+b;gy!yUs`XEA!O-!IDxZ^rU{2962C8 zqx<-l%=a6&Zf)K0S1oBBTki;G^@ZZ zBY`ux_w*u#Wwp*>CpN8kJA*-Pm)4iu?nJ5Q7w>pVr~5E$UZ?lQ`E*eBUr7f;&xY>q z?gtB}J`mFQG0$sdbzyCxlJn#>yj!m&d!}ylSaidWW2yCAizz|vfiq9LEV_|9_0O$a zx3b^Gx!a1Gf4^wwx>;=x)6^v=uWao2@R>pE%)b3kK3<>nG)>eD$2a zyJy|l>6`7_d~f5a-vOGX(wav~-ahoWd24y&nK53HM|BW<$OLVnYo$WX7F@;;Mh*ljeNE8LaA=($5}vh}jbP9NP5tf@RC zywznBXYHKmN8BPF%U)nMBIQ9r3?i^N{Nz|HuY8%G>ALUpfub8 zMT#h>_6})5^oSyqh*MAu`e-a!UdPFL9ij++v$Dtb^UT?Nt9z^81)r?#q z=c(#kRY$3Dy(~Xg>jl773VKi&_-0>15esi=;997>pN>CsRvo-P9r13XUpsqgvZSgNfOBu|LPTmLY}r6tkpC_Od;sVJn6UPlqP8v`a`&}}EUdjW zSY_>~t!q8xLWcnEBDTt+;A$m3jeD3nsX?JVrWdMu1AySMg_80;q!`vFFjct&aWR)O zm#3liQ_i;J#@MDUJES~uLC$_Q;hoZ^O{D$?i~^7{x=+gh00000NkvXXu0mjf>!z&- diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/pdf-linked@2x-1.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/pdf-linked@2x-1.png deleted file mode 100644 index 4a9616c5e0b9991d2cbf6ad39a6b05f76938a738..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmV;60(AX}P)00`G*BkdqmTtYi>-+9|eRo|)NP(H}(~hZu0Kgp) zy_fC!z(Vp_Xal%n=Hs#*Wpbia-<PxJouP!$RU6MfOVF6(j^Bqxtwen z?{8{O?7G6fw8()WGS*2K9n@rUvXvNapNotctY!Nv62Qc4blJf;+R+`2bFk=LOVWMo zzB#ys7w9@(pzD}bw91u6W7vNOv##!U^{ZOd_#)#vUZCrEfv)2Px{epkeNr4WE?8-9y6lDQ8%4%+U@J*%<}|f$ zYPi!c8fQbGE)27{BsJ1DlaJkkaXp(=RDa8AXsHL6w{Z_J1#|zHna7d#fQZZ|yJ6pc z9@G^5=kFiChnQD?o`Yw zDb7UNhB_|Q!5W@P%q4O4EsvNvuH3h!+;@x^6p2gyOLHCMn6M#Bue=j|7-vNw(wAJC lyi2vMIBNnGwJ){-`~b;_AaQk&z<2-v002ovPDHLkV1n}LDO3Oe diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/pdf-linked@3x-1.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/pdf-linked@3x-1.png deleted file mode 100644 index 0a9ba845f22009faa4f209022e4590483e082856..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 951 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!&H|6fVg?39a}Z`Uj+kG?z`&g8 z>EaktG3V`E{TyjSk@owuwS2X8?=Xd%1kAd0DbFAyA!kp;C6kpq_T(gJ6ln3rW*!V+ zTYT_>pL2fE*LB5fiy!U&Q`7nQyJz6K-oHiPzyAF5e3EvsyUUYZ*>iO_D=gAZ+b5r7 zKJV=&P61`5T>=viE8bhfw$NnBmEKu4#`P`l1v^fx)U5uzUe#H8Q+k%J)Bmd5kxQ>B zefb>_lzr-gDFlzom`K|eu?Z~Wt=weSx;ol-o?6KTlfA4#Z7aiimwTMPQ2eGxN7FJaxuMbG3`}0i=O7~iI?43VVN{- z%EEsFX&d#rown@J*On1;Oq!;(AbeY)InuAM%m&EK}M3-0~Yb*|ao%jB8V zpDI`0H?<3u=dM**{M6mirsB*w-@0gSrMzRxO8I-A)vUX`ck6RALCKdP8xwEp>|dBX z&Ft$JaZ|pp+cLE`d&TePX!DF$zU_Nv>REe`->vlT=gw}Ky3pR`i_#_|mt5}(>2+qd xosn|_ZhicEL8KmcL5^VHn51nh7arSwciX(LW$~4S|GpLoRJ~t4+;` z%e#r&yNJ$Bwd&Z?V!7S&4sAk%EfGOs{Q>>rdAqyrQUk9$rRWQ;}&P0J-|ViZEANTD!Vrd(#vH4mjF^ih!OxfbzgG;N}O}2!+v8tNJjT%##qgGr9}mW z5LM&3CkLSFdT4BgmH}M%$yGV$63!S47*0PNHX4niAs`hR0^?q?5O7Byz(Tmx;;L)(^|#DO`+3hyIYkbMEKKdJx#002ov JPDHLkV1gU8=EML1 diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/attachment-detail-linked-url@2x.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/attachment-detail-linked-url@2x.png deleted file mode 100644 index a0445bd783e1327bb90415716f6f45abf3326021..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 972 zcmV;-12g=IP)AaHSUu@w(Zo=T+@05OM$BC9A$O5f;d5^<6$kv=Id91cGS zg+hUjjt)B=teaA)ghHXPo6F@s2rU%?y|Us&aRm7s3DH)CWgk9_)&jw{gVw9Z*n&*)UaHm7P~B@wD= zTRCurh{!Wi!f1ulotNlJ47LSqpUQ)$MyZNa;LxGB-YyjBMw_7T(-RD7g zupO8BYMYi`K=fKCe(d~F?`yTwVwpe^ck6m*RXWzfS%gU}6G)NMi`(Ab#@gB%Ha9mb z+J}dS5sgMMFfd^FEF(M4`7wYc0IwNitFqmaU6j_2J_^gr%Sa}ZRpJP0qrPl5Th&Kx zW_AGX(lngudmD7ZvbA3D{%$DG+il5L@X97+sU?*>;OFH zocA!s#u}cYwBu0(B{IDPivT7WV-;_ab55y7QFuaQDP@Uz?5J?g-_jp}W~nnCk59k? zGMS7_FM9Jg^iFD=r9<#1iii|guN|#P%TF?zwe!-dxYliFxj^B_g2suHKG?)7#@M8=o6)3fO?I{jM76VKl*QF)w@9ZL us@S%R3dbq+UE zdyTo|9Fdmkp@h&wA1xB0mo}&7x`H(nyou>S(t|b@u|lOrJR~V%jem>iYWaX&hNe7o43h;VHk#Cm;xnag_TGoIskkM;38jaM^*s*5|789 zWHT}aO(YV%06NaBtHI()JRbkat;b=RnJlJ%I;3WfMCC9ysj8~F(%jtqaamazB9Tab zhxM9BCX?9Q+{Enc?Bmtd)xYGol4g!WKdjD~BxYr0C5x#*T978BjneE|XTs_W%1p+Y z;^Jao%A^U(ndweZQIRjZun!w12Ut+eME$rs*xJIzw_js-cE)@iYi>dL7hfS%T6$!& zyMeXeKF99z)S*pvJ1Vb!hfu6MWwWujiT>Ze#MHk}&DZU3yoZ7Jzd?DlaOQ4b8LEm& z&^fiKsA8Hn%Ts2XiYg{S=hRk6_!3kVQ*GN{{wGbq44dUCB)4Cr322Afp8xl>)Cwz%db-N-9^2}*OOR~yZl88)^ynltSHre1+nkGc2fP zSWwNdpqgPpHN%2xh6U9O3#u6wR5L87W>`?ou%Mb@K{dmIYR1<;#p&#S9;BE~%=kd< zv0ZS6YK8^XjISZD(%*9-Afe^Pz|bo#emFxl!-8st1=S1-su>nkGdWlJd?FSNp{6Q= ziqbGDN-}d}eS074Tl;vqn#AtjfsURJ0H_0S#myj)f?lkMpz%`F6f?Wsp~$U(DeAKq zdstadI@-Qf8^dQGmEyy9&b#`H$K&(>0y@UrYyu@{$+-|(FP}>Zl?x<39V_em_~Y*# zZ0{VT`TXQ+iIzSFM$o$IDBf;}Ar=Ywuy%(o#ekS{9^yWXwXhAai%=@NJfSv)$W zy~*h4D4fo7@HuGrDK8pAiA3T@tEH!>=XN$nX9-naTkw5efvd=@O3ioO-Q5}Dp42CR zTY=eavMphza|s+rS(Ta(9hOBW_6gv6Pz8N>OgE{|(cDRgPM@@#3hMUVv{R!H;;F3y zyRx&hV}I+ueFzgupF#T>xlcK#K*qhYO1`fKPTX=iw|w?y zIP&&s_AO8uilceZE~2_K^hyTmv@=8uT028I__Xl!88|`VE`T30#MJFGkb>e+fE#jS z!flD9vgowCei}XlE2xE>@2)G$AC;`X|7iCK;C~vb878TEA;|y$002ovPDHLkV1iNT B^&S8K diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/web-page-linked-1.png b/Zotero/Assets/Images.xcassets/Attachments/detail-linked-url.imageset/web-page-linked-1.png deleted file mode 100644 index f60cc037b143fea50d704b0220db34ff8f974438..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 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 Ah5!Hn diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/attachment-detail-pdf@2x.png b/Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/attachment-detail-pdf@2x.png deleted file mode 100644 index 19dbda711bfd33d63ad97bd420ac7c714ac86a61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_&H|6fVg?2=RS;(M3{v^Pz`&U6 z>EalY(fD@eM!yyViR1f?bz%-3XqcTCD1PV0oOh}Z1Zx_kV|rIN@3wQQ?2Il+zN9y6 zf`IvSJ{6-Zi-UI>Zhd?AdUiIk}#TrrVtN)Z7~2WqVVFbK-*czm3m-?#rFz^3z4LOG(>P z!tr|PT9rhWlR-jW6LeG_vYZSM3Yx&9qJCa|`TN6Dew=)G_-_B(vsO0*+7k1tW3Q_$ zjR^_8y4&xN+KrFVll;mz*BAa<-nus~E;nb5Uyzq)?xfx)MxH-dtoM0ey7=18CN(na zssPKuGleo)-`9P z2Nxf&UORc~LcgomTGb^>A_Qc`T-sSLCOYC|&i((nK47}e={)w;*P05|JzV5%-xW7z TYzY4jj12})S3j3^P6S28ZanpZjY}T6!le*67mvWK(z4wngBa_1ts9l@haGYcOt= zb+YJMw8ATI%ZUYvk}GaZ%HMvw{e+F<5X#Q=OLn zss-^=*h4SmM~Rd^uFL;l8OrXvrMP--ruND5pP9XG$2BR0px{O#lA>w-=sm!I{9Qto*oe(bV81MUVIY|Nnpf_y7Ou~=V}MV8{zhA`jSHw}%Aj0`0Kj(0WJ9$W(S0E4HipUXO@geCwP C0$`2+ diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/pdf@2x-1.png b/Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/pdf@2x-1.png deleted file mode 100644 index aa0ba81be70adfddd8d2a18cc918945883fa2030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_&H|6fVg?2=RS;(M3{v^Pz`&^D z>EalY(fD@OUfx3nA}!}NLfIBLPATy@z#`c+Z(f^Z#*3GdO`J0t`h+eTFsQn5ZJeUy zvTf>wIi>NFmCm30T{3B|J+uFst?u`4$yG2~NF={o80^oMW7Q&a;98V5zpTWZ1%_#t zC%e2Z)oz-c;wcci{-CE3=e%TEv!)X;Y`Ak;pZhP}>?+f(QBd@5ORtfgFaB)V;GxIW$ zHMX-W!jA_TEoGT~!hL?io6FtNwZZ-YOAWx>*?I186I{AFYXWRcKw~8Bhzy>telF{r G5}E)%B$JN- diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/pdf@3x-1.png b/Zotero/Assets/Images.xcassets/Attachments/detail-pdf.imageset/pdf@3x-1.png deleted file mode 100644 index 9e92481e4eb799e7e7ad3b424868ae2f463c6d6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!&H|6fVg?39a}Z`Uj+kG?z`(e~ z)5S5QV$R#U8+{KuNH{$FFCZkOy&=JSJbhfZ6Vy5saEw6$N>YCFC4` zpYq^d_M~HdpI`3RnC{}$CHZvD`sXtH3;G2Mrv_E2=_fze_i|XP^vLG<9{+h;(k^H; zcIp0{a!Intwe@x7%tO=a-wNMq@y&X>;PtgymaSzMqNRX@X>XKu#)TD4d4~d6|8h8r zektA@$olt|PKe|F{Ol0N-?zC;ZDnNbbt^7zw%)VfdPY&-xwwC6M-;0C3qO_JzOws! zxl{XWla)<<*(R^@o|lO4f5ORAy7NG?*^0MM?=RS=U$0&g)jV12#g{slw|YNsS+UN4 zuf0n6)HWfJb-PsKADuq(E$tv@tFVY)fQ92j78qk!{+sDPBHqM5Z8^lr6@HgL&-+Q- yzJw+qM_psif&v;bV$RkFgsP|m-Lk2pf>HGB4mc47jP!z?F;?zNlbSgRt4sPPof?%6wDA;Ui);eVt z{4+#w?qJ(BaVtU*`r#BeHx&mLp&%3~4z4ZtQiD;`CdOFsz)SAU$NRl=-z5ZluYjg$ z1puc$8#NR~xu+mRuxvJ~Mj{bkNR!C~hG9_1z#tv`f{~)ps3i|tR&%59AbmUvJVHUHQcwTz9ec`oo%x9;t>2!)(t;TV& zSVSt7;svibEL|VEUVW?8LZ{O)^K?3mTrRivSyy{#2kZCykYyS1cpRhA2#rRA?~$`* zdG1njme1!Q2m*uJ?KbC&ju++GAt{+mqFSwDFc@%7PVuvk;c)nOU`792JL%QQfh~|g zv)PQ}SS-e6B`w2Nfb&jtBWe&TC6$q!5}b0nzD}M?I`77My>4FnvrBbdzjZjjY6rCg yEGys;#1cjE%j1{EHSi7q{l{)9{#D$a0DJ=@K8<{`-Xx9y0000L`rI#KFCgd#%mB{RA4RtjjHbwqQPeFieIQwcp(~WX7^8yVn1Gr2D?`<6?m8bYH0s0?i$)zji{_2 z1ojK20!QQzhW7LMbwfKfvu0>}&7hh8u>4-M7UAv(NfQ5t z%N!maesWDXs`Vx3{-+e0)sj=jXVbc6|+YQyhS= z<>h7d+%$r(w#tuk@OwMj;;_@y>vhWIa^eVvhlgonV?*^aK0dD6zRjZbhPYD2 zTsy%%A@JzvNEH`}L@1F+h$E<0tF*trFOG;VM6Ir_>egI4JQv8*k{TH|nM~^bnKC;& zOG`^jq$rA-{!w~(x?16Rl3{U(m{#2B=_ze)Zc-+b5$CwaQRQds;JH9fD43So$T1fe z7nIFr#Xa=VK4XWTNirNAL=IrxF%YTkTDIth~jcd5a)0UsHgJ}et z_mpmd;*F$%2%;1qTc*=#oi~WXJ)Wl8&9oJsuR+u^)HT#M)HzH;vqDb|advAU^-7Y# z&IH>n)Hev(+uJkjhd%^w)$GzUSrh}u+Oo6Rc7iHUQIuWBPq$~?=>rh(7!mF0|F3GY zET`OfF@N2%TaY^md@`;_5SdZy&}}M}itx#V-0~+$(r0|t>Y6fRGSA$4bE#DNIW;wf o?;UZsd{`hp{Cea&pfeEBKczrWy4|bHNB{r;07*qoM6N<$g2YMFYXATM diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/attachment-detail-webpage-snapshot@3x.png b/Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/attachment-detail-webpage-snapshot@3x.png deleted file mode 100644 index 3850b39291eb03462f35b2084de955de3d186f5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1521 zcmVMGwVR1~0ZZ zn~Rt2Wd&~{EmV*q1zRfOp_jTB7r{&PQpAe{TTko7S}7_N3>IZu3D#EKidehL_c_mf zGnq*y=BaOH-v@$|=Wix2pZUE%^D+r(G#ZUYqX{TE{B1>}(KaIbn20L$$#!I)h~^@Z z$kS9oOlUM3eMm%Yw^mhu@iY>NJaMaWu9=xyrgz#*XO4u-X3i)tFRyQGZ2X|OxR~?j6?rma5vnuOoq~b_PjR^(Vl)|`g-RymaKc}N_zoN7CU)l5g# zQ-+E%0k%;lBFbbji4|5RBFY5VMp=;XBvh0smi?dDvj|LzNvzQMzkgT++CkZ~lRpEa zG^;)|x3Vg2Ox~Th(#G5`dNZ49D1|4X=rhxmq0dZ;v6Z3EwBuCfXFLhT03-_JgOUga zAW4eLnWhyN=6Hnj20>x zEmSgEsARNI$!MXH(LyDog-S*Xm5iqk>28XJg$0_LnxehEJvAzn%p+c67zW?oCZge3 zEXHmVS0+P8M@QL1VVQ0`AfidbFeXWr3`J(*;d34uhOwlCP&9K+VPPS4c6L&Abv4^o zmDAHx+TGn{iGXdBFO_KWVl#)#+S*#BWs-T~QBTxY;K8j6wfC9GOg~XsS!t=QrzZd5 zz%%J@@yD_I>~B?-^$tE2GIM%*ni7eGr3~VFdU}##OG`^F&-Fai#^K>%l1$)K=7bh% z!=7=OlJO`%@X0;tZ{j-G*w~=0tu6MjgTVxkhK2^|udLLSk_;elX=#ZyT{pPs<>h5+ zZ*OOEWf7<*50P_ob17wtAP(`^PsBcQlS`Qsfyq!vSzWb$DFRcl*49?4sj0av+u7M+ znTbg`hwq1M1x};6R{|jv%~zC(?`3v%bx}u0M^bEET^%c5TwJ92`FT1yIbr44A15H& z<{yYAFE&}o?CXzBXfF1d$V{iJt)ZbI>g(&HiHQl?-`{6t zh(kOF$HDQk!S_PNX%PguWoAXi#aG8o-G|kF{KncYF7Ph!-zIvlZ&8$@A596~Pi5GK>#UxSXu7uV(`i zr1kdpy4D&Z5zj%Nob8fcAf`=xQG?7m=J@#dWv04;|09lH%iE80RRXa%f@a#>+w{ujer(qcQ+4o5Ws*)|AD)Ae^ z@p$}~a5#*6)!$K|I#=aMEEXG9=0}&~@%RtnaQJsqsz2^Xy8zu)KV+&<8I4ABa}d!> Xrg0D4gJQ&H00000NkvXXu0mjfkFwL- diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/web-page-snapshot-1.png b/Zotero/Assets/Images.xcassets/Attachments/detail-webpage-snapshot.imageset/web-page-snapshot-1.png deleted file mode 100644 index d1f2f6dd55f03c4cc1b8746834d23fe264daada9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 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 literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub.png b/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd10527a512062921430453dc37c6313a91da0c GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{&7zi$B+ufx04t09WoGbh&J;~TlS6l4Re4+ z+K*N)n}f<8KNy5qW*PKn%>Ke`P^u9#nX7K$O?8u{u^F3Mb41cApH;oR`&F-;{UCSG zM>(e%O$SzeyjIojP_;`NWl8lWQk=|Jm|seww=7iy{io zowjOzn{xAIO+}1@yt2Urizm|+_PuQiS~acN`v-eQ&!*TVr+jBvSKoAL!gN4 y)@!qE&WlG*^L13%u+rdIkob{pRvBw!ulZYiobarWBTOAMZ_elF{r5}E)T33N~Z literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@2x-1.png b/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@2x-1.png new file mode 100644 index 0000000000000000000000000000000000000000..98183b6e633d4dc4287ff8745fd2a055b8ceb535 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=%=LSWb0b zV^z?s)Kf}Y99+Z99JBo7hIhZrr%#am$!h;agI!{cW4nymg@$v=4_HJjFBIsMzO-Zd z^j-V^Z{M@5p*vJcnC393AK-lPbk&bWF^=pV=0%Z{cgHO3Iw1GvLraqDpT#1KbH3`` zh_2hUWK~G%V$CU*2V5824l-2P%(QxU$3zKdK~CwEt=7tk7S9}Jhc$mlvERe+Fxyio UTHwf3U_dc=y85}Sb4q9e07@y3hX4Qo literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@2x.png b/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5c2692ce673c677e67fea15c9ac1108d1950b7 GIT binary patch literal 441 zcmV;q0Y?6bP)tr-6ce(C<+oB<7D-UnURFT`4>1FEX}Fal?YWm%3`?{vWP zyk!`MP!z>I<+g1*rfE7b5*s~0A~a3=pyw>h;ylk|7zws(5IZq%Ix))TjIG$dNhG2y j%Ud+&3^ literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@3x-1.png b/Zotero/Assets/Images.xcassets/Attachments/list-epub.imageset/list-epub@3x-1.png new file mode 100644 index 0000000000000000000000000000000000000000..8b26c08d9b943c04ff54b4e9d2698754782870b6 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oVGw3ym^DWND9BhG zJ0H4ipNILgZOJos zm#w-oapC(53-b>~tPH-sX_}zKj2jUZJQE@g$$B|86}5TH(0BVjSxI`nV9n0YPtV_+ z*sgOrZina39qK&UcFWG~jL&Vl%=71Y{LYub<`Nq__NyJ9``p|Aifqu?2^0Jz&DPWf ze7R|Sc-cpRkUDSP#QE%t6sj0GU76Z1vzzbzlRR_oBEbVXpTb;D%zCkTg>R1HmIciM zilzOJ4^CQlL`T+c%gp$*6=(dH{tqkB;a<2>KgoT5Nv6@SMGX-g3k?}F@^rXa&q*k5 z5OA8D@m>Aa&?kj!*p27`$j1Dt6d`(T37p?zkhU#9JFk>)=TX8gm( zVA;D3mv~k+?9sDU)G2zlbb;Y@wF++^okz0|yX-nY_2FYJ&MA|-BU}RR3fo$V+&Sr zKX`u3-yQR04(k(x*=O}ONOCFqH8xuGncrBm{PN1Rvy?;FV*aS=)v$;%wCV&NiJo>g zp!TFe4`T>R%;|vC>=isKtaxXiOevcD<@x8I#n&n%RsO54PnBlQ@_Wl_vOuk3-uIWk z_j%V^T3>Z@*nHDurK;fm%-WWjpLT~Sx+wknyKiRAvNtMh=W==2lS=;uWbB*sQRlRm z@w~?tFL#`Cy7Ome=lfmZ8}i@nk6Y+d!cn-GwV*gAa>bjTKsKwE9hqy^9zRpNG55B= z=lpE(k&JEG$B%|(DEPohmP zq-E}=fT^w>N|O!etb1DUsLd#K;qwFA)OR>CzIKxHSTI?qL_*~~kMqn6Q;$EBz0adp a&!BU$H(qt&{u97BW$<+Mb6Mw<&;$U*o#^`j literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Item types/dataset.imageset/28_dark_dataset.png b/Zotero/Assets/Images.xcassets/Item types/dataset.imageset/28_dark_dataset.png deleted file mode 100644 index f34b4b145f39b0b861c55a2d09c783e95be8deb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zoCO|{#S9F5he4R}c>anMprB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt&CnE{-7{oo}ZdyyBn{&w=iaTm=V?gDO5QZ?w0j zuaJLi70!8cnX3GX-l(je#I>`pq(48O=B4>t^Vp9Ym$P~lW3)9M-eoIm%fBiq7M{$b lyX~y`)F?mKMC@5Lt z8c`CQpH@mmtT}V`<;yxP|;~m7srr{#<#OJ@-`a?xb}A} z)iCbe+?@TsVY%nbjgwBTEK(8__}uqji^XWyarXH-HZyKsW-5Led*GhOgmV$uZ(|Ry zJL11VcFB~gYa1=!p5>XpfaN7n=0)s`ciZc)ZJc$y^k2olJ)BkkEp9(pR6X3AO728X z+2;2p%=x+RhCr{MFWW4i>piwPq^{v;CA4I-MYrDBAa}{<3t6tR^Y?*_>ieZ2`xPXo z>}d6>x#SMZ;y1H7LALDK?|AF}l6=nj4-#%|KI_(05~rnN`TG068A(8IF?hQAxvXanMprB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt(;CE{-7{oo}ZZay2MOw9dbn zI_K`JT`l1pR)J4M@2SqZHOIDZt<$A|U+g!xpLDjX;CB&CZc&-Lg4e;nNK}-mVQbl> z2@^{mO+A%AL#{1%ozl(Ys`@_7Q6}3Ke&5%1L}IcyQ^Pf@YR#4cYwye)=La#4oo|AE yMC@5Lt z8c`CQpH@mmtT}V`<;yxP|fJNEc12me@`sV`L@$mZ2kA!3%* zzYnZuUh|6zzD3CnB|IH{&lRk;I=-EsWb#Zp#i8VL{)T \ No newline at end of file diff --git a/Zotero/Assets/Images.xcassets/Item types/dataset.imageset/dataset.svg b/Zotero/Assets/Images.xcassets/Item types/dataset.imageset/dataset.svg new file mode 100644 index 000000000..007f389f5 --- /dev/null +++ b/Zotero/Assets/Images.xcassets/Item types/dataset.imageset/dataset.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/Contents.json b/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/Contents.json similarity index 74% rename from Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/Contents.json rename to Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/Contents.json index ea22f237e..d7cdfd014 100644 --- a/Zotero/Assets/Images.xcassets/Attachments/detail-document.imageset/Contents.json +++ b/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "attachment-detail-document.png", + "filename" : "epub-linked.png", "idiom" : "universal", "scale" : "1x" }, @@ -12,12 +12,12 @@ "value" : "dark" } ], - "filename" : "document-1.png", + "filename" : "epub-linked-1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "attachment-detail-document@2x.png", + "filename" : "epub-linked@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -28,12 +28,12 @@ "value" : "dark" } ], - "filename" : "document@2x-1.png", + "filename" : "epub-linked@2x-1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "attachment-detail-document@3x.png", + "filename" : "epub-linked@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -44,7 +44,7 @@ "value" : "dark" } ], - "filename" : "document@3x-1.png", + "filename" : "epub-linked@3x-1.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked-1.png b/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked-1.png new file mode 100644 index 0000000000000000000000000000000000000000..103515413f5faa57f213a35d8434b3ccbe1ff901 GIT binary patch literal 1110 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBDAAG{;hE;^%b*2hb1<+n z3NbJPS&Tr)z$nE4G7ZRL@M4sPvx68lplX;H7}_%#SfFa6fHVkr05M1pgl1mAh%j*h z6I`{-0%imoq-}cp%!NRTv%n*=n1O*?7=#%aX3dcRniiQE5>XQ2>tmIipR1RclAn~S zSCLx)(#2p?VFhI7rj{fsROII56h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8 zs6w~6GOr}DLN~8i8Da>`9GBGMMg;2dDHYMT=OV1)~QYLS+^XK!-25Wb8Za-d`GuM3Qrv~2chw)GTTzIlJ zMXNsU(iNensyz1&?+Lv5BR7M;Ms;7MXSGc1Bq-;B308_cphXcr#RGx^R{)%1#A zlek|s-g9i@tT@@OyBH&FsXKWZRc0R3v<6VUN=|c2n=67 zEkSsN?GJ{JA6pKH&tY@x+-s@6&FHoA2hKfq@t(|+?g;q!Y~cOZ;pM~UcCzze?k4lK zOF#0|`Q`M99lWevvO%y|Ec4XfE+PGdS9aK6k@~n}MljKq z&IqT1&d?YgfU!V(of*B_cxNS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lxRtf@J#ddWzYh$IT%~a zDsl@zx)^LKtboki)RIJnirk#MVyg;UC9n!BAR8pCucQE0Qj%?}6yY17;GAESs$iyP zpl6_D$EBd4U{jQmW)z9|8>y;bpKhp88yV>W zRp=I1=9MH?=;jqGLkxkLMfuL^+7WFhI$72aI=A0Z9t+{{zaLoK$}74+Zoz`RicPN?Xl4ZS&rlwh)=ZwQn)8KI`KtF(RX zR4aoGAK6QoJ3CEdFHbCU;aO0Yd*g&hqh`&%Y4eNAWNNm(KGOGR$?LyW`}cjncX#J0 zR$KmAe#`w6f?rl|xPH>e?WYDu)A@aFO*U=^Y+KUR`}0qJp3h+UY2(g^2fvs+l3euV z#1F>06=uo1&BDri&!*py2$&w_tuRD_KDp6y-y2cqW0PP=rCNhS9E z51mQp<-T0p%r)=!MaCZzkGcJ?Uvo2vx+s4oUeiiFjwzzuzv&iVKmtpE>y~K@tY;X` z&0Tk}`SD%jLY>)u+xgy4+vq9P_FaFIeDEjzEB^OSzn-v2bI!?kZ$x;j*iWvURdxB^ z>{%x1t73n1lrb1TzPIS0UXw0Y*s|5JEXLE9x;DqMM2oEP2~UqV^8R<|#Fu4l2eUWiY{Zf6Y^@2iKpyaMl(ZZs%_6fNvd zSo$=(p+Ni~8_U8;+?)TiYp;x4^+ENTpXPmy{Xg`d_pkYUzxP+M{k|=N59}7O7&-R% zN(6WYy#AITwu5C+$nsK#;D67{!e=ddGh4c1MSSYl8z;VH+kCu?Ny8Td)o6apE~i>P2j1rNc`~&3MS!y`WcS2=q+6|FQrrH z{9%&@+mG`Pf1ey>wmq|c;WYl%r$vm5Olpp`3YzjR`Mt^U@qguNg#?>R3%A%X`uzEJ zR&DJy8MCj}`;=C7WG8Z+uAIMUqVYEN_lZ77+y5<_k>^@FUwvYl|H~+^bJ|VM61J>* zrNzZ&Agh?npPh0@pEo^#y<=&Tjn9^Qmjb73Iw4yxn>zXQ^n1@AXKZ>e>v%a#andrS zHHAjCRcg;xmwYh%cS%#k(Rh}iXZNy=M@${|9bV6TIK#2tYX*utsu_PdBT`)sf4iC$LC>VdcUbkeidWrnxrOqrxD z>R8M?!6>UO*JAy(qkCO%rYse&v&rC-V+`5FtGQnj7zX-PQ{pTi?vc6QDbn73Bx$bU zI+H7zD}Vc4Z`P=rAM2K<%J9_m+^am{39jwEO6mojJepeDjT$WUCs>(G>FS#GHdNMW lmvTR&`24mn$y!R^`7K>-e?Ksm{st-lJzf1=);T3K0RV_(R(${f literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@2x.png b/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ce61d2acc20df80782cd75aaa17dfd0f826b47af GIT binary patch literal 1139 zcmV-(1dRKMP)nki0SuqH;pl5H!CKt?gz`vynSzWzIiimhS^au5tx~o zF`b^Cnp7%PIm;npvDk04!)LKr7RB1AgcQ79Zxa$LyFoxldpkQjePVPqLJH`$C#aA$ zH#hfGS69d7@aiO`_)rha5;iwC*}}rYB#kB%MG?#sQUJO8lqQnP75Fw}GF1c#${n&L zxU;k45ThqJ2X8Q(!CkUMb z@?3PifLjq{h$N+{qN}E9{!J{Mv761Er~bK%FLbOYrCcNyjUQMxaO; z*U!%^n@|>dxkDi+cPIqq4uzoHad&ny+1_Df3%B2cOD!MM9v$M?@DruUr)Rl1Rg(fG z$jBWELAgUAD0e6X&qyO^T)LlATwEN^&(Hr3BF|9N zCcM()Y0S&Zv$nRjMrUVdmq{pim5YAtqcSs-2z1Ua&TR$~W#i-Hz4)I#!4>_~>ma!T z&qPK?M~#qKVb{&sTkUrHv{XAmf*i@`sO$xkh9$Gv?BNS&NDX@V2kO&u!^xS-2zpL5 z(t#&(cz9Tg=&6-rCyF2;kz`$6ouR6#O6<^V!8+yV3u9wrQ|$b5pQo>{?{zvu=*}ZC z5+OABffPH@Q53`M8$R-t^1)y*u(h=n5MzhMIGk8U9gURYv@j58glgXe^&#nnJn=QiUGxi`4 zv4ICebg-+d>knV%Jq6nq1PXsTTZ)Y6%y~StzG=ptM?J?Pv|Ec0`S zA{`R|AM#%E5EJd9PeT9z002ovPDHLk FV1gL12^9bU literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@3x-1.png b/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@3x-1.png new file mode 100644 index 0000000000000000000000000000000000000000..276814116c67a120c93275da5b494c27d5b23577 GIT binary patch literal 2131 zcmY*ad0bOh7QP7)Lzn;(9F;YMf+!^k3Tk2qs~C_aEV3E}G=YFwAVET;Kqv@tDKG(Azj(PXQ%FjEj#80B7^GRZ%OTJ$64Wzy|=a6#yAo04zdO#xwv) zL;#*e0zfVSU=6>b)1LwzWHCcMSw22sBZQG)1xz1kKnMms0A>i(ZV&=qFr&{n0A{_c zfdi1k28d-%IF!|k28FujQ`V5dzBtO@pVdJ!jW1YT<{lt(gOV1X7A62d8>0>wD63ct zxrMQVLWQ9|-sJr}4nFDtFPe!Laro*gKoOB4$YBbjup-Vuu7E6Z#C=qdA*`keIP6D> zFy0Xt>O;r6@e-NXEqEfHh@+ygSS%&+0E-;p?y+1B?HqBjLLr|_AS5Rzxhbj0D*jXtkW z_Y|^OUpjFG%VR+U64WOIJ3Nu_*&8aQs9CaKBAW?yR{K-!C?A#o$1V4v5Y)~8=Q5ur z{m4S2Qc)Db=g&q(t=s!}B>*dwp6)I|BG~Vhj>lK;Hn=`!VT7vVN6ZLk=-d5m^tZ>J zwM*Epzw3fUW45_)G$~Y}i?vBRXA6=U zPZ~wGIxj5`{;J&ZczU$7*En5#*!qDe2|e; z<88uQrwn#~piGG~#1H-)Q+mpJf9UNJ-=)nK7CLjh*Zf3xZ0zD({@KfNjq4KPUa}sU z_kP%|+(bf8_gFBIXpg)@UI3+|4IZAd6S1}Hn&;o{M7XYI|Dsw?S141@%eIKwaE@lZ z0GSkGY0rI+sXJ-EezCld_fVDRl*(U{ZrqkT?N>ZEKO9vTdA7dW$@zsYy3eUt*u^Lv zvmSEGrr&muXi5wm9>$y86us(y(SP*XcOGMBN_NzeW@@bdnH~*)eQtBS6&-WT$xgC( zztjO!C%sl(;=J_Rtuig;)hB-5vb002enedKi}hA?r|suhaEG%C7))JtW!Pp(S*S{? zr5qe+BE9>Qi>EsmZ4mL^j;-&=e?E>FJ|w^-A#t8_fA>3HX>+v7V6oH4OP zNo3MYjh20ha|^^F485_T3~?+RZKcH5eNh|Cdrj@9i* zxZ>H6+u!91=a}?j-C!y`iDK}4-R0_kESSIK&8$pIP0iYt7Z#@~PSpyEJ>fwC&tc$Y z3oJ1II!3q_`AZ=pyan9-=HK+es}*jC;pHI|$$*7&vybQ)dBM?ss`xHe?(L}AO1C9KBK#opNr-5(S)*b0>zJvK@inZL#xjUVf zH@by)Z-0Yk8&3HedEX^;9?~mXd3CWIiK`(y9vf2Xxn3J)sv1I%*!Yb<@!ZoK6h1aB zXoNo?=LrY0aakMkzv}O5HGVecF?CPgqd7}TTFTaI7@n-TW_>eo(0nd1YdD}cVd;mO z@2a#(*AHcG=%iN-!=Hv1=;~?R>(HZzYq~wZlI~ykftD8^vXmXe@~x&YwbYPh4(2WO}ey$v8Jj zJaFT=@2a?U;bC=|Qn6{BT+o~5NWea#jw8k0xO&J4ePM%q7P)CDWFwZGtBHbHG0p6c#7 zz;KoS_E?gBoz^xWPq9A1$n=&4c2)A*M^@2Tf*Vf_PDZu9XY3Ybib@7tQmoB^Ue51U zzj`fbUY&0I^&9bG*bgI4beGKvI2+vak3YcX!eBAJ4>$4DkI4*DyF~6=Pfa>)W zE76Aoe%&9JaN@kTf~?URt;qj$f7m%~{52hhL{?Zhd5lLhmug>WJHL6b4}bEHeJl1U VTb$bD_3B@x=MG=@Gp>=De*wI*YV`mB literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@3x.png b/Zotero/Assets/Images.xcassets/Item types/epub-linked.imageset/epub-linked@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2a8fd25e3c6dd796a8906c8d754d25d26b8d1e16 GIT binary patch literal 1621 zcma)7dpHvc6rVi98Y}O|Qi)b6W@PTTV=7|CENSz$ma&ZD61|D004ltr_s(LcKHbz zDN)wEtk5c=ok6GFf&l=z-9I4)xRNDRSSvB>@1* zIa@T!<%Za&Y=_gnu6wwSELBTo22RPl^w4$xA4bG^?neQ+5Qc0sedTEEMb~iRC zhhT}TzObi)=Q8_}>%rW?YbMG#d4oMV_0U$u5sA0q%h^lph^8i$uO2=5ojH)W%{!Zz z4_jdijWbQ{^J0l{R(VC*DMiPacF4}ZG-cDTA+(M`p@`)_8uMCPTS2LM+CeSd-FBAr zogn!=*M0r`CV`VNDgiYd&Z(f^q?gVu$Zp&4%#ZKJ z%WXR-qJpE*6o3Cvc3F+QNY?!PEgVu3&KYZ7e_ZET&?E8fr$pIP;^MH;=dz>>k(_coJeJD z+4xAO&@xEB@*5EK$$!0H-1vXnw&#av?u1#ppL+k&$_lN%smY@BL;n7Z5H7!*777DY44iX)Gn}Ik4+?Qtdkp{d8M*y_-aRKXQ|7+= zWdhb%(^XHsed6;Eq0k&07#s}S|40!GSH4B^XlQ8Q4G+sBkw~>Wk7KMhs-r3m`2}-T zmC%akaXnY(>44F(et1SxI+}y-EIf>C|v_cBckflG3xIoxzdY*?9Z)|LgqEIMXB~S|F zh21IP0WdwV#r?wsgxVzpE+@MRj&`nPR8iHCFim->-p}~>sDLkp0LHT2sKU#buC6Xp zT>t{{F@#2|1zDCuh^+ehb;9G_&n}*3xeEQ;Qj&bW6}$^CWar_YAD=HWdL4hl#S(AL zx|U#~6hLc3A5hFTBxWu}!vaV*T7p8{rPSj<#IxP-rBO=Ht$m>~?DFW{IQxqOQs%}$ z18-8;l`Eg8Jp|fc&remn(8F|?EjRS__2GPxyJnDZdw+O`q@Q#E>r>yM$VWYia6-9> zd+1QQV>ScTIO}xx?~m7^fx{(}jBSJ_d~vvHc4)#J%nbQ06WA}#Bv!UzA_JV7*@va{ zr6e?X3khr-Nj@t>Wb017E=P>_zew}%C^oUrzwS=1!4tVkn*|ysa&uy^kkvCIshLthSvOS$w0hK4CUZhY~3#(6}2dh&e+YJaPiH6Wp?doxr54sC7(o z+)`t~LzCC+<- V-U>3hk|_ED09zXjnr-D3`ww3D>lXk3 literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/Contents.json b/Zotero/Assets/Images.xcassets/Item types/epub.imageset/Contents.json similarity index 73% rename from Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/Contents.json rename to Zotero/Assets/Images.xcassets/Item types/epub.imageset/Contents.json index 3ad81037f..7072469aa 100644 --- a/Zotero/Assets/Images.xcassets/Attachments/detail-linked-pdf.imageset/Contents.json +++ b/Zotero/Assets/Images.xcassets/Item types/epub.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "attachment-detail-linked-pdf.png", + "filename" : "epub.png", "idiom" : "universal", "scale" : "1x" }, @@ -12,12 +12,12 @@ "value" : "dark" } ], - "filename" : "pdf-linked-1.png", + "filename" : "epub-1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "attachment-detail-linked-pdf@2x.png", + "filename" : "epub@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -28,12 +28,12 @@ "value" : "dark" } ], - "filename" : "pdf-linked@2x-1.png", + "filename" : "epub@2x-1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "attachment-detail-linked-pdf@3x.png", + "filename" : "epub@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -44,7 +44,7 @@ "value" : "dark" } ], - "filename" : "pdf-linked@3x-1.png", + "filename" : "epub@3x-1.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub-1.png b/Zotero/Assets/Images.xcassets/Item types/epub.imageset/epub-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6f22a3f32889219ab0910c65ae0ef13b4af984c6 GIT binary patch literal 948 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 literal 0 HcmV?d00001 diff --git a/Zotero/Assets/Images.xcassets/Item types/standard.imageset/28_dark_standard.png b/Zotero/Assets/Images.xcassets/Item types/standard.imageset/28_dark_standard.png deleted file mode 100644 index ccd8c6564c05ca010bd6fb27919b5b338a528ffb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 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 diff --git a/Zotero/Assets/Images.xcassets/Item types/standard.imageset/Contents.json b/Zotero/Assets/Images.xcassets/Item types/standard.imageset/Contents.json index d16aebb9d..485584076 100644 --- a/Zotero/Assets/Images.xcassets/Item types/standard.imageset/Contents.json +++ b/Zotero/Assets/Images.xcassets/Item types/standard.imageset/Contents.json @@ -1,9 +1,8 @@ { "images" : [ { - "filename" : "28_light_standard.png", - "idiom" : "universal", - "scale" : "1x" + "filename" : "standard.svg", + "idiom" : "universal" }, { "appearances" : [ @@ -12,39 +11,8 @@ "value" : "dark" } ], - "filename" : "28_dark_standard.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "28_light_standard@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "28_dark_standard@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "scale" : "3x" + "filename" : "dark_standard.svg", + "idiom" : "universal" } ], "info" : { diff --git a/Zotero/Assets/Images.xcassets/Item types/standard.imageset/dark_standard.svg b/Zotero/Assets/Images.xcassets/Item types/standard.imageset/dark_standard.svg new file mode 100644 index 000000000..00672ca95 --- /dev/null +++ b/Zotero/Assets/Images.xcassets/Item types/standard.imageset/dark_standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Zotero/Assets/Images.xcassets/Item types/standard.imageset/standard.svg b/Zotero/Assets/Images.xcassets/Item types/standard.imageset/standard.svg new file mode 100644 index 000000000..2eb4542da --- /dev/null +++ b/Zotero/Assets/Images.xcassets/Item types/standard.imageset/standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Zotero/Extensions/Assets.swift b/Zotero/Extensions/Assets.swift index 896f0f3fb..11480d1c4 100644 --- a/Zotero/Extensions/Assets.swift +++ b/Zotero/Extensions/Assets.swift @@ -71,15 +71,10 @@ internal enum Asset { internal static let badgeListFailed = ImageAsset(name: "Attachments/badge-list-failed") internal static let badgeListMissing = ImageAsset(name: "Attachments/badge-list-missing") internal static let badgeShareextFailed = ImageAsset(name: "Attachments/badge-shareext-failed") - internal static let detailDocument = ImageAsset(name: "Attachments/detail-document") internal static let detailImage = ImageAsset(name: "Attachments/detail-image") - internal static let detailLinkedDocument = ImageAsset(name: "Attachments/detail-linked-document") - internal static let detailLinkedPdf = ImageAsset(name: "Attachments/detail-linked-pdf") - internal static let detailLinkedUrl = ImageAsset(name: "Attachments/detail-linked-url") - internal static let detailPdf = ImageAsset(name: "Attachments/detail-pdf") internal static let detailPlaintext = ImageAsset(name: "Attachments/detail-plaintext") - internal static let detailWebpageSnapshot = ImageAsset(name: "Attachments/detail-webpage-snapshot") internal static let listDocument = ImageAsset(name: "Attachments/list-document") + internal static let listEpub = ImageAsset(name: "Attachments/list-epub") internal static let listImage = ImageAsset(name: "Attachments/list-image") internal static let listLink = ImageAsset(name: "Attachments/list-link") internal static let listPdf = ImageAsset(name: "Attachments/list-pdf") @@ -113,6 +108,8 @@ internal enum Asset { internal static let document = ImageAsset(name: "Item types/document") internal static let email = ImageAsset(name: "Item types/email") internal static let encyclopediaArticle = ImageAsset(name: "Item types/encyclopedia-article") + internal static let epubLinked = ImageAsset(name: "Item types/epub-linked") + internal static let epub = ImageAsset(name: "Item types/epub") internal static let film = ImageAsset(name: "Item types/film") internal static let forumPost = ImageAsset(name: "Item types/forum-post") internal static let hearing = ImageAsset(name: "Item types/hearing") diff --git a/Zotero/Models/ItemTypes.swift b/Zotero/Models/ItemTypes.swift index 1e4dcdd9b..ef75b5158 100644 --- a/Zotero/Models/ItemTypes.swift +++ b/Zotero/Models/ItemTypes.swift @@ -9,6 +9,11 @@ import Foundation struct ItemTypes { + struct AttachmentData { + let contentType: String + let linked: Bool + } + static let note = "note" static let attachment = "attachment" static let `case` = "case" @@ -22,16 +27,28 @@ struct ItemTypes { } extension ItemTypes { - static func iconName(for rawType: String, contentType: String?) -> String { + static func iconName(for rawType: String, attachmentData: AttachmentData? = nil) -> String { switch rawType { case "artwork": return Asset.Images.ItemTypes.artwork.name case "attachment": - if contentType?.contains("pdf") == true { - return Asset.Images.ItemTypes.pdf.name + guard let attachmentData else { + return Asset.Images.ItemTypes.document.name + } + switch attachmentData.contentType { + case "pdf": + return attachmentData.linked ? Asset.Images.ItemTypes.pdfLinked.name : Asset.Images.ItemTypes.pdf.name + + case "application/epub+zip": + return attachmentData.linked ? Asset.Images.ItemTypes.epubLinked.name : Asset.Images.ItemTypes.epub.name + + case "text/html": + return "" + + default: + return Asset.Images.ItemTypes.document.name } - return Asset.Images.ItemTypes.document.name case "audioRecording": return Asset.Images.ItemTypes.audioRecording.name @@ -135,6 +152,12 @@ extension ItemTypes { case "webpage": return Asset.Images.ItemTypes.webPage.name + case "standard": + return Asset.Images.ItemTypes.standard.name + + case "dataset": + return Asset.Images.ItemTypes.dataset.name + default: return Asset.Images.ItemTypes.document.name } diff --git a/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift b/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift index 2c88f988d..04d1febf8 100644 --- a/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift +++ b/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift @@ -29,8 +29,13 @@ struct ItemCellModel { init(item: RItem, typeName: String, title: NSAttributedString, accessory: Accessory?) { self.key = item.key - let contentType: String? = item.rawType == ItemTypes.attachment ? item.fields.filter(.key(FieldKeys.Item.Attachment.contentType)).first?.value : nil - self.typeIconName = ItemTypes.iconName(for: item.rawType, contentType: contentType) + var data: ItemTypes.AttachmentData? + if item.rawType == ItemTypes.attachment, + let contentType = item.fields.filter(.key(FieldKeys.Item.Attachment.contentType)).first?.value, + let linkMode = item.fields.filter(.key(FieldKeys.Item.Attachment.linkMode)).first.flatMap({ LinkMode(rawValue: $0.value) }) { + data = .init(contentType: contentType, linked: linkMode == .linkedFile) + } + self.typeIconName = ItemTypes.iconName(for: item.rawType, attachmentData: data) self.typeName = typeName self.title = title self.subtitle = ItemCellModel.subtitle(for: item) diff --git a/Zotero/Scenes/Detail/Lookup/Views/LookupItemCell.swift b/Zotero/Scenes/Detail/Lookup/Views/LookupItemCell.swift index 54933fb8c..b8e5d0d6a 100644 --- a/Zotero/Scenes/Detail/Lookup/Views/LookupItemCell.swift +++ b/Zotero/Scenes/Detail/Lookup/Views/LookupItemCell.swift @@ -30,7 +30,7 @@ class LookupItemCell: UITableViewCell { self.titleLabel.text = title self.titleLabel.textColor = hasDarkBackground ? .white : .label - self.typeImageView.image = UIImage(named: ItemTypes.iconName(for: type, contentType: nil)) + self.typeImageView.image = UIImage(named: ItemTypes.iconName(for: type)) } func set(title: String, attachmentType: Attachment.Kind, update: RemoteAttachmentDownloader.Update.Kind, hasDarkBackground: Bool) { diff --git a/Zotero/Scenes/General/Views/FileAttachmentView.swift b/Zotero/Scenes/General/Views/FileAttachmentView.swift index d52290ba6..7c305bfa6 100644 --- a/Zotero/Scenes/General/Views/FileAttachmentView.swift +++ b/Zotero/Scenes/General/Views/FileAttachmentView.swift @@ -226,8 +226,11 @@ final class FileAttachmentView: UIView { private func badgeBorderWidth(for style: Style) -> CGFloat { switch style { - case .detail, .shareExtension, .lookup: return FileAttachmentView.badgeDetailBorderWidth - case .list: return FileAttachmentView.badgeListBorderWidth + case .detail, .shareExtension, .lookup: + return FileAttachmentView.badgeDetailBorderWidth + + case .list: + return FileAttachmentView.badgeListBorderWidth } } @@ -240,15 +243,22 @@ final class FileAttachmentView: UIView { switch type { case .file(_, _, let location, _, _): switch location { - case .local: return .image(asset: self.mainAsset(for: type, style: style)) - case .remoteMissing: return .imageWithBadge(main: self.mainAsset(for: type, style: style), badge: self.badge(for: .missing, style: style)) - case .remote, .localAndChangedRemotely: return .imageWithBadge(main: self.mainAsset(for: type, style: style), badge: self.badge(for: .download, style: style)) + case .local: + return .image(asset: self.mainAsset(for: type, style: style)) + + case .remoteMissing: + return .imageWithBadge(main: self.mainAsset(for: type, style: style), badge: self.badge(for: .missing, style: style)) + + case .remote, .localAndChangedRemotely: + return .imageWithBadge(main: self.mainAsset(for: type, style: style), badge: self.badge(for: .download, style: style)) } - case .url: return .image(asset: self.mainAsset(for: type, style: style)) + case .url: + return .image(asset: self.mainAsset(for: type, style: style)) } - case .failed(let type, _): return .imageWithBadge(main: self.mainAsset(for: type, style: style), badge: self.badge(for: .failed, style: style)) + case .failed(let type, _): + return .imageWithBadge(main: self.mainAsset(for: type, style: style), badge: self.badge(for: .failed, style: style)) } } @@ -256,21 +266,32 @@ final class FileAttachmentView: UIView { switch type { case .download: switch style { - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.badgeDetailDownload - case .list: return Asset.Images.Attachments.badgeListDownload + case .detail, .shareExtension, .lookup: + return Asset.Images.Attachments.badgeDetailDownload + + case .list: + return Asset.Images.Attachments.badgeListDownload } case .failed: switch style { - case .detail, .lookup: return Asset.Images.Attachments.badgeDetailFailed - case .shareExtension: return Asset.Images.Attachments.badgeShareextFailed - case .list: return Asset.Images.Attachments.badgeListFailed + case .detail, .lookup: + return Asset.Images.Attachments.badgeDetailFailed + + case .shareExtension: + return Asset.Images.Attachments.badgeShareextFailed + + case .list: + return Asset.Images.Attachments.badgeListFailed } case .missing: switch style { - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.badgeDetailMissing - case .list: return Asset.Images.Attachments.badgeListMissing + case .detail, .shareExtension, .lookup: + return Asset.Images.Attachments.badgeDetailMissing + + case .list: + return Asset.Images.Attachments.badgeListMissing } } } @@ -279,54 +300,90 @@ final class FileAttachmentView: UIView { switch attachmentType { case .url: switch style { - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.detailLinkedUrl - case .list: return Asset.Images.Attachments.listLink + case .detail, .shareExtension, .lookup: + return Asset.Images.ItemTypes.webPageLinked + + case .list: + return Asset.Images.Attachments.listLink } case .file(_, let contentType, _, let linkType, _): switch linkType { case .embeddedImage: switch style { - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.detailImage - case .list: return Asset.Images.Attachments.listImage + case .detail, .shareExtension, .lookup: + return Asset.Images.Attachments.detailImage + + case .list: + return Asset.Images.Attachments.listImage } case .linkedFile: switch style { case .detail, .shareExtension, .lookup: switch contentType { - case "application/pdf": return Asset.Images.Attachments.detailLinkedPdf - default: return Asset.Images.Attachments.detailLinkedDocument + case "application/pdf": + return Asset.Images.ItemTypes.pdfLinked + + case "text/html": + return Asset.Images.ItemTypes.webPageLinked + + case "application/epub+zip": + return Asset.Images.ItemTypes.epubLinked + + default: + return Asset.Images.ItemTypes.documentLinked } case .list: return Asset.Images.Attachments.listLink } - - case .importedUrl where contentType == "text/html": - switch style { - case .list: return Asset.Images.Attachments.listWebPageSnapshot - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.detailWebpageSnapshot - } case .importedFile, .importedUrl: switch contentType { case "image/png", "image/jpeg", "image/gif": switch style { - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.detailImage - case .list: return Asset.Images.Attachments.listImage + case .detail, .shareExtension, .lookup: + return Asset.Images.Attachments.detailImage + + case .list: + return Asset.Images.Attachments.listImage } case "application/pdf": switch style { - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.detailPdf - case .list: return Asset.Images.Attachments.listPdf + case .detail, .shareExtension, .lookup: + return Asset.Images.ItemTypes.pdf + + case .list: + return Asset.Images.Attachments.listPdf + } + + case "text/html": + switch style { + case .detail, .shareExtension, .lookup: + return Asset.Images.ItemTypes.webPageSnapshot + + case .list: + return Asset.Images.Attachments.listWebPageSnapshot + } + + case "application/epub+zip": + switch style { + case .detail, .shareExtension, .lookup: + return Asset.Images.ItemTypes.epub + + case .list: + return Asset.Images.Attachments.listEpub } default: switch style { - case .detail, .shareExtension, .lookup: return Asset.Images.Attachments.detailDocument - case .list: return Asset.Images.Attachments.listDocument + case .detail, .shareExtension, .lookup: + return Asset.Images.ItemTypes.document + + case .list: + return Asset.Images.Attachments.listDocument } } } diff --git a/Zotero/Scenes/General/Views/NoteEditorTitleView.swift b/Zotero/Scenes/General/Views/NoteEditorTitleView.swift index 204aafb1c..ffef1d61b 100644 --- a/Zotero/Scenes/General/Views/NoteEditorTitleView.swift +++ b/Zotero/Scenes/General/Views/NoteEditorTitleView.swift @@ -26,7 +26,7 @@ final class NoteEditorTitleView: UIStackView { // MARK: - Setups private func setup(type: String, title: String) { - let iconName = ItemTypes.iconName(for: type, contentType: nil) + let iconName = ItemTypes.iconName(for: type) let imageView = UIImageView(image: UIImage(named: iconName)) imageView.contentMode = .scaleAspectFit imageView.translatesAutoresizingMaskIntoConstraints = false