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

Move business logic out of controller into coordinator where we typically keep it

Browse Source
This commit is contained in:
Maurice Parker 2019-08-19 16:03:07 -05:00
parent 6087951824
commit 40a80356f1
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
iOS/AppCoordinator.swift
View File

@ -555,18 +555,50 @@ class AppCoordinator: NSObject, UndoableCommandRunner {
masterNavigationController.popViewController(animated: true)
}
func markAsReadOlderArticlesInTimeline(_ indexPath: IndexPath) {
let article = articles[indexPath.row]
let articlesToMark = articles.filter { $0.logicalDatePublished < article.logicalDatePublished }
if articlesToMark.isEmpty {
return
}
guard let undoManager = undoManager, let markReadCommand = MarkStatusCommand(initialArticles: articlesToMark, markingRead: true, undoManager: undoManager) else {
return
}
runCommand(markReadCommand)
}
func toggleReadForCurrentArticle() {
if let article = currentArticle {
markArticles(Set([article]), statusKey: .read, flag: !article.status.read)
}
}
func toggleRead(for indexPath: IndexPath) {
let article = articles[indexPath.row]
guard let undoManager = undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: [article], markingRead: !article.status.read, undoManager: undoManager) else {
return
}
runCommand(markReadCommand)
}
func toggleStarForCurrentArticle() {
if let article = currentArticle {
markArticles(Set([article]), statusKey: .starred, flag: !article.status.starred)
}
}
func toggleStar(for indexPath: IndexPath) {
let article = articles[indexPath.row]
guard let undoManager = undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: [article], markingStarred: !article.status.starred, undoManager: undoManager) else {
return
}
runCommand(markReadCommand)
}
func discloseFeed(_ feed: Feed) {
masterNavigationController.popViewController(animated: true)
masterFeedViewController.discloseFeed(feed)

42
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -130,7 +130,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
NSLocalizedString("Read", comment: "Read")
let readAction = UIContextualAction(style: .normal, title: readTitle) { [weak self] (action, view, completionHandler) in
self?.toggleArticleReadStatus(article)
self?.coordinator.toggleRead(for: indexPath)
completionHandler(true)
}
@ -143,7 +143,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
NSLocalizedString("Star", comment: "Star")
let starAction = UIContextualAction(style: .normal, title: starTitle) { [weak self] (action, view, completionHandler) in
self?.toggleArticleStarStatus(article)
self?.coordinator.toggleStar(for: indexPath)
completionHandler(true)
}
@ -491,34 +491,6 @@ private extension MasterTimelineViewController {
}
}
func toggleArticleReadStatus(_ article: Article) {
guard let undoManager = undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: [article], markingRead: !article.status.read, undoManager: undoManager) else {
return
}
runCommand(markReadCommand)
}
func toggleArticleStarStatus(_ article: Article) {
guard let undoManager = undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: [article], markingStarred: !article.status.starred, undoManager: undoManager) else {
return
}
runCommand(markReadCommand)
}
func markOlderArticlesRead(_ article: Article) {
let articlesToMark = coordinator.articles.filter { $0.logicalDatePublished < article.logicalDatePublished }
if articlesToMark.isEmpty {
return
}
guard let undoManager = undoManager, let markReadCommand = MarkStatusCommand(initialArticles: articlesToMark, markingRead: true, undoManager: undoManager) else {
return
}
runCommand(markReadCommand)
}
func toggleArticleReadStatusAction(indexPath: IndexPath) -> UIAction {
let article = coordinator.articles[indexPath.row]
@ -528,7 +500,7 @@ private extension MasterTimelineViewController {
let image = article.status.read ? AppAssets.circleClosedImage : AppAssets.circleOpenImage
let action = UIAction(title: title, image: image) { [weak self] action in
self?.toggleArticleReadStatus(article)
self?.coordinator.toggleRead(for: indexPath)
}
return action
@ -543,27 +515,25 @@ private extension MasterTimelineViewController {
let image = article.status.starred ? AppAssets.starOpenImage : AppAssets.starClosedImage
let action = UIAction(title: title, image: image) { [weak self] action in
self?.toggleArticleStarStatus(article)
self?.coordinator.toggleStar(for: indexPath)
}
return action
}
func markOlderAsReadAction(indexPath: IndexPath) -> UIAction {
let article = coordinator.articles[indexPath.row]
let title = NSLocalizedString("Mark Older as Read", comment: "Mark Older as Read")
let image = coordinator.sortDirection == .orderedDescending ? AppAssets.markOlderAsReadDownImage : AppAssets.markOlderAsReadUpImage
let action = UIAction(title: title, image: image) { [weak self] action in
self?.markOlderArticlesRead(article)
self?.coordinator.markAsReadOlderArticlesInTimeline(indexPath)
}
return action
}
func markOlderAsReadAlertAction(indexPath: IndexPath, completionHandler: @escaping (Bool) -> Void) -> UIAlertAction {
let article = coordinator.articles[indexPath.row]
let title = NSLocalizedString("Mark Older as Read", comment: "Mark Older as Read")
let action = UIAlertAction(title: title, style: .default) { [weak self] action in
self?.markOlderArticlesRead(article)
self?.coordinator.markAsReadOlderArticlesInTimeline(indexPath)
completionHandler(true)
}
return action