Merge pull request #1170 from Wevah/row-swipe-icons

Use glyphs from SF Symbols for table row swipe actions

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")!
+	}()
+	
 }

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:

Mac/Resources/Assets.xcassets/Swipe Images/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}