prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better naming, add use:folders option

Browse source
This commit is contained in:
Jackson Harper 2023-12-04 15:54:21 +08:00
parent 6959f57fbe
commit 2a1336089d
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryFeatureCardNavigationLink.swift
View file

@ -51,7 +51,7 @@ struct LibraryFeatureCardNavigationLink: View {
viewModel.setLinkArchived(dataService: dataService, objectID: item.objectID, archived: true)
})
Button("Remove", action: {
viewModel.removeLink(dataService: dataService, objectID: item.objectID)
viewModel.removeLibraryItem(dataService: dataService, objectID: item.objectID)
})
if FeaturedItemFilter(rawValue: viewModel.featureFilter) != .pinned {
Button("Mark Read", action: {

1
apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryItemFetcher.swift
View file

@ -246,6 +246,7 @@ import Views
}.joined(separator: ","))
}
query.append(" use:folders")
print("QUERY: `\(query)`")
return query

4
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift
View file

@ -731,7 +731,7 @@ struct AnimatingCellHeight: AnimatableModifier {
case .delete:
return AnyView(Button(
action: {
viewModel.removeLink(dataService: dataService, objectID: item.objectID)
viewModel.removeLibraryItem(dataService: dataService, objectID: item.objectID)
},
label: {
Label("Remove", systemImage: "trash")
@ -768,7 +768,7 @@ struct AnimatingCellHeight: AnimatableModifier {
case .toggleArchiveStatus:
viewModel.setLinkArchived(dataService: dataService, objectID: item.objectID, archived: !item.isArchived)
case .delete:
viewModel.removeLink(dataService: dataService, objectID: item.objectID)
viewModel.removeLibraryItem(dataService: dataService, objectID: item.objectID)
case .editLabels:
viewModel.itemUnderLabelEdit = item
case .editTitle:

2
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift
View file

@ -143,7 +143,7 @@ import Views
Button("Remove Link", role: .destructive) {
if let itemToRemove = itemToRemove {
withAnimation {
viewModel.removeLink(dataService: dataService, objectID: itemToRemove.objectID)
viewModel.removeLibraryItem(dataService: dataService, objectID: itemToRemove.objectID)
self.itemToRemove = nil
}
}

4
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift
View file

@ -17,8 +17,6 @@ import Views
@Published var itemUnderLabelEdit: Models.LibraryItem?
@Published var itemUnderTitleEdit: Models.LibraryItem?
@Published var itemForHighlightsView: Models.LibraryItem?
@Published var snoozePresented = false
@Published var itemToSnoozeID: String?
@Published var linkRequest: LinkRequest?
@Published var presentWebContainer = false
@Published var showLoadingBar = false
@ -193,7 +191,7 @@ import Views
snackbar(archived ? "Link archived" : "Link moved to Inbox")
}
func removeLink(dataService: DataService, objectID: NSManagedObjectID) {
func removeLibraryItem(dataService: DataService, objectID: NSManagedObjectID) {
removeLibraryItemAction(dataService: dataService, objectID: objectID)
}