Removes fuzziness

Feed icons have been updated with any/dark appearance traits where possible instead of using tinting. Where possible, they’ve been converted to PDFs. iPhone/iPad icons now use PDFs based on SF Symbols.

iOS/Account/CloudKitAccountViewController.swift

@@ -37,7 +37,7 @@ class CloudKitAccountViewController: UITableViewController {
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
-			headerView.imageView.image = AppAssets.image(for: .cloudKit)?.tinted(color: AccountType.cloudKit.iconColor())
+			headerView.imageView.image = AppAssets.image(for: .cloudKit)
 			return headerView
 		} else {
 			return super.tableView(tableView, viewForHeaderInSection: section)

iOS/Account/FeedWranglerAccountViewController.swift

@@ -51,7 +51,7 @@ class FeedWranglerAccountViewController: UITableViewController {
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
-			headerView.imageView.image = AppAssets.image(for: .feedWrangler)?.tinted(color: AccountType.feedWrangler.iconColor())
+			headerView.imageView.image = AppAssets.image(for: .feedWrangler)
 			return headerView
 		} else {
 			return super.tableView(tableView, viewForHeaderInSection: section)

iOS/Account/FeedbinAccountViewController.swift

@@ -52,7 +52,7 @@ class FeedbinAccountViewController: UITableViewController {
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
-			headerView.imageView.image = AppAssets.image(for: .feedbin)?.tinted(color: AccountType.feedbin.iconColor())
+			headerView.imageView.image = AppAssets.image(for: .feedbin)
 			return headerView
 		} else {
 			return super.tableView(tableView, viewForHeaderInSection: section)

iOS/Account/LocalAccountViewController.swift

@@ -41,7 +41,7 @@ class LocalAccountViewController: UITableViewController {
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
-			headerView.imageView.image = AppAssets.image(for: .onMyMac)?.tinted(color: AccountType.onMyMac.iconColor())
+			headerView.imageView.image = AppAssets.image(for: .onMyMac)
 			return headerView
 		} else {
 			return super.tableView(tableView, viewForHeaderInSection: section)

iOS/Account/NewsBlurAccountViewController.swift

@@ -52,7 +52,7 @@ class NewsBlurAccountViewController: UITableViewController {
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
-			headerView.imageView.image = AppAssets.image(for: .newsBlur)?.tinted(color: AccountType.newsBlur.iconColor())
+			headerView.imageView.image = AppAssets.image(for: .newsBlur)
 			return headerView
 		} else {
 			return super.tableView(tableView, viewForHeaderInSection: section)

iOS/Account/ReaderAPIAccountViewController.swift

@@ -187,13 +187,13 @@ class ReaderAPIAccountViewController: UITableViewController {
 		if let accountType = accountType {
 			switch accountType {
 				case .bazQux:
-					return AppAssets.accountBazQuxImage.tinted(color: accountType.iconColor())
+					return AppAssets.accountBazQuxImage
 				case .inoreader:
-					return AppAssets.accountInoreaderImage.tinted(color: accountType.iconColor())
+					return AppAssets.accountInoreaderImage
 				case .theOldReader:
-					return AppAssets.accountTheOldReaderImage.tinted(color: accountType.iconColor())
+					return AppAssets.accountTheOldReaderImage
 				case .freshRSS:
-					return AppAssets.accountFreshRSSImage.tinted(color: accountType.iconColor())
+					return AppAssets.accountFreshRSSImage
 				default:
 					return nil
 			}

iOS/Inspector/AccountInspectorViewController.swift

@@ -135,7 +135,7 @@ extension AccountInspectorViewController {
 
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
-			headerView.imageView.image = AppAssets.image(for: account.type)?.tinted(color: account.type.iconColor())
+			headerView.imageView.image = AppAssets.image(for: account.type)
 			return headerView
 		} else {
 			return super.tableView(tableView, viewForHeaderInSection: section)

iOS/Resources/Assets.xcassets/Account icon colors/theoldreaderColor.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0",
-          "green" : "37",
-          "red" : "255"
+          "blue" : "0x00",
+          "green" : "0x25",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

iOS/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "bazqux-logo.png",
+      "filename" : "bazqux-any.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +11,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icloud.pdf",
+      "filename" : "CloudKitAny.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "CloudKitDark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +20,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json

@@ -1,15 +1,59 @@
 {
   "images" : [
     {
+      "filename" : "feedwranger-any.png",
       "idiom" : "universal",
-      "filename" : "outline-512.png"
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "feedwranger-any@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "feedwranger-any@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "feedbin-logo.pdf",
+      "filename" : "feedbin-logo-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedbin-logo-dark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +21,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json

@@ -1,15 +1,25 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "accountFeedly.pdf"
+      "filename" : "feedly-logo-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedly-logo-dark.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json

@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "accountFreshRSS.pdf"
+      "filename" : "freshrss-any.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "inoreader_logo.pdf",
+      "filename" : "inoreader_logo-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "inoreader_logo-dark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +21,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json

@@ -1,16 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "localAccountPad.pdf"
+      "filename" : "accountLocalPad-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "accountLocalPad-dark.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template",
-    "preserves-vector-representation" : true
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json

@@ -1,16 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "localAccountPhone.pdf"
+      "filename" : "accountLocalPhone-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "accountLocalPhone-dark.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template",
-    "preserves-vector-representation" : true
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json

@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "newsblur-512.png"
+      "filename" : "NewsBlur.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "oldreader-icon.pdf",
+      "filename" : "theOldReaderAny.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "theOldReaderDark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +21,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Settings/AddAccountViewController.swift

@@ -136,23 +136,23 @@ class AddAccountViewController: UITableViewController, AddAccountDismissDelegate
 		switch indexPath.section {
 		case AddAccountSections.local.rawValue:
 			cell.comboNameLabel?.text = AddAccountSections.local.sectionContent[indexPath.row].localizedAccountName()
-			cell.comboImage?.image = AppAssets.image(for: .onMyMac)?.tinted(color: AddAccountSections.local.sectionContent[indexPath.row].iconColor())
+			cell.comboImage?.image = AppAssets.image(for: .onMyMac)
 		case AddAccountSections.icloud.rawValue:
 			cell.comboNameLabel?.text = AddAccountSections.icloud.sectionContent[indexPath.row].localizedAccountName()
-			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.icloud.sectionContent[indexPath.row])?.tinted(color: AddAccountSections.icloud.sectionContent[indexPath.row].iconColor())
+			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.icloud.sectionContent[indexPath.row])
 			if AppDefaults.shared.isDeveloperBuild {
 				cell.isUserInteractionEnabled = false
 			}
 		case AddAccountSections.web.rawValue:
 			cell.comboNameLabel?.text = AddAccountSections.web.sectionContent[indexPath.row].localizedAccountName()
-			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.web.sectionContent[indexPath.row])?.tinted(color: AddAccountSections.web.sectionContent[indexPath.row].iconColor())
+			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.web.sectionContent[indexPath.row])
 			let type = AddAccountSections.web.sectionContent[indexPath.row]
 			if (type == .feedly || type == .feedWrangler) && AppDefaults.shared.isDeveloperBuild {
 				cell.isUserInteractionEnabled = false
 			}
 		case AddAccountSections.selfhosted.rawValue:
 			cell.comboNameLabel?.text = AddAccountSections.selfhosted.sectionContent[indexPath.row].localizedAccountName()
-			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.selfhosted.sectionContent[indexPath.row])?.tinted(color: AddAccountSections.web.sectionContent[indexPath.row].iconColor())
+			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.selfhosted.sectionContent[indexPath.row])
 			
 		default:
 			return cell

iOS/Settings/SettingsViewController.swift

@@ -139,7 +139,7 @@ class SettingsViewController: UITableViewController {
 				let acctCell = tableView.dequeueReusableCell(withIdentifier: "SettingsComboTableViewCell", for: indexPath) as! SettingsComboTableViewCell
 				acctCell.applyThemeProperties()
 				let account = sortedAccounts[indexPath.row]
-				acctCell.comboImage?.image = AppAssets.image(for: account.type)?.tinted(color: account.type.iconColor())
+				acctCell.comboImage?.image = AppAssets.image(for: account.type)
 				acctCell.comboNameLabel?.text = account.nameForDisplay
 				cell = acctCell
 			}