diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index b67f10559..aeac5c7bc 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -94,4 +94,20 @@ struct AppAssets { return RSImage(named: NSImage.smartBadgeTemplateName)! }() + static var swipeMarkReadImage: RSImage = { + return RSImage(named: "swipeMarkRead")! + }() + + static var swipeMarkUnreadImage: RSImage = { + return RSImage(named: "swipeMarkUnread")! + }() + + static var swipeMarkStarredImage: RSImage = { + return RSImage(named: "swipeMarkStarred")! + }() + + static var swipeMarkUnstarredImage: RSImage = { + return RSImage(named: "swipeMarkUnstarred")! + }() + } diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift index 144a9369c..422476b9f 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineViewController.swift @@ -779,19 +779,19 @@ extension TimelineViewController: NSTableViewDelegate { switch edge { case .leading: - let title = article.status.read ? NSLocalizedString("Mark Unread", comment: "mark unread") : NSLocalizedString("Mark Read", comment: "mark read") - let action = NSTableViewRowAction(style: .regular, title: title) { (action, row) in + let action = NSTableViewRowAction(style: .regular, title: "") { (action, row) in self.toggleArticleRead(article); tableView.rowActionsVisible = false } + action.image = article.status.read ? AppAssets.swipeMarkUnreadImage : AppAssets.swipeMarkReadImage return [action] case .trailing: - let title = article.status.starred ? NSLocalizedString("Mark Unstarred", comment: "mark unstarred") : NSLocalizedString("Mark Starred", comment: "mark starred") - let action = NSTableViewRowAction(style: .regular, title: title) { (action, row) in + let action = NSTableViewRowAction(style: .regular, title: "") { (action, row) in self.toggleArticleStarred(article); tableView.rowActionsVisible = false } + action.image = article.status.starred ? AppAssets.swipeMarkUnstarredImage : AppAssets.swipeMarkStarredImage return [action] @unknown default: diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/Contents.json b/Mac/Resources/Assets.xcassets/Swipe Images/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/Swipe Images/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkRead.imageset/Contents.json b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkRead.imageset/Contents.json new file mode 100644 index 000000000..2d05b0f33 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkRead.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "checkmark.circle.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkRead.imageset/checkmark.circle.pdf b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkRead.imageset/checkmark.circle.pdf new file mode 100644 index 000000000..1239d4efc Binary files /dev/null and b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkRead.imageset/checkmark.circle.pdf differ diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkStarred.imageset/Contents.json b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkStarred.imageset/Contents.json new file mode 100644 index 000000000..edee428f9 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkStarred.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "star.fill.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkStarred.imageset/star.fill.pdf b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkStarred.imageset/star.fill.pdf new file mode 100644 index 000000000..4fb2ca8ce Binary files /dev/null and b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkStarred.imageset/star.fill.pdf differ diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnread.imageset/Contents.json b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnread.imageset/Contents.json new file mode 100644 index 000000000..2c571d7a6 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnread.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "circle.fill.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnread.imageset/circle.fill.pdf b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnread.imageset/circle.fill.pdf new file mode 100644 index 000000000..66a3fc9ea Binary files /dev/null and b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnread.imageset/circle.fill.pdf differ diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnstarred.imageset/Contents.json b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnstarred.imageset/Contents.json new file mode 100644 index 000000000..7b2919e99 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnstarred.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "star.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnstarred.imageset/star.pdf b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnstarred.imageset/star.pdf new file mode 100644 index 000000000..d1f245bd7 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnstarred.imageset/star.pdf differ