From 96e5b37018d1dd3712f41e8e38643d0ccb10930f Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 11 Dec 2023 19:43:57 +0800 Subject: [PATCH] Web reader toolbar --- .../{TabBar => BottomBars}/CustomTabBar.swift | 0 .../App/Views/BottomBars/CustomToolBar.swift | 65 ++++++++++++++++++ .../Views/WebReader/WebReaderContainer.swift | 35 ++++------ .../Sources/Views/Images/Images.swift | 6 ++ .../_chart-line-up.imageset/Contents.json | 15 ---- .../_chart-line-up.imageset/chart-line-up.svg | 8 --- .../headphones.imageset/Contents.json | 4 +- .../headphones.imageset/PlayCircle.svg | 3 + .../headphones.imageset/headphones.png | Bin 622 -> 0 bytes .../headphones.imageset/headphones@2x.png | Bin 1039 -> 0 bytes .../headphones.imageset/headphones@3x.png | Bin 1579 -> 0 bytes .../label.imageset/Contents.json | 4 +- .../Images.xcassets/label.imageset/label.png | Bin 499 -> 0 bytes .../Images.xcassets/label.imageset/label.svg | 11 +++ .../label.imageset/label@2x.png | Bin 815 -> 0 bytes .../label.imageset/label@3x.png | Bin 1142 -> 0 bytes .../notebook.imageset/Contents.json | 4 +- .../notebook.imageset/notebook.svg | 3 + .../notebook.imageset/notebooks.png | Bin 437 -> 0 bytes .../notebook.imageset/notebooks@2x.png | Bin 660 -> 0 bytes .../notebook.imageset/notebooks@3x.png | Bin 861 -> 0 bytes .../reader-settings.imageset/Contents.json | 4 +- .../reader-settings.png | Bin 440 -> 0 bytes .../reader-settings.svg | 3 + .../reader-settings@2x.png | Bin 628 -> 0 bytes .../reader-settings@3x.png | Bin 771 -> 0 bytes .../three-dots.imageset/Contents.json | 21 ++++++ .../three-dots.imageset/three-dots.svg | 12 ++++ .../toolbar-archive.imageset/Contents.json | 24 +++++++ .../toolbar-archive.svg | 12 ++++ .../toolbar-share.imageset/Contents.json | 24 +++++++ .../toolbar-share.imageset/toolbar-share.svg | 12 ++++ .../toolbar-trash.imageset/Contents.json | 24 +++++++ .../toolbar-trash.imageset/toolbar-trash.svg | 14 ++++ .../toolbar-unarchive.imageset/Contents.json | 24 +++++++ .../toolbar-unarchive.svg | 13 ++++ .../utility-menu.imageset/Contents.json | 4 +- .../utility-menu.imageset/three-dots.svg | 12 ++++ .../utility-menu.imageset/utility-menu.png | Bin 604 -> 0 bytes .../utility-menu.imageset/utility-menu@2x.png | Bin 1167 -> 0 bytes .../utility-menu.imageset/utility-menu@3x.png | Bin 1743 -> 0 bytes apple/OmnivoreKit/Sources/Views/Theme.swift | 4 ++ 42 files changed, 307 insertions(+), 58 deletions(-) rename apple/OmnivoreKit/Sources/App/Views/{TabBar => BottomBars}/CustomTabBar.swift (100%) create mode 100644 apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/Contents.json delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/chart-line-up.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/PlayCircle.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@2x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@3x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@2x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@3x.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebook.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@2x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@3x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@2x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@3x.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/Contents.json create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/three-dots.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/Contents.json create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/toolbar-archive.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/Contents.json create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/toolbar-share.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/Contents.json create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-trash.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/Contents.json create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/toolbar-unarchive.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/three-dots.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@2x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@3x.png diff --git a/apple/OmnivoreKit/Sources/App/Views/TabBar/CustomTabBar.swift b/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomTabBar.swift similarity index 100% rename from apple/OmnivoreKit/Sources/App/Views/TabBar/CustomTabBar.swift rename to apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomTabBar.swift diff --git a/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift b/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift new file mode 100644 index 000000000..e3e0ab479 --- /dev/null +++ b/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift @@ -0,0 +1,65 @@ +import Foundation +import SwiftUI +import Views + +struct CustomToolBar: View { + let isArchived: Bool + let archiveAction: () -> Void + let unarchiveAction: () -> Void + let shareAction: () -> Void + let deleteAction: () -> Void + + var barColor: Color { + switch ThemeManager.currentTheme { + case .apollo: + return Color.themeMiddleGray + case .dark: + return Color.themeMiddleGray + case .light: + return Color.themeDarkWhiteGray + case .sepia: + return Color.themeDarkWhiteGray + case .system: + return Color.isDarkMode ? Color.themeMiddleGray : Color.themeDarkWhiteGray + } + } + + var body: some View { + VStack { + barColor + .frame(height: 0.5) + .frame(maxWidth: .infinity) + HStack(spacing: 0) { + if isArchived { + ToolBarButton(image: Image.toolbarUnarchive, action: unarchiveAction) + } else { + ToolBarButton(image: Image.toolbarArchive, action: archiveAction) + } + ToolBarButton(image: Image.toolbarShare, action: shareAction) + ToolBarButton(image: Image.toolbarTrash, action: deleteAction) + } + .padding(.top, 8) + } + .padding(.bottom, 30) + .background(ThemeManager.currentBgColor) + } +} + +struct ToolBarButton: View { + let image: Image + let action: () -> Void + + var body: some View { + Button(action: { + action() + }, label: { + image + .resizable() + .renderingMode(.template) + .aspectRatio(contentMode: .fit) + .frame(width: 28, height: 28) + .foregroundColor(ThemeManager.currentTheme.toolbarColor) + .frame(maxWidth: .infinity) + }) + } +} diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 31846163a..9e68ca638 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -28,7 +28,7 @@ struct WebReaderContainerView: View { @State var showExpandedAudioPlayer = false @State var shareActionID: UUID? @State var annotation = String() - @State var showBottomBar = false + @State var showBottomBar = true @State private var bottomBarOpacity = 0.0 @State private var errorAlertMessage: String? @State private var showErrorAlertMessage = false @@ -160,7 +160,7 @@ struct WebReaderContainerView: View { var textToSpeechButtonImage: some View { if audioController.playbackError || audioController.state == .stopped || audioController.itemAudioProperties?.itemID != self.item.id { - return AnyView(Image.headphones) + return AnyView(Image.headphones.frame(width: 48, height: 48)) } let name = audioController.isPlayingItem(itemID: item.unwrappedID) ? "pause.circle" : "play.circle" return AnyView(Image(systemName: name).font(.appNavbarIcon)) @@ -361,7 +361,7 @@ struct WebReaderContainerView: View { .tint(Color(hex: "#2A2A2A")) .frame(height: readerViewNavBarHeight) .frame(maxWidth: .infinity) - .foregroundColor(ThemeManager.currentTheme.isDark ? .white : .black) + .foregroundColor(ThemeManager.currentTheme.toolbarColor) .background(ThemeManager.currentBgColor) .sheet(isPresented: $showLabelsModal) { ApplyLabelsView(mode: .item(item), onSave: { labels in @@ -592,30 +592,24 @@ struct WebReaderContainerView: View { .offset(y: navBarVisible ? 0 : -150) Spacer() - if showBottomBar { - bottomButtons - .frame(height: 48) - .background(Color.webControlButtonBackground) - .cornerRadius(6) - .padding(.bottom, 34) - .shadow(color: .gray.opacity(0.13), radius: 8, x: 0, y: 4) - .opacity(bottomBarOpacity) - .onAppear { - withAnimation(Animation.linear(duration: 0.25)) { self.bottomBarOpacity = 1 } - } - .onDisappear { - self.bottomBarOpacity = 0 - } - } if let audioProperties = audioController.itemAudioProperties { MiniPlayerViewer(itemAudioProperties: audioProperties) .padding(.top, 10) - .padding(.bottom, 40) + .padding(.bottom, showBottomBar ? 10 : 40) .background(Color.themeTabBarColor) .onTapGesture { showExpandedAudioPlayer = true } } + if showBottomBar { + CustomToolBar( + isArchived: item.isArchived, + archiveAction: archive, + unarchiveAction: archive, + shareAction: share, + deleteAction: delete + ) + } } #endif @@ -657,7 +651,8 @@ struct WebReaderContainerView: View { } func archive() { - dataService.archiveLink(objectID: item.objectID, archived: !item.isArchived) + let isArchived = item.isArchived + dataService.archiveLink(objectID: item.objectID, archived: !isArchived) #if os(iOS) pop() #endif diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.swift b/apple/OmnivoreKit/Sources/Views/Images/Images.swift index eb8817b63..cc286d9e2 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.swift +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.swift @@ -13,6 +13,12 @@ public extension Image { static var tabHighlights: Image { Image("_tab_highlights", bundle: .module).renderingMode(.template) } static var tabProfile: Image { Image("_tab_profile", bundle: .module).renderingMode(.template) } + static var toolbarArchive: Image { Image("toolbar-archive", bundle: .module).renderingMode(.template) } + static var toolbarUnarchive: Image { Image("toolbar-unarchive", bundle: .module).renderingMode(.template) } + + static var toolbarShare: Image { Image("toolbar-share", bundle: .module).renderingMode(.template) } + static var toolbarTrash: Image { Image("toolbar-trash", bundle: .module).renderingMode(.template) } + static var pinRotated: Image { Image("pin-rotated", bundle: .module) } static var chevronRight: Image { Image("chevron-right", bundle: .module) } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/Contents.json deleted file mode 100644 index 7f06548a7..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "chart-line-up.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/chart-line-up.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/chart-line-up.svg deleted file mode 100644 index 483852af2..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_chart-line-up.imageset/chart-line-up.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/Contents.json index 526236fd4..e0caa008b 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/Contents.json @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "headphones.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "headphones@2x.png", + "filename" : "PlayCircle.svg", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "headphones@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/PlayCircle.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/PlayCircle.svg new file mode 100644 index 000000000..9e9f29086 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/PlayCircle.svg @@ -0,0 +1,3 @@ + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones.png deleted file mode 100644 index 5fe6dcdfa4d769f4e0645a2df12a118de8631467..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmV-!0+IcRP)mKu!8#LSp=uPopNKH^39Lo*W2@)+0abxoFKmFAnx#)J4-eQyF$a7mK-0O+1hCpEr@ zwSzr-KA(TzigOjH*=&vxtdC$m#tBq2j6oLA=@`2BG<@Ficx*41OD{K2qtUQ1^bq)K zyWI}c$^^R}h5uImzET$EnF3REl>)$l}_8<7`)tWcF2uP?+Ghr=Oi$N^|erwUGp3`c1_ z(rUFn5c~}vk;tR_WoN14*2*kI>-^6(i%T}{(2oT-O!2s2zdA&4%DSr93aSqB+7 zGzZ-SpmMovU^(GTDH{h2ZAS|9;FPjsSuzSUNz7wqjSI0fZc9X33G7mVeqH_?NQ)*> z$rMEqQl9^H;67`_KHe@t26Xmhzu%8xY=KcW1;HJ>V#|YG^eWrfAA~PG-OV$64Cvl@ z!;9CO9#x#)B8R|0k{rxG)1H5T(A(Gz59L$OEfx!tJ>=iX4_}P)n>R}kxc~qF07*qo IM6N<$f-OJ?Q2+n{ diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@2x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@2x.png deleted file mode 100644 index 97d977df09ee09e867646854d0a7641891fe658e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1039 zcmV+q1n~QbP)>NWtlp{jm$L2KXbu`+i{88il=P<#TMr0&0sYzX< zQG0I+^SlQBZqUn#u9tZ}Veas|XIxz7aSYQt9mVvV#iR|n%``$_a@QfCL5^%~ZH4r| zC@yc`)$E+a3=@LUxqN(lJfVU>)CK;Il_Y@?`rGMcFjsg1IaQMU zrKP27a-eFP5k1GI@Lfr&7n!WXczJpGy}G*kjJbEnab7Ui*4AD*-R6BOG3f@FC`r8P zT+jqS!<*~t>mL!^8~lufY+i;Ig*c1qKz&nBa51yo`JnbF!d4Zd=LeG=E9K>|JiKWlpS25R zEk?IAXP$kaF@nyS%&~daDaFhxrI=YoD+a67s|>SmMl+694Ayud!|=@xH2Fd$YITT1 zM?K4MwOY+BJ9D4?Od9446(-oJ<&|j&UrONr2I(!OA^auaNU1y_3y?3Cw>}7;pzM~Z zY&?r~Wg73AQ3-p?hh#?#&)NDaN_B%w*xYFw7XaJ?)YU7WJU9=3iXaElJ2>NUoZTgx zJ8kQ)0Q~8J%|g8w_*($x6<1c|-dR^RUpGzrR;Z+;q@-kQ`~mx@wMffZx|IL`002ov JPDHLkV1hlI<9z@C diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@3x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@3x.png deleted file mode 100644 index dfe1b2c22f1f4ad654ceabd5004e1bb911c30c30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1579 zcmV+`2Gse9P)9Q%1_$Y9m0P_TwTc!$>so*|=?I#Fy>2SJqz!Su`OUI_*qd>~0 zLxRFr$l!p0{1105nenW>XJ);|y7QA3*0a0z?tjnBoH=KP$m8*NJRXn74q44MLRg zu?S)Eg3BXpbzF0Fc6N418Ize{K@j9;XJu~0KJ zGuyDH9ib&jsbwMDKm}7(Zy&n>$%yz5w`o$5am{YC*{lw#ts977s`{1jusglZgp=QwpS<=_~n-jr<8Dv&-+9vkcx$I6&W8NKaOdjt9Zi|%78x2 zK`NH!Y+)TY`O31mt-`-waFe@~5!ct(jk&qGBjph5mR_2lpZ|<={vrp)$Prjpm)oEk z_H~F=qm1F6acXL69lN1^4EI%5?W{FUg5k%@rY>HI71EFh!>|z}8aEjS?Dmi))`D?W zWba)shgctnDOMX64IRw~QciFO0Y)A>WQnz45UXNnu0T)Z!T3QF%6V+yr&iC(NUGj0xQATx(vmcMGT~%J*%i*yORx@woL3+C^uqX zD~`}^ZP6R$^766;=k*(U?buFFPEP&@hqg`v#1^K;a5`_UD(b+>b`4gxO+v(incA*l z_*+uA*W|IRR-ES$6bTRs#?{f_chzY`K&MpK%VKIwEF!^B=exXQc=|^)B5;qXS4$Yc z8VL{yhRjV#FT1(9snZAnD|_{VA)sieBoYi?zN!@sJ?$k0Rj_NgBynOzg6W<;KL1N2 z1_X=rGE-9%dp*g}zc`{1FKU}mSm=!<6)x)`(t_; zr}HQw6O;n%{K38GO8K|vMA&ABEbgP7O$zj5xVMlu*YU2aU>hqdE88p-wyuL*h6mt4 zV}y@2Lr#LIixa4$7-z_m)QCanJfwh97w$F^~(IPk)L<(z_GzQ!gw zkaZjOk}ye2G#0C0c0Fx|(dcvVai1LF1a8)1F{uc~Q2-1%en8YB*SX=)k7Nk_a2iY+ zB`{DneD6!b7;WXd&imlcILz_7h#Yb5B{}I47spr0kPzZTdeD(mUSt{RP+|vK@!`qI z$p_QQg6CQvV8(*F$n3vqm2e+2wy>m|~q!wZ-J=OZe)BMy`0lgm}S(c)^5t z!Gw6hgm}S(c)^5t!GuWjlDe1tJtf2x;7f6ORN`UQ!oq@S3>#5Gq!y;9s5X)W1Jwk) zwLagK7*jGf=`_rVi3!triSI?4$khki`F;^pm6+fGuYQj8oD3vhYlhYlq3xxttMByGMQSYQyhx`PwexsCVFO|XWJ4pmrt*YC+xVX3^ zA1crbpTW$^z=lQb z{Le6NKi=-|?c29XbW=lVRTHLZ8r^Q!Ow-g5$KyD5f*{z_xgZAgdOa)4vV~-w?Rnmk z6x1pXbUK|CATuCI<0XrkIr!r?n*cbYabU~AMQdqwmkHO9_MJj1zANEDs*3?9GU}r<>z%B-n!RkUZY5>dsuh`<=wHfTj_x<@r pK`fkL#Q<&t@`|4vn{K+6egMi*&!Q_!uZ;iz002ovPDHLkV1kSc)Ybq1 diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.svg new file mode 100644 index 000000000..8d3ff6758 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@2x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@2x.png deleted file mode 100644 index 11cb17298cd95a31489b0790a85ce5cdbf967304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 815 zcmV+~1JL}5P)nu~K~#7F?U~Ju z+CUV?pG}bXxF8{MjgJTpaS5b@O$A{q*xd@)bdVC*4w4F%62b+z?G%6%a^VK#|1f4P z%VT@K%pUxc5dN6)_{SU1JP$-QH8nLg9}JHa34);4YPCY&_k%L!kH@3fY&Hw3fYLH7 z(dl#^JkNVPolZScL!i#ndcFQd4k;xw91a6S;uV_#8GtBF5v3P$M4^mCMBuZaVmN|f zvaU;^PeldLt)AnX!S)U}bFb1}(mw{a=Qu_#guD_r@)qwyoR6;$$KLkbHGio@B(08&(t_*Gy0!Z$su!`aE}^ z@p$}-A^R_XMx)Uij!k6Ob1meP0sI_5a*{Z7el{Q#%Idfj(w4bIAdsAX$f@c~NLwZ^ zok6q$D!_%1whZT7vU8Y^1eL(HkhTmD)41tH`uJsH{Xr$MDP%MNG@H$D=u+2-kL9q> z6RRKvYzgIN06gr*qm}OLuYzf&P&8@&i?9%;Sf>-YNt$Cu<7w6Q~5zqw6{-ir#`FC5L#z3$0zwktyt zp`Ws(wos<3^j)F-Uc23%W|b{9&wKK8e_oEqPuGdFoG8a^|as`LZ6O^I#)=GMOGsCQu_nWq3Ymy7R%IAnAyW~?x(uT#WJ82;BEysw zvL(VelVP%iF8`pN)A(+;JH!5CqKdW%<5Y%G_}9%ygfUubDnnMLkcOA2OhwMup$ftC tF{Nl7`n))DS!a7$tyXiYsi~CIuWLcAdCP2002ovPDHLkV1i`1WCZ{K diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@3x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@3x.png deleted file mode 100644 index 3bea0685f261463a7e52253ed439097d5adc81a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1142 zcmV-+1d02JP)gq#5T1VEP#I04BC0w)ML0p(6g)ZeryjGYgBNXkmVSeh)7~N(djN=?a@@n4*m&Ue)_1?VZla5H!)|VmGGfnxrSdth}Dw;~v|gPB!Mb z5Yx>n(-LXQR+*+7VOp@@hOA4xJi@la4U+d*aiHP*Q{z_NM4Fheg7z9C?OPqCi3vj_ z?W=-5CZ!>f9i@S5X=1|g@Eax1>nKfJN)r*r?3k_~a`>n!;7Xc^uy(tBSN2@inyMl$ zq=^XY_xpD!!_Lc`Tc&A}hiz$MW!Tfx(?N;TjPw+2N)r>74DsYi8zs`z_gRr9+Hghm z>|?h(o;~rJ!_L1RA0NM%?zG#GrZv2S!M$PX&_N=l6s$dMOln9D4T(lr8e20!l96Ur zm`$XlX$fQbGyWcB(Yo>&329ow@Z}fd?>Wn@+ZVKrX=z%*IF6O^r6y(F6Gq$MMwBmdfog3aNXf;rYL(k0%p0Q<hc(O_|5#I-b2vWOL7#FaFYvWPWd#I`ikvWQh-#FjJ(S;V?9A}viy7I7ks zNJ*2FMVtvErlm>CB2I-7Q_^h6BF=@8S*6*MMZ6G3s!Fpdi+HoPqNwkgHN$RO7V##+ zM&v{q$J;rPe8JB!`1cw6PR1?7WD)O#kvwSyh{_^f3L_PyiOVA13L`~-zZt>x9uE%> zTX_?(rtn(Wh~$6Z8(dyB7IB=2{f+H(mj9Rs0)apv5C}Np89GB_ez$EofdBvi07*qo IM6N<$f<&YjwEzGB diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/Contents.json index 7c317014a..4312ae5d7 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/Contents.json @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "notebooks.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "notebooks@2x.png", + "filename" : "notebook.svg", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "notebooks@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebook.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebook.svg new file mode 100644 index 000000000..e034c7b32 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebook.svg @@ -0,0 +1,3 @@ + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks.png deleted file mode 100644 index 99669636dfaf8eaf396b371f007ed8074b2cd1a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmV;m0ZRUfP)1C?ToD=^#o6&;hO>l#q1b4&n=+8(RWLBn0G*QqMBKb)p zmSKlCpWPXv8-%dtltB>qwrxMqMhwGntg1>G5iyD5I3MFU?ns8XD2imNw5JN!bt5K$ zcaM;J7S=;|(CE9!zxNHEOpSjhN_MyKIArEOioyB0`Oxkg`3m zIfZ$izpUAai1?m?K(Boh8xaxiQ;J8r#pc&)bR+s3M7kkk%v^MfrBmmlaelq_EFb$r|Gwg!52l*4jbz$248}~7q1dAW=8odw?yJpc>bu;I&pkTOi| z*u;hyJNeCY@@8XlM)#W27}=rVevZJwtZPB6rN!|;JBnSvfJ%E%d))fcH5p# zr=Cb#Zb6kw#YJ&L>S;|TlQyq&n#T!Z8YrIVZ*Ypm;>UbGf9G-L>Y;ME+(QV|_YEwo zv)OFAL7!AAHS=wR$~DEq#`XO0-m_dTuRPCNL^Zr1K@i{Lu((Dq9&ORM55dDRtX8W7 z+|OYZ`Fy^Cq7&6HMH&M!ecwi8aE)KB1^tG^2@)PdabUSDm&<+2VG_pN5oJA8DwS*` z<`J6>g9m2O0ZBrcpiCxHLt%%V!+>{463Rj@olXze>vbQ0{x*0HvssrUp-hnLx-2O+ z=**aDTX&2g-BFrYk&7JU9Vb|ixAUH?#4-7IGvBrDF(t13fx3X4=*rBS?3QAl)&7bjJwN9jygnLq+&Il=`O~apjqRw+*W83QmB5HmG>{p(KT!OFwbN#1%(y1ot`p$^B_k&zW;*=+W1wOTb`-s9=nAugwN9>rsUd%UqQV+%u(hTJ_A1$yupBY2|H ut}BYkL%JhP5T^6t!R%2|kdS{2iRTkqf2%h75O%=;0000oo1K-6l5$8 za(7}_cTVOdki(Mh=jT?ty}Oh2R7C@@!nrq`1G#+$qza?!uwiBH+ZK_(Xu!vmn3qqoBYvvrqW{<&DD9OD{myZ_n~+tOaM zE8ia$>sntinV=k`BPRQ|um95zwd&JPKW%-zYaYWMfeEsiZ4XPV_TDb<-PXx}ZtJSu zRcAf=PM;{8bFgZ!ndy^Qjr~D-)7O8wAmjgw97fjfn!tB9~W6)JovcrxY2wph)nUcaS^%vVa7Xsr|% zKXQ1l^V6uc*S7X?=09~wS-2|BO>>Fuv)(xqu5<@02DbAAyl9zJRrpLY>c}EzOU0G> zk9~G8?cdgS@bb4v=Hcm6Kp>fcs@BwJZUyK!JasQ z|B!-wi=!RK@j?Z#a|jWWvdrH`H;6jBl8TtDYrtA+8x+{kO< zH)n1SnD~K(-{!f1&UHTjyL+$hwwm<(<0&19Y08_@Z!TSJoT1FvxjF7@Tzx>eQCDQN zbow*-b*pBdReM#FF7@(wZ7fq<)V>IvJ5_u0{%wpsDR9vK?c^gW*YpHF|EyW^sqVG= zXSKkr@+OX3kJrz-_gdyHzh}b{vz*NBxBJYtRX?4Z?7L6qrRatuM_e7B{<4nzdotzH zWS&D4xLY1MXz)E*@@PxBbnE%YJ$KIgu6cN(cxBk?H2cNV59aaA=g<8BN{=>wm<^M8 VrsgjnEN)eqd{cVLXrt=!678@Qb22 zP1$c2RaJRB&!5J4olqEtl)?D-4p__2T~R9%z?EVf zH>1lEXRQd6Kf!ewu7huyrb_P$;y2XSp#t1mrJzC5y zLJfy~sVK@;lBCx>&%3r`S=JqDH!z1P%kmp)X@8!<6*-PWyY`lR+Bideh0%qu%kt3q iubYsHyJW?RA$$NKGIJ*T!REjK0000 + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@2x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@2x.png deleted file mode 100644 index d965379a66edf5333b38b30e8d21f0ad74ff7342..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmV-)0*n2LP)DN z!Y~xaolrh*%?1rO5SKDR(+$!Q*r05{29ya(Cuq6>ouKJ~kE2IO4`hO^qP~|jk zk|qJYpJX|Ceu@3?3;x?eFbu;m45Nh+*U;&79Md#yQ2>X-Awcn0tCbWPPzKZM^~QMl zqbQbOv)Qzzlz~Wz8DqZ{#bdQvtxWx1Y4~_3TECWI7&d0q32!CJOye0B&sZV{5`)?A z_Y>suOlS~(XAWIsfO5H94w9ZhO53O$kprfCVFja+vsVX|!>|cQNu_1lNX>=K$8K|}kr3F)~ z)t*U|VzCq{ctUZ18qYP&u2sfL1cTWbLZjVN!EC)mcDg>X50llVCOkjNSsej$ZDk@YO!tThTH>~#-6O^alzb@bqPG4t5OnCUnE%zOEg8DCy=52o+uBo#+Y;~=0yUk7;zukS_JZDz&FEWqR5#tYHnDy(#=RMC~6t^FK zcsXn9tj?hQ_xB$?lxf_P#2cKH;Kk$PDJ$_yN?EmOzu@Z|!EQ2MJUnwZ9DMZdt)W@o zwB^ZVE92JNd#I@V$)D5Zyt3N!jbQ#p^Z-Ml@9*@YUH z?{l?;?OO2YU-;Sd2o z`Z*C%zlfT?zPei%19a9UxiU}boX=x^HO^XuPv+i<*9#ul&sSXUY*}7;zOq>AMuCM) z@}8INA`2|*@5jAr-VkRb5}R)}+i%`x(Ya=xEv2fg3(eBv*bhmi>fFlP8Wnl^-(Sf` z0$Im>xHc_b5P3T5+=qK_%bsRWn)deahox7IuO!xgTe8<@`SsVmhwa|n{i<{$^X54= fbtN!ZbRnNV>AB5fIlddfG|S-W>gTe~DWM4fWB^gz diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/Contents.json new file mode 100644 index 000000000..6bb0cfc0c --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "three-dots.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/three-dots.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/three-dots.svg new file mode 100644 index 000000000..33739e0df --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/three-dots.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/Contents.json new file mode 100644 index 000000000..f0ac632b6 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "toolbar-archive.svg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/toolbar-archive.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/toolbar-archive.svg new file mode 100644 index 000000000..d7aa31afc --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-archive.imageset/toolbar-archive.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/Contents.json new file mode 100644 index 000000000..b27f103c2 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "toolbar-share.svg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/toolbar-share.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/toolbar-share.svg new file mode 100644 index 000000000..fc66c9a79 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-share.imageset/toolbar-share.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/Contents.json new file mode 100644 index 000000000..98255c5a5 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "toolbar-trash.svg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-trash.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-trash.svg new file mode 100644 index 000000000..969b27c68 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-trash.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/Contents.json new file mode 100644 index 000000000..418dd2e1e --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "toolbar-unarchive.svg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/toolbar-unarchive.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/toolbar-unarchive.svg new file mode 100644 index 000000000..d7d6fd0ae --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-unarchive.imageset/toolbar-unarchive.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/Contents.json index 8c12c640e..8cf9f499e 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/Contents.json @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "utility-menu.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "utility-menu@2x.png", + "filename" : "three-dots.svg", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "utility-menu@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/three-dots.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/three-dots.svg new file mode 100644 index 000000000..33739e0df --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/three-dots.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu.png deleted file mode 100644 index 041425b604b9710be603b7d99438ba62117c4c56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmV-i0;BzjP)P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPEr-O8WI|#V|x3~mz0f7Y0duWY}AsEY1 z4m@cz>-EmOo!yyPA)W==Ba5ols-bC`c|0B^bkXy?bt;u|pzXzCF;7HNE|<-8Iz50h z^R!sgT#Q|49a>k*NHPVP6^lelsps?gF@|l31E} z<2Y_4i6XEuY+$$j<#IU@5x{W{71!1YnXd-I?}RB-w1%q{i9W zA_16%)PC9%Fa7|N63X?{RHbMeq*k0cO08CNmA}hKRB@eCkA_eKrDM&hf-PP}!fJ-{ ztC+`T!SJNx&aorldo991h<^G>kpQ%(AEvWEcRsHDes8N?G(`faRzpAb%>{^N_7`=+ zdb=PFejxo=BQh9jOai}IPVX*6G?u!XmWTn^wNy)b3;(-nkeN(|QOt3+mfBe)>h*dT zX=`El#daV5fAc*t3`5`Tb`xA4qj4Z3c7pJGf(NY$=UseC==be*+k5Ce34&c2icU^_ q=+?`~EaF{a1NLuz{^gB-9{d0({~k^63$EY*0000R&5c>piP5_($a{^`s>@qiqS3niN^ov_Y zmL<){^Pwt!Rg|TPq|uvhb+@`hw7>!j_)w#Qu(`R}tk>&}x3{;3diM166h=`rq5_Z` z5#D%P--I0X0x%jwgv*7sfETHzu@LI ztIqKL{ywtJ$Jybr0p>%JmLUV4f99I+LMkG1fUiiCf)MCGJUsN$9%Nas#m!TimTbgi z+G)rnCcKzx|}fAQ2H$5@LA{@9yp{C`X9l_@R9) zyk|FwWMYX})G4AAUn(tZ?_;&yjgxwvVgQlTv?SU^kpSfD?<;GEcZ+fH!b?Q?2-Rni zpQN=WS%41()zuz#VD5c$;v{mawFmP$tu&DH*H?Y0V)&~!& zkcI-J!XNTd^(7LRflIZ%sm9XM(j`?4mc&rCS-tjbV_ZZgYW4j5T$s;D3SG4&;GDq> zkst^fdWcY^S}9-;n)PbH`_PR@z&N>hf0E(_#lr%1!D7Byx=)~6Z^OmRiCq#rT=W0kfps@cifP=icx;l{(p9`4r hPmx|)V1fS;e*v@+W-pRIKpp@9002ovPDHLkV1joGAPN8g diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@3x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@3x.png deleted file mode 100644 index a4ced564adf3e7775e2461b7d013df5393f287d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1743 zcmV;=1~B=FP)002t}1^@s6I8J)%00009a7bBm001F4 z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<-@kN03yb z1<%`25Ie536+yFwV4H27=>3X8i34eQVtn4mEbMwIAszoT)#_IkZk97z71>+9>o z`T6<(@cX|6RB6@gbwZub6cLd%Yi(_92jfqWYI_vpI1vS`Ww6Gl6fl0G&24DdD9rQ4DSew})OdUB(f+Ib;cIve@#_ z=-bK_Q9~#QYY2bP3Rc|^-LH+)$d8~w3wa~T4<0t~l27GXfOx@O)BD(J)~;N@K1`m8 zV(|FH-n?ASQ!<N;OCIXEqs5glKDY(5f!UP%8KQ;rtkZYs`^#U&8%ZS@b(Wx&}|oQ>IjP&#-Wh3W$}Ff_`gH$ zjjF!Rb*M=<^Hi1B*VlQyuuZQU)HZSWGLn@&`RLZr7MQ384v;1eUskdH!8Qw7Hegbba@kHdz*`M~jPvvJHsn6wV~4}G zuu5$*L{_pxaN?Zmx-tg8yu9p4%i?{6XqDPkB*0?+D_ML_jtdQFDm4pgD);%CSPCmV z_&H?P2;aY`WRzra4(EtK%oZjqAoMh1L3K{Ik}OOt-GCb^=TAk!{r&xWxr~#0RWeGl zII1YGh-mVm3ImZ4=Z7{6TI*+VR5d#7t=X*P<_RLPMaDjv$eL8* zSUe)6Ujq^=a-9$&BSfn_Xw`y=ypd+HRRmEZ?Bgw2r|o13&N&SzHeM_?jymv4E=hS# zydr`rQ6ah`r*#G-=Xy4q3yjGUE4d@{CJ?qO(k62Y?tUTpuU07tR`D#cxGIM|cpN** z>zvV-TPnk`-LhgG{6lwS?ee7J=LY4CFhvrs7bUT!%vQEQq_DC`I}D2ZDd2Jk5!62@BI4M)vqu3b zlnlJZE{?qH-Qhimdo%`O*%ijV7PRS4MU~k1{tYqQF-swvtpv8?*sPh_enSB#?)`=s zn>H0I=N{#4zu^!jd;bJH9Na}uIFxI;lU3v~@Zh~=kXmqz$jEk_k&#%*8bV|@^ElQp zsV}wxyW+FwyY&2D54=~}BJYCTm+d676B8k82wT#|f!O1?pVW@o=ii_dAV}juIQBWD zSR**Oxw&zY4o0Rz)(~t2IJ-qG7DOhF3F4T!*ty@Ol#nV}e#rkt;~SS={TB_1|9Z&7 lf6