FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-14 18:45:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement starred toolbar toggle

Browse Source
This commit is contained in:
Maurice Parker 2020-07-25 16:12:12 -05:00
parent f793e1b02d
commit d28a672378
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiplatform/Shared/SceneModel.swift
View File

@ -73,7 +73,7 @@ final class SceneModel: ObservableObject {
/// Toggles the star status for the selected articles /// Toggles the star status for the selected articles
func toggleStarredStatusForSelectedArticles() { func toggleStarredStatusForSelectedArticles() {
// timelineModel.toggleStarredStatusForSelectedArticles() timelineModel.toggleStarredStatusForSelectedArticlesSubject.send()
} }
/// Opens the selected article in an external browser /// Opens the selected article in an external browser

15
Multiplatform/Shared/Timeline/TimelineModel.swift
View File

@ -37,7 +37,7 @@ class TimelineModel: ObservableObject, UndoableCommandRunner {
var articleStatusChangePublisher: AnyPublisher<Set<String>, Never>? var articleStatusChangePublisher: AnyPublisher<Set<String>, Never>?
var toggleReadStatusForSelectedArticlesSubject = PassthroughSubject<Void, Never>() var toggleReadStatusForSelectedArticlesSubject = PassthroughSubject<Void, Never>()
var toggleStarredStatusForSelectedArticlesSubject = PassthroughSubject<Void, Never>()
var readFilterEnabledTable = [FeedIdentifier: Bool]() var readFilterEnabledTable = [FeedIdentifier: Bool]()
@ -270,8 +270,21 @@ private extension TimelineModel {
return (selectedArticles, ArticleStatus.Key.read, false) return (selectedArticles, ArticleStatus.Key.read, false)
} }
} }
let toggleStarred = toggleStarredStatusForSelectedArticlesSubject
.withLatestFrom(selectedArticlesPublisher)
.filter { !$0.isEmpty }
.map {selectedArticles -> ([Article], ArticleStatus.Key, Bool) in
if selectedArticles.anyArticleIsUnstarred() {
return (selectedArticles, ArticleStatus.Key.starred, true)
} else {
return (selectedArticles, ArticleStatus.Key.read, false)
}
}
toggleReadPublisher toggleReadPublisher
.merge(with: toggleStarred)
.sink { [weak self] (articles, key, flag) in .sink { [weak self] (articles, key, flag) in
if let undoManager = self?.undoManager, if let undoManager = self?.undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: articles, statusKey: key, flag: flag, undoManager: undoManager) { let markReadCommand = MarkStatusCommand(initialArticles: articles, statusKey: key, flag: flag, undoManager: undoManager) {