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

Stashing

Browse Source
This commit is contained in:
Bryan Culver
2022-11-21 22:06:45 -05:00
parent 405b40e346
commit 7eacc878d2
12 changed files with 153 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
iOS/MasterFeed/MasterFeedViewController.swift
View File

@@ -905,16 +905,12 @@ private extension MasterFeedViewController {
menuElements.append(UIMenu(title: "", options: .displayInline, children: pageActions))
}
var markActions = [UIAction]()
if let markAllAction = self.markAllAsReadAction(indexPath: indexPath) {
markActions.append(markAllAction)
}
if !markActions.isEmpty {
menuElements.append(UIMenu(title: "", options: .displayInline, children: markActions))
menuElements.append(UIMenu(title: "", options: .displayInline, children: [markAllAction]))
}
if let catchUpAction = self.catchUpAction(indexPath: indexPath) {
if let catchUpAction = self.catchUpActionMenu(indexPath: indexPath) {
menuElements.append(catchUpAction)
}
@@ -1148,60 +1144,66 @@ private extension MasterFeedViewController {
return action
}
func catchUpAction(indexPath: IndexPath) -> UIMenu? {
func catchUpActionMenu(indexPath: IndexPath) -> UIMenu? {
guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
let contentView = self.tableView.cellForRow(at: indexPath)?.contentView,
feed.unreadCount > 0 else {
return nil
}
let localizedMenuText = NSLocalizedString("Mark Older Than as Read...", comment: "Command")
let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, feed.nameForDisplay) as String
let title = NSLocalizedString("Mark Older Than as Read...", comment: "Command")
let oneDayAction = UIAction(title: "1 Day") { [weak self] action in
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
if let articles = try? feed.fetchUnreadArticles() {
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 1 Day as Read", sourceType: contentView) { [weak self] in
let cutoff = Calendar.current.date(byAdding: .day, value: -1, to: Date())
if let articles = try? feed.fetchUnreadArticlesBetween(before: cutoff, after: nil) {
self?.coordinator.markAllAsRead(Array(articles))
}
}
}
let twoDayAction = UIAction(title: "2 Days") { [weak self] action in
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
if let articles = try? feed.fetchUnreadArticles() {
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 2 Days as Read", sourceType: contentView) { [weak self] in
let cutoff = Calendar.current.date(byAdding: .day, value: -2, to: Date())
if let articles = try? feed.fetchUnreadArticlesBetween(before: cutoff, after: nil) {
self?.coordinator.markAllAsRead(Array(articles))
}
}
}
let threeDayAction = UIAction(title: "3 Days") { [weak self] action in
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
if let articles = try? feed.fetchUnreadArticles() {
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 3 Days as Read", sourceType: contentView) { [weak self] in
let cutoff = Calendar.current.date(byAdding: .day, value: -3, to: Date())
if let articles = try? feed.fetchUnreadArticlesBetween(before: cutoff, after: nil) {
self?.coordinator.markAllAsRead(Array(articles))
}
}
}
let oneWeekAction = UIAction(title: "1 Week") { [weak self] action in
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
if let articles = try? feed.fetchUnreadArticles() {
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 1 Week as Read", sourceType: contentView) { [weak self] in
let cutoff = Calendar.current.date(byAdding: .weekOfYear, value: -1, to: Date())
if let articles = try? feed.fetchUnreadArticlesBetween(before: cutoff, after: nil) {
self?.coordinator.markAllAsRead(Array(articles))
}
}
}
let twoWeekAction = UIAction(title: "2 Weeks") { [weak self] action in
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
if let articles = try? feed.fetchUnreadArticles() {
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 2 Weeks as Read", sourceType: contentView) { [weak self] in
let cutoff = Calendar.current.date(byAdding: .weekOfYear, value: -2, to: Date())
if let articles = try? feed.fetchUnreadArticlesBetween(before: cutoff, after: nil) {
self?.coordinator.markAllAsRead(Array(articles))
}
}
}
let oneMonthAction = UIAction(title: "1 Month") { [weak self] action in
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
if let articles = try? feed.fetchUnreadArticles() {
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 1 Month as Read", sourceType: contentView) { [weak self] in
let cutoff = Calendar.current.date(byAdding: .month, value: -1, to: Date())
if let articles = try? feed.fetchUnreadArticlesBetween(before: cutoff, after: nil) {
self?.coordinator.markAllAsRead(Array(articles))
}
}
}
let oneYearAction = UIAction(title: "1 Year") { [weak self] action in
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
if let articles = try? feed.fetchUnreadArticles() {
MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 1 Year as Read", sourceType: contentView) { [weak self] in
let cutoff = Calendar.current.date(byAdding: .year, value: -1, to: Date())
if let articles = try? feed.fetchUnreadArticlesBetween(before: cutoff, after: nil) {
self?.coordinator.markAllAsRead(Array(articles))
}
}

27
iOS/MasterTimeline/MarkAsReadAlertController.swift
View File

@@ -46,30 +46,23 @@ struct MarkAsReadAlertController {
completion: @escaping (UIAlertAction) -> Void) -> UIAlertController where T: MarkAsReadAlertControllerSourceType {
let title = NSLocalizedString("Mark as Read", comment: "Catch Up")
let message = NSLocalizedString("Mark articles as read older than",
comment: "Mark articles as read older than")
let title = NSLocalizedString("Mark As Read", comment: "Mark As Read")
let message = NSLocalizedString("You can turn this confirmation off in Settings.",
comment: "You can turn this confirmation off in Settings.")
let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
let settingsTitle = NSLocalizedString("Open Settings", comment: "Open Settings")
let alertController = UIAlertController(title: title, message: message, preferredStyle: .actionSheet)
let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel) { _ in
cancelCompletion?()
}
let oneDayAction = UIAlertAction(title: "1 Day", style: .default, handler: completion)
let twoDaysAction = UIAlertAction(title: "2 Days", style: .default, handler: completion)
let threeDaysAction = UIAlertAction(title: "3 Days", style: .default, handler: completion)
let oneWeekAction = UIAlertAction(title: "1 Week", style: .default, handler: completion)
let twoWeeksAction = UIAlertAction(title: "2 Weeks", style: .default, handler: completion)
let oneMonthAction = UIAlertAction(title: "1 Month", style: .default, handler: completion)
let oneYearAction = UIAlertAction(title: "1 Year", style: .default, handler: completion)
let settingsAction = UIAlertAction(title: settingsTitle, style: .default) { _ in
coordinator.showSettings(scrollToArticlesSection: true)
}
let markAction = UIAlertAction(title: confirmTitle, style: .default, handler: completion)
alertController.addAction(oneDayAction)
alertController.addAction(twoDaysAction)
alertController.addAction(threeDaysAction)
alertController.addAction(oneWeekAction)
alertController.addAction(twoWeeksAction)
alertController.addAction(oneMonthAction)
alertController.addAction(oneYearAction)
alertController.addAction(markAction)
alertController.addAction(settingsAction)
alertController.addAction(cancelAction)
if let barButtonItem = sourceType as? UIBarButtonItem {