From 8d57fd193cb057f3bf022ec9f7534dd43a68ed6d Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 27 Feb 2020 16:27:12 -0800 Subject: [PATCH] Make the star swipe background color yellow. Issue #1015 --- Mac/AppAssets.swift | 4 ++++ .../Timeline/TimelineViewController.swift | 1 + .../Contents.json | 20 +++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 Mac/Resources/Assets.xcassets/swipeMarkUnstarredColor.colorset/Contents.json diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 4c01f583b..57f53b07c 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -121,6 +121,10 @@ struct AppAssets { return RSImage(named: "swipeMarkUnstarred")! }() + static var swipeMarkUnstarredColor: NSColor = { + return NSColor(named: NSColor.Name("swipeMarkUnstarredColor"))! + }() + static func image(for accountType: AccountType) -> NSImage? { switch accountType { case .onMyMac: diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift index 31daeb2ab..3f3d4e4ec 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineViewController.swift @@ -811,6 +811,7 @@ extension TimelineViewController: NSTableViewDelegate { self.toggleArticleStarred(article); tableView.rowActionsVisible = false } + action.backgroundColor = AppAssets.swipeMarkUnstarredColor action.image = article.status.starred ? AppAssets.swipeMarkUnstarredImage : AppAssets.swipeMarkStarredImage return [action] diff --git a/Mac/Resources/Assets.xcassets/swipeMarkUnstarredColor.colorset/Contents.json b/Mac/Resources/Assets.xcassets/swipeMarkUnstarredColor.colorset/Contents.json new file mode 100644 index 000000000..79fb66aa5 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/swipeMarkUnstarredColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.976", + "alpha" : "1.000", + "blue" : "0.204", + "green" : "0.776" + } + } + } + ] +} \ No newline at end of file