renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement mark as unread window for accounts that need it. Issue #1407

Browse Source
This commit is contained in:
Maurice Parker
2020-02-18 13:49:29 -08:00
parent 8acd6a039a
commit 0e72811429
7 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@@ -217,7 +217,8 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
override func tableView(_ tableView: UITableView, leadingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
guard let article = dataSource.itemIdentifier(for: indexPath) else { return nil }
guard !article.status.read || article.isAvailableToMarkUnread else { return nil }
// Set up the read action
let readTitle = article.status.read ?
NSLocalizedString("Unread", comment: "Unread") :
@@ -314,7 +315,10 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
guard let self = self else { return nil }
var actions = [UIAction]()
actions.append(self.toggleArticleReadStatusAction(article))
if let action = self.toggleArticleReadStatusAction(article) {
actions.append(action)
}
actions.append(self.toggleArticleStarStatusAction(article))
if let action = self.markAboveAsReadAction(article) {
@@ -672,8 +676,9 @@ private extension MasterTimelineViewController {
return nil
}
func toggleArticleReadStatusAction(_ article: Article) -> UIAction {
func toggleArticleReadStatusAction(_ article: Article) -> UIAction? {
guard !article.status.read || article.isAvailableToMarkUnread else { return nil }
let title = article.status.read ?
NSLocalizedString("Mark as Unread", comment: "Mark as Unread") :
NSLocalizedString("Mark as Read", comment: "Mark as Read")