FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to have mark as read be the default action on timeline swiping instead of starred

Browse Source
This commit is contained in:
Maurice Parker 2019-04-29 06:01:53 -05:00
parent 96054b1b4e
commit ffc364f7cf
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -126,23 +126,6 @@ class MasterTimelineViewController: ProgressTableViewController, UndoableCommand
return nil return nil
} }
// Set up the star action
let starTitle = article.status.starred ?
NSLocalizedString("Unstar", comment: "Unstar") :
NSLocalizedString("Star", comment: "Star")
let starAction = UIContextualAction(style: .normal, title: starTitle) { [weak self] (action, view, completionHandler) in
guard let undoManager = self?.undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: [article], markingStarred: !article.status.starred, undoManager: undoManager) else {
return
}
self?.runCommand(markReadCommand)
completionHandler(true)
}
starAction.image = AppAssets.starClosedImage
starAction.backgroundColor = AppAssets.starColor
// Set up the read action // Set up the read action
let readTitle = article.status.read ? let readTitle = article.status.read ?
NSLocalizedString("Unread", comment: "Unread") : NSLocalizedString("Unread", comment: "Unread") :
@ -160,7 +143,24 @@ class MasterTimelineViewController: ProgressTableViewController, UndoableCommand
readAction.image = AppAssets.circleClosedImage readAction.image = AppAssets.circleClosedImage
readAction.backgroundColor = AppAssets.timelineUnreadCircleColor readAction.backgroundColor = AppAssets.timelineUnreadCircleColor
let configuration = UISwipeActionsConfiguration(actions: [starAction, readAction]) // Set up the star action
let starTitle = article.status.starred ?
NSLocalizedString("Unstar", comment: "Unstar") :
NSLocalizedString("Star", comment: "Star")
let starAction = UIContextualAction(style: .normal, title: starTitle) { [weak self] (action, view, completionHandler) in
guard let undoManager = self?.undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: [article], markingStarred: !article.status.starred, undoManager: undoManager) else {
return
}
self?.runCommand(markReadCommand)
completionHandler(true)
}
starAction.image = AppAssets.starClosedImage
starAction.backgroundColor = AppAssets.starColor
let configuration = UISwipeActionsConfiguration(actions: [readAction, starAction])
return configuration return configuration
} }