Turn the star color to white if the article is selected. Issue #2364

Mac/AppAssets.swift

@@ -10,11 +10,6 @@ import AppKit
 import RSCore
 import Account
 
-extension NSImage.Name {
-	static let star = NSImage.Name("star")
-	static let timelineStar = NSImage.Name("timelineStar")
-}
-
 struct AppAssets {
 
 	static var accountCloudKit: RSImage! = {
@@ -133,8 +128,12 @@ struct AppAssets {
 		return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!)
 	}()
 
-	static var timelineStar: RSImage! = {
+	static var timelineStarSelected: RSImage! = {
-		return RSImage(named: .timelineStar)
+		return RSImage(named: "timelineStar")?.tinted(with: .white)
+	}()
+
+	static var timelineStarUnselected: RSImage! = {
+		return RSImage(named: "timelineStar")?.tinted(with: starColor)
 	}()
 
 	static var todayFeedImage: IconImage = {
@@ -161,8 +160,8 @@ struct AppAssets {
 		return RSImage(named: "swipeMarkUnstarred")!
 	}()
 	
-	static var swipeMarkUnstarredColor: NSColor = {
+	static var starColor: NSColor = {
-		return NSColor(named: NSColor.Name("swipeMarkUnstarredColor"))!
+		return NSColor(named: NSColor.Name("starColor"))!
 	}()
 	
 	static func image(for accountType: AccountType) -> NSImage? {

Mac/MainWindow/Timeline/Cell/TimelineTableCellView.swift

@@ -20,7 +20,7 @@ class TimelineTableCellView: NSTableCellView {
 
 	private lazy var iconView = IconView()
 
-	private let starView = TimelineTableCellView.imageView(with: AppAssets.timelineStar, scaling: .scaleNone)
+	private var starView = TimelineTableCellView.imageView(with: AppAssets.timelineStarUnselected, scaling: .scaleNone)
 	private let separatorView = TimelineTableCellView.separatorView()
 
 	private lazy var textFields = {
@@ -52,12 +52,14 @@ class TimelineTableCellView: NSTableCellView {
 	var isEmphasized: Bool = false {
 		didSet {
 			unreadIndicatorView.isEmphasized = isEmphasized
+			updateStarView()
 		}
 	}
 
 	var isSelected: Bool = false {
 		didSet {
 			unreadIndicatorView.isSelected = isSelected
+			updateStarView()
 		}
 	}
 	
@@ -279,6 +281,11 @@ private extension TimelineTableCellView {
 	}
 
 	func updateStarView() {
+		if isSelected && isEmphasized {
+			starView.image = AppAssets.timelineStarSelected
+		} else {
+			starView.image = AppAssets.timelineStarUnselected
+		}
 		showOrHideView(starView, !cellData.starred)
 	}
 

Mac/MainWindow/Timeline/TimelineViewController.swift

@@ -910,7 +910,7 @@ extension TimelineViewController: NSTableViewDelegate {
 					self.toggleArticleStarred(article);
 					tableView.rowActionsVisible = false
 				}
-				action.backgroundColor = AppAssets.swipeMarkUnstarredColor
+				action.backgroundColor = AppAssets.starColor
 				action.image = article.status.starred ? AppAssets.swipeMarkUnstarredImage : AppAssets.swipeMarkStarredImage
 				return [action]
 

Mac/Resources/Assets.xcassets/Contents.json

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

Mac/Resources/Assets.xcassets/timelineStar.imageset/Contents.json

@@ -1,13 +1,13 @@
 {
   "images" : [
     {
+      "filename" : "star.pdf",
       "idiom" : "universal",
-      "filename" : "timelineStar.png",
       "scale" : "1x"
     },
     {
+      "filename" : "star@2x.pdf",
       "idiom" : "universal",
-      "filename" : "timelineStar@2x.png",
       "scale" : "2x"
     },
     {
@@ -16,7 +16,11 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
   }
-}
+}