From efcbdd642a8a47a0a9888ede36b29d2d7db5e273 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Wed, 11 Sep 2019 19:29:27 -0500
Subject: [PATCH] Fix cell icon tint colors

---
 iOS/AppAssets.swift                           | 18 +++------
 .../Cell/MasterFeedTableViewCell.swift        |  4 +-
 .../masterFolderColor.colorset/Contents.json  | 38 -------------------
 .../Contents.json                             |  0
 4 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json
 rename iOS/Resources/Assets.xcassets/{smartFeedColor.colorset => tableViewCellIconColor.colorset}/Contents.json (100%)

diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index c1fc74950..d2110e9ae 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -76,13 +76,8 @@ struct AppAssets {
 		return UIImage(systemName: "arrowtriangle.up.circle")!
 	}()
 	
-	static var masterFolderColor: UIColor = {
-		return UIColor(named: "masterFolderColor")!
-	}()
-	
 	static var masterFolderImage: UIImage = {
-		let image = UIImage(systemName: "folder.fill")!
-		return image.withTintColor(AppAssets.masterFolderColor, renderingMode: .alwaysOriginal)
+		return UIImage(systemName: "folder.fill")!
 	}()
 	
 	static var moreImage: UIImage = {
@@ -109,13 +104,8 @@ struct AppAssets {
 		return UIImage(systemName: "square.and.arrow.up")!
 	}()
 	
-	static var smartFeedColor: UIColor = {
-		return UIColor(named: "smartFeedColor")!
-	}()
-	
 	static var smartFeedImage: UIImage = {
-		let image = UIImage(systemName: "gear")!
-		return image.withTintColor(AppAssets.smartFeedColor, renderingMode: .alwaysOriginal)
+		return UIImage(systemName: "gear")!
 	}()
 	
 	static var starColor: UIColor = {
@@ -134,6 +124,10 @@ struct AppAssets {
 		return UIColor(named: "tableViewCellHighlightedTextColor")!
 	}()
 
+	static var tableViewCellIconColor: UIColor = {
+		return UIColor(named: "tableViewCellIconColor")!
+	}()
+	
 	static var tableViewCellSelectionColor: UIColor = {
 		return UIColor(named: "tableViewCellSelectionColor")!
 	}()
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
index 3a91cd5d4..43d8aeecf 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
@@ -113,14 +113,14 @@ class MasterFeedTableViewCell : NNWTableViewCell {
 	override func setHighlighted(_ highlighted: Bool, animated: Bool) {
 		super.setHighlighted(highlighted, animated: animated)
 
-		let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.netNewsWireBlueColor
+		let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.tableViewCellIconColor
 		faviconImageView.tintColor = tintColor
 	}
 
 	override func setSelected(_ selected: Bool, animated: Bool) {
 		super.setSelected(selected, animated: animated)
 
-		let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.netNewsWireBlueColor
+		let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.tableViewCellIconColor
 		faviconImageView.tintColor = tintColor
 	}
 	
diff --git a/iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json
deleted file mode 100644
index 982b94564..000000000
--- a/iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "0.267",
-          "alpha" : "1.000",
-          "blue" : "0.886",
-          "green" : "0.565"
-        }
-      }
-    },
-    {
-      "idiom" : "universal",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "0.549",
-          "alpha" : "1.000",
-          "blue" : "0.980",
-          "green" : "0.749"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/smartFeedColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/tableViewCellIconColor.colorset/Contents.json
similarity index 100%
rename from iOS/Resources/Assets.xcassets/smartFeedColor.colorset/Contents.json
rename to iOS/Resources/Assets.xcassets/tableViewCellIconColor.colorset/Contents.json