diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Contents.json b/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Contents.json deleted file mode 100644 index 73c00596a..000000000 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Hotpot.imageset/Contents.json b/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Hotpot.imageset/Contents.json deleted file mode 100644 index f27546ced..000000000 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Hotpot.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "Hotpot.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Hotpot.imageset/Hotpot.png b/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Hotpot.imageset/Hotpot.png deleted file mode 100644 index db6f271c4..000000000 Binary files a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/Hotpot.imageset/Hotpot.png and /dev/null differ diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/notebook.imageset/Contents.json b/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/notebook.imageset/Contents.json deleted file mode 100644 index f1bc63759..000000000 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/notebook.imageset/Contents.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "images" : [ - { - "filename" : "notebook.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/notebook.imageset/notebook.svg b/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/notebook.imageset/notebook.svg deleted file mode 100644 index a9a6bb068..000000000 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/Media.xcassets/notebook.imageset/notebook.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 698fba525..262c64bb1 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -204,10 +204,6 @@ struct WebReaderContainerView: View { func menuItems(for item: LinkedItem) -> some View { let hasLabels = item.labels?.count != 0 return Group { - Button( - action: { showNotebookView = true }, - label: { Label("Notebook", systemImage: "highlighter") } - ) Button( action: { showTitleEdit = true }, label: { Label("Edit Info", systemImage: "info.circle") } @@ -268,6 +264,7 @@ struct WebReaderContainerView: View { label: { Image(systemName: "chevron.backward") .font(.appNavbarIcon) + // .foregroundColor(.appGrayTextContrast) .padding() } ) @@ -285,9 +282,9 @@ struct WebReaderContainerView: View { .padding(.horizontal) .scaleEffect(navBarVisibilityRatio) Button( - action: { showNotebookView.toggle() }, + action: { showNotebookView = true }, label: { - Image("notebook", bundle: Bundle.module) + Image("notebook", bundle: Bundle(url: ViewsPackage.bundleURL)) } ) .padding(.horizontal) @@ -304,6 +301,7 @@ struct WebReaderContainerView: View { Image(systemName: "ellipsis") .resizable(resizingMode: Image.ResizingMode.stretch) .aspectRatio(contentMode: .fit) + // .foregroundColor(.appGrayTextContrast) .frame(width: 20, height: 20) .scaleEffect(navBarVisibilityRatio) .padding()