diff --git a/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift b/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift index ff1735c70..e732f7536 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift @@ -15,7 +15,7 @@ struct HighlightsListView: View { var emptyView: some View { Text(""" - You have not added any highlights to this page. + You have not added any highlights or notes to this page. """) .multilineTextAlignment(.center) .padding(16) @@ -23,7 +23,7 @@ struct HighlightsListView: View { var innerBody: some View { (viewModel.highlightItems.count > 0 ? AnyView(listView) : AnyView(emptyView)) - .navigationTitle("Highlights & Notes") + .navigationTitle("Notebook") .listStyle(PlainListStyle()) #if os(iOS) .navigationBarTitleDisplayMode(.inline) diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 0db963073..fed934868 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -271,12 +271,10 @@ import Views func menuItems(for item: LinkedItem) -> some View { Group { - if (item.highlights?.count ?? 0) > 0 { - Button( - action: { viewModel.itemForHighlightsView = item }, - label: { Label("View Highlights & Notes", systemImage: "highlighter") } - ) - } + Button( + action: { viewModel.itemForHighlightsView = item }, + label: { Label("Notebook", systemImage: "highlighter") } + ) Button( action: { viewModel.itemUnderTitleEdit = item }, label: { Label("Edit Info", systemImage: "info.circle") } diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 311cf6830..748246a6a 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -177,14 +177,11 @@ struct WebReaderContainerView: View { func menuItems(for item: LinkedItem) -> some View { let hasLabels = item.labels?.count == 0 - let hasHighlights = (item.highlights?.count ?? 0) > 0 return Group { - if hasHighlights { - Button( - action: { showHighlightsView = true }, - label: { Label("View Highlights & Notes", systemImage: "highlighter") } - ) - } + Button( + action: { showHighlightsView = true }, + label: { Label("Notebook", systemImage: "highlighter") } + ) Button( action: { showTitleEdit = true }, label: { Label("Edit Info", systemImage: "info.circle") } diff --git a/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift b/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift index 4f9246d1e..563bab9f5 100644 --- a/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift +++ b/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift @@ -45,12 +45,10 @@ public struct GridCard: View { var contextMenuView: some View { Group { - if (item.highlights?.count ?? 0) > 0 { - Button( - action: { menuActionHandler(.viewHighlights) }, - label: { Label("View Highlights & Notes", systemImage: "highlighter") } - ) - } + Button( + action: { menuActionHandler(.viewHighlights) }, + label: { Label("Notebook", systemImage: "highlighter") } + ) Button( action: { menuActionHandler(.editTitle) }, label: { Label("Edit Info", systemImage: "info.circle") }