From 0529792f2a5d5f78c54085b4059c2d00bbe36674 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 12 Dec 2023 11:53:38 +0800 Subject: [PATCH] Improve the header and toolbar icons in the reader --- .../App/Views/BottomBars/CustomToolBar.swift | 5 +- .../App/Views/WebReader/WebReader.swift | 4 -- .../Views/WebReader/WebReaderContainer.swift | 49 +++--------------- .../WebReader/WebReaderCoordinator.swift | 7 --- .../Sources/Views/Images/Images.swift | 3 ++ .../header-pause.imageset/Contents.json | 24 +++++++++ .../header-pause.imageset/header-pause.svg | 11 ++++ .../Contents.json | 5 +- .../PlayCircle.svg | 0 .../headphones.imageset/Contents.json | 4 +- .../headphones.imageset/headphones.png | Bin 0 -> 622 bytes .../headphones.imageset/headphones@2x.png | Bin 0 -> 1039 bytes .../headphones.imageset/headphones@3x.png | Bin 0 -> 1579 bytes .../label.imageset/Contents.json | 2 +- .../label.imageset/header-label.svg | 11 ++++ .../Images.xcassets/label.imageset/label.svg | 11 ---- .../notebook.imageset/Contents.json | 2 +- .../notebook.imageset/header-notebook.svg | 10 ++++ .../notebook.imageset/notebook.svg | 3 -- .../reader-settings.imageset/Contents.json | 2 +- .../header-reader-settings.svg | 10 ++++ .../reader-settings.svg | 3 -- .../remove.imageset/Contents.json | 4 +- .../remove.imageset/remove.png | Bin 545 -> 0 bytes .../remove.imageset/remove@2x.png | Bin 875 -> 0 bytes .../remove.imageset/remove@3x.png | Bin 1233 -> 0 bytes .../remove.imageset/toolbar-delete.svg | 14 +++++ .../three-dots.imageset/three-dots.svg | 12 ----- .../toolbar-archive.svg | 14 ++--- .../toolbar-share.imageset/toolbar-share.svg | 14 ++--- .../toolbar-trash.imageset/Contents.json | 2 +- .../toolbar-trash.imageset/toolbar-delete.svg | 14 +++++ .../toolbar-trash.imageset/toolbar-trash.svg | 14 ----- .../toolbar-unarchive.svg | 14 ++--- .../unarchive.imageset/Contents.json | 2 - .../unarchive.imageset/unarchive.png | Bin 549 -> 0 bytes .../unarchive.imageset/unarchive@3x.png | Bin 1229 -> 0 bytes .../utility-menu.imageset/Contents.json | 2 +- .../header-three-dots.svg | 12 +++++ .../utility-menu.imageset/three-dots.svg | 12 ----- 40 files changed, 151 insertions(+), 145 deletions(-) create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-pause.imageset/Contents.json create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-pause.imageset/header-pause.svg rename apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/{three-dots.imageset => header-play.imageset}/Contents.json (71%) rename apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/{headphones.imageset => header-play.imageset}/PlayCircle.svg (100%) create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@2x.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@3x.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/header-label.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/header-notebook.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebook.svg create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/header-reader-settings.svg delete 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/remove.imageset/remove.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/remove@2x.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/remove@3x.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/toolbar-delete.svg delete 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-trash.imageset/toolbar-delete.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-trash.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/unarchive.png delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/unarchive@3x.png create mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/header-three-dots.svg delete mode 100644 apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/three-dots.svg diff --git a/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift b/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift index e3e0ab479..d9966181f 100644 --- a/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift +++ b/apple/OmnivoreKit/Sources/App/Views/BottomBars/CustomToolBar.swift @@ -40,7 +40,7 @@ struct CustomToolBar: View { } .padding(.top, 8) } - .padding(.bottom, 30) + .padding(.bottom, 35) .background(ThemeManager.currentBgColor) } } @@ -54,9 +54,6 @@ struct ToolBarButton: View { 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/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift index b45b610da..606d8a609 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift @@ -20,7 +20,6 @@ struct WebReader: PlatformViewRepresentable { @Binding var showNavBarActionID: UUID? @Binding var shareActionID: UUID? @Binding var annotation: String - @Binding var showBottomBar: Bool @Binding var showHighlightAnnotationModal: Bool func makeCoordinator() -> WebReaderCoordinator { @@ -91,9 +90,6 @@ struct WebReader: PlatformViewRepresentable { context.coordinator.webViewActionHandler = webViewActionHandler context.coordinator.updateNavBarVisibility = navBarVisibilityUpdater context.coordinator.scrollPercentHandler = scrollPercentHandler - context.coordinator.updateShowBottomBar = { newValue in - self.showBottomBar = newValue - } context.coordinator.articleContentID = articleContent.id loadContent(webView: webView) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 9e68ca638..1ea09ef87 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -28,7 +28,6 @@ struct WebReaderContainerView: View { @State var showExpandedAudioPlayer = false @State var shareActionID: UUID? @State var annotation = String() - @State var showBottomBar = true @State private var bottomBarOpacity = 0.0 @State private var errorAlertMessage: String? @State private var showErrorAlertMessage = false @@ -88,7 +87,6 @@ struct WebReaderContainerView: View { private func tapHandler() { withAnimation(.easeIn(duration: 0.08)) { navBarVisible = !navBarVisible - showBottomBar = navBarVisible showNavBarActionID = UUID() } } @@ -112,13 +110,11 @@ struct WebReaderContainerView: View { case "pageTapped": withAnimation { navBarVisible = !navBarVisible - showBottomBar = navBarVisible showNavBarActionID = UUID() } case "dismissNavBars": withAnimation { navBarVisible = false - showBottomBar = false showNavBarActionID = UUID() } default: @@ -160,45 +156,15 @@ struct WebReaderContainerView: View { var textToSpeechButtonImage: some View { if audioController.playbackError || audioController.state == .stopped || audioController.itemAudioProperties?.itemID != self.item.id { - return AnyView(Image.headphones.frame(width: 48, height: 48)) + return AnyView(Image.audioPlay.frame(width: 48, height: 48)) } - let name = audioController.isPlayingItem(itemID: item.unwrappedID) ? "pause.circle" : "play.circle" - return AnyView(Image(systemName: name).font(.appNavbarIcon)) + if audioController.isPlayingItem(itemID: item.unwrappedID) { + return AnyView(Image.audioPause.frame(width: 48, height: 48)) + } + return AnyView(Image.audioPlay.frame(width: 48, height: 48)) } #endif - var bottomButtons: some View { - HStack(alignment: .center) { - Button(action: archive, label: { - item.isArchived ? Image.unarchive : Image.archive - }).frame(width: 48, height: 48) - .padding(.leading, 8) - Divider().opacity(0.8) - - Button(action: delete, label: { - Image.remove - }).frame(width: 48, height: 48) - Divider().opacity(0.8) - - Button(action: editLabels, label: { - Image.label - }).frame(width: 48, height: 48) - Divider().opacity(0.8) - - Button(action: recommend, label: { - Image(systemName: "sparkles") - }).frame(width: 48, height: 48) - - // We don't have a single note function yet -// Divider() -// -// Button(action: addNote, label: { -// Image(systemName: "note") -// }).frame(width: 48, height: 48) - .padding(.trailing, 8) - }.foregroundColor(.appGrayTextContrast) - } - func audioMenuItem() -> some View { Button( action: { @@ -431,7 +397,6 @@ struct WebReaderContainerView: View { showNavBarActionID: $showNavBarActionID, shareActionID: $shareActionID, annotation: $annotation, - showBottomBar: $showBottomBar, showHighlightAnnotationModal: $showHighlightAnnotationModal ) .background(ThemeManager.currentBgColor) @@ -595,13 +560,13 @@ struct WebReaderContainerView: View { if let audioProperties = audioController.itemAudioProperties { MiniPlayerViewer(itemAudioProperties: audioProperties) .padding(.top, 10) - .padding(.bottom, showBottomBar ? 10 : 40) + .padding(.bottom, navBarVisible ? 10 : 40) .background(Color.themeTabBarColor) .onTapGesture { showExpandedAudioPlayer = true } } - if showBottomBar { + if navBarVisible { CustomToolBar( isArchived: item.isArchived, archiveAction: archive, diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift index 98723f486..2436e11fb 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift @@ -20,7 +20,6 @@ final class WebReaderCoordinator: NSObject { var previousShowNavBarActionID: UUID? var previousShareActionID: UUID? var updateNavBarVisibility: (Bool) -> Void = { _ in } - var updateShowBottomBar: (Bool) -> Void = { _ in } var articleContentID = UUID() private var yOffsetAtStartOfDrag: Double? private var lastYOffset: Double = 0 @@ -122,12 +121,6 @@ extension WebReaderCoordinator: WKNavigationDelegate { scrollView.contentInset.top = navBarVisible ? readerViewNavBarHeight : 0 } - if yOffset + scrollView.visibleSize.height > scrollView.contentSize.height - 140 { - updateShowBottomBar(true) - } else { - updateShowBottomBar(false) - } - let percent = Int(((yOffset + scrollView.visibleSize.height) / scrollView.contentSize.height) * 100) scrollPercentHandler(max(0, min(percent, 100))) } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.swift b/apple/OmnivoreKit/Sources/Views/Images/Images.swift index cc286d9e2..8dd6c6fe4 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.swift +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.swift @@ -24,6 +24,9 @@ public extension Image { static var chevronRight: Image { Image("chevron-right", bundle: .module) } static var notebook: Image { Image("notebook", bundle: .module) } static var headphones: Image { Image("headphones", bundle: .module) } + + static var audioPlay: Image { Image("header-play", bundle: .module) } + static var audioPause: Image { Image("header-pause", bundle: .module) } static var readerSettings: Image { Image("reader-settings", bundle: .module) } static var utilityMenu: Image { Image("utility-menu", bundle: .module) } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-pause.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-pause.imageset/Contents.json new file mode 100644 index 000000000..3e1fa6739 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-pause.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "header-pause.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/header-pause.imageset/header-pause.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-pause.imageset/header-pause.svg new file mode 100644 index 000000000..b3de00f7e --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-pause.imageset/header-pause.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-play.imageset/Contents.json similarity index 71% rename from apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/Contents.json rename to apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-play.imageset/Contents.json index 6bb0cfc0c..e0caa008b 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-play.imageset/Contents.json @@ -1,11 +1,11 @@ { "images" : [ { - "filename" : "three-dots.svg", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "PlayCircle.svg", "idiom" : "universal", "scale" : "2x" }, @@ -17,5 +17,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/PlayCircle.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-play.imageset/PlayCircle.svg similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/PlayCircle.svg rename to apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/header-play.imageset/PlayCircle.svg 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 e0caa008b..526236fd4 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,15 +1,17 @@ { "images" : [ { + "filename" : "headphones.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "PlayCircle.svg", + "filename" : "headphones@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "headphones@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000000000000000000000000000000000000..5fe6dcdfa4d769f4e0645a2df12a118de8631467 GIT binary patch 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{ literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..97d977df09ee09e867646854d0a7641891fe658e GIT binary patch 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 literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..dfe1b2c22f1f4ad654ceabd5004e1bb911c30c30 GIT binary patch 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^ zA + + + + + + + + + + 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 deleted file mode 100644 index 8d3ff6758..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - 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 4312ae5d7..5b7ff0d2c 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 @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "notebook.svg", + "filename" : "header-notebook.svg", "idiom" : "universal", "scale" : "2x" }, diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/header-notebook.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/header-notebook.svg new file mode 100644 index 000000000..35a023b01 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/header-notebook.svg @@ -0,0 +1,10 @@ + + + + + + + + + + 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 deleted file mode 100644 index e034c7b32..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebook.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/Contents.json index ed54ef068..47f6ec866 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "reader-settings.svg", + "filename" : "header-reader-settings.svg", "idiom" : "universal", "scale" : "2x" }, diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/header-reader-settings.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/header-reader-settings.svg new file mode 100644 index 000000000..53467d960 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/header-reader-settings.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.svg deleted file mode 100644 index b3f174318..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/Contents.json index a02d05dc2..67d103d43 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/Contents.json @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "remove.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "remove@2x.png", + "filename" : "toolbar-delete.svg", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "remove@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/remove.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/remove.png deleted file mode 100644 index 6f0731f80b742a564c74f2256ffee6c66e6e1676..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmV++0^a?JP)}{;FE!&^=)l2)TBw& zFNZg?X|vhnWjC7*(SJkWYB(4S;w;Oenp!Rv3+Xc7i3lVqKIghIkY9l;u`EF+HiKTT zCzvG9^C{$69c#5(voH*=@tfGzu@Y4Xf*_sG=ZUI=rz_X_--t>NR1|%96KTe@dfmAl zoY8PN9PM_y8T}F}$-S|aRf2{J)G3w?!EIun(# z_su%Njj5WO&gdsZjW7{OZmLWw?^dcFG?L|&OO4VO)KEzpt2g3acvar53v~>&Y+SSL znli2!*D1H#EkATz`vf_{R!OuTbvhln*=!^V>;pgHWG4~yd4X?CHpZu%&j;b)C&Nm_ jS&Fbt5Kep5KEf9t^+Kl-MOYxl00000NkvXXu0mjfoHXNe diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/remove@2x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/remove@2x.png deleted file mode 100644 index 6506db813e3924e43003a9766734b591cca35beb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 875 zcmV-x1C;!UP)1a^H})oZodkVQdreK;JxuU0Efp73T& zr_;G9l}hvD@mP0IV}suNGN?@ccyu&`QRQ;^kv!pLW?HS*01q_}E;W7+NjjLtu`wRA z^VY}gyduxw0rhgZoFujDcDsEPgWyup@0ai*e7f0Rr!Xe3B(51OZk5#L>guY#-|tT{ z7Is~tV}szKl61D)?M7?8iE9%Z&9HZTMDdmK!)UQs%%Un|-3*awNco~4R~hSOaG42; zYn00D36M9CW2f5(?5_5hD4yWT_pv%80DHnMI{wTu$}iYQZYg8h?e+{tdZ5EQPBj0{1GbR>=J&S03LoFXy?zG}~mq6={L(zHZJWK5+}$$Y_wpp3wK zj6^|X%vnaO;@b9ly)hQ=oWF0v>QOfg>hDNM(q?H8r!zr#Ji%X-VQret<_*@@6m17^ zlSxEBcU%u~61D4}-Pa^UY>XYzs?}puwepJ+xe84GdTunk;W=4k%mM6rMr=R9CnqmNf#i5 z1oV5zmBy3McxE1x3CvGIW=4r)e|~=RK96mpOeT}bWHOn|G-%KiSXo(7&1Ulh{_Wh| z-7SzKjYdOb@#Ey=q)(BFF4+3|`qu63?JmhsU|sLd&dxMNqDc{1TU*-{6pQH~Qom6| zS`?9`r6t}u=TmS3ud&|q!C+8O1YS@ikhi*6D6_^x zexwA!AkoEQ$Li*7EnK~<^C($ftkbKjtDE+y=Q`rV0)ti8?&GMco9Iovb69z4#zfH! z;Ug9klJrM@kZUwb5Tp)eb!qY>L@;f4prB1sFfMe>HU!kpOLG8+)^4|(E!O&|Gcczu0scPpw1hI%&eTpJC! zAg(jF$X=FfKSaoW$RzHV5xzFw5mpq%$dA^Y#V(6qo^oRkw~5?$IBA6aXZ*3VT`c!d z2iEen4_pn=L-1DBqJSR$@xi1 zAIXT0l1yrTQqo7>ua5$Fj(##ouvzevl0K3VkFW&&q%s>JK9UI%jQ!-8Zbb@P_(^sMsKR^rF3%d##l=ORCUAOsx{H}2&G*GZyrY_T3MsP@>LZz8 z!F=Z@%X!FMasZ+oU~xd6g!)J(_>@f5Pdo)BFNy$<&ip=%2S(|)5)mdQSb4wKPf8F7_!TwWHVGj1 z8iv7O@OyD_@f`VVgAxMUbA-rxPeO=3YlP~(k9^i6fdWwij;!P3;~oj}Xs?ptx1iwY vdcR*M0FA$W9JqeWSIlHGnM@{=$vE;Ct|`A8{)FGC00000NkvXXu0mjfrLZ}G diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/toolbar-delete.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/toolbar-delete.svg new file mode 100644 index 000000000..7e4f7cde8 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/remove.imageset/toolbar-delete.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + 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 deleted file mode 100644 index 33739e0df..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/three-dots.imageset/three-dots.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - 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 index d7aa31afc..b3bf4ff3b 100644 --- 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 @@ -1,12 +1,12 @@ - - - - - + + + + + - - + + 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 index fc66c9a79..6473f98ab 100644 --- 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 @@ -1,12 +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 index 98255c5a5..67d103d43 100644 --- 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 @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "toolbar-trash.svg", + "filename" : "toolbar-delete.svg", "idiom" : "universal", "scale" : "2x" }, diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-delete.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-delete.svg new file mode 100644 index 000000000..7e4f7cde8 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-delete.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + 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 deleted file mode 100644 index 969b27c68..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/toolbar-trash.imageset/toolbar-trash.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - 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 index d7d6fd0ae..1739db681 100644 --- 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 @@ -1,13 +1,13 @@ - - - - - + + + + + - - + + diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/Contents.json index 1c4647938..a8c7a9385 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "unarchive.png", "idiom" : "universal", "scale" : "1x" }, @@ -11,7 +10,6 @@ "scale" : "2x" }, { - "filename" : "unarchive@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/unarchive.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/unarchive.png deleted file mode 100644 index 0916874576fd88e0479393acae8bcd3cf2c4d057..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 549 zcmV+=0^0qFP)eo)#|BSE;G3g=|hGPPUtn}`TrQ-cZ^>k z;{Qkq$q|So*R!Z nX2=a%;+{?keK$_%AHRVQfLhk0l&id600000NkvXXu0mjf5!dNv diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/unarchive@3x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/unarchive.imageset/unarchive@3x.png deleted file mode 100644 index 4a45a4d94b689a656bb60d51f1ad0e3d535484fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1229 zcmV;;1Ty=HP)`aF3O9Gst@ zk7FKGRkd!4YA_u^4+k>=YoqaPyG7Q7^($Z2=J@%T^ z@Py2LtUl1Q+{!_uq+NWbpB0`u-HIKobnH9R$5&p_xqM4Dv(8Ve(ns^#r{cFc zTH%S1IIKvP*5Ig?Fhw1e7aeIKl?*P>XUN*u+4mi3a&vPNUteDzEiW%~7>8tjZ`i`} z5y$zCS|$w915urhX4gl#pz#v`U2W&^PzXAZu4~Q*WiTN`ztPnABLMT1=)Tl*QccCG#Ri2ogsLQYOHp-g}lw zWv!$No4XuV3S(@QX00&BMrl?HV{DUVy)ecmX-)`ZY?0=SFlL_8aGZz?a7q|sB8~H4 z^)j`IpB9-uH*iiEVL%bMM=1|zO9ki9%a|`4Q_dI43JDW4 z1&8D|xug|+b%tNk>XRdgIjxbjIahcVZY3dY0BI{^@!PlJIp+b7QWWiS6beZheklQ~ zo_HgyP1VC;_Vf1k_G=VHFAs-{y!by?VJ?v-4UNPR9y0Hx<*Qv!UzfCg8lpp4`7dk< roAA1%aidUVG}hzscsw4DCkKB4K^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 deleted file mode 100644 index 33739e0df..000000000 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/three-dots.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - -