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 5fe6dcdfa..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones.png and /dev/null differ 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 97d977df0..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@2x.png and /dev/null differ 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 dfe1b2c22..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/headphones.imageset/headphones@3x.png and /dev/null differ diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/Contents.json index 57d38850f..fbd23f894 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/Contents.json @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "label.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "label@2x.png", + "filename" : "label.svg", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "label@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.png deleted file mode 100644 index caadbf431..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label.png and /dev/null differ 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 11cb17298..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@2x.png and /dev/null differ 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 3bea0685f..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/label.imageset/label@3x.png and /dev/null differ 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 99669636d..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks.png and /dev/null differ diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@2x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@2x.png deleted file mode 100644 index efe587e07..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@2x.png and /dev/null differ diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@3x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@3x.png deleted file mode 100644 index f8cc77e31..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/notebook.imageset/notebooks@3x.png and /dev/null differ 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 875c3056b..ed54ef068 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 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "reader-settings.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "reader-settings@2x.png", + "filename" : "reader-settings.svg", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "reader-settings@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.png deleted file mode 100644 index 7b800592d..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.png and /dev/null differ 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 new file mode 100644 index 000000000..b3f174318 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings.svg @@ -0,0 +1,3 @@ + + + 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 d965379a6..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@2x.png and /dev/null differ diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@3x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@3x.png deleted file mode 100644 index 720b4636c..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/reader-settings.imageset/reader-settings@3x.png and /dev/null differ 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 041425b60..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu.png and /dev/null differ diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@2x.png b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@2x.png deleted file mode 100644 index da622ac13..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@2x.png and /dev/null differ 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 a4ced564a..000000000 Binary files a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/utility-menu.imageset/utility-menu@3x.png and /dev/null differ diff --git a/apple/OmnivoreKit/Sources/Views/Theme.swift b/apple/OmnivoreKit/Sources/Views/Theme.swift index 31ddec76f..e4b9147a9 100644 --- a/apple/OmnivoreKit/Sources/Views/Theme.swift +++ b/apple/OmnivoreKit/Sources/Views/Theme.swift @@ -31,6 +31,10 @@ public enum Theme: String, CaseIterable { } } + public var toolbarColor: Color { + ThemeManager.currentTheme.isDark ? Color.themeDarkWhiteGray : Color.themeMiddleGray + } + public var highlightColor: Color { switch self { case .light, .sepia: