From ee88e835488150f8aa1a71b582c840f5d35e5e35 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Tue, 27 Oct 2020 12:25:15 +0800 Subject: [PATCH] Tints added to iOS Account controllers --- iOS/Account/CloudKitAccountViewController.swift | 2 +- iOS/Account/FeedWranglerAccountViewController.swift | 2 +- iOS/Account/FeedbinAccountViewController.swift | 2 +- iOS/Account/LocalAccountViewController.swift | 2 +- iOS/Account/NewsBlurAccountViewController.swift | 2 +- iOS/Account/ReaderAPIAccountViewController.swift | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/iOS/Account/CloudKitAccountViewController.swift b/iOS/Account/CloudKitAccountViewController.swift index a72f8203f..4ab0690f3 100644 --- a/iOS/Account/CloudKitAccountViewController.swift +++ b/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) + headerView.imageView.image = AppAssets.image(for: .cloudKit)?.tinted(color: AccountType.cloudKit.iconColor()) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/FeedWranglerAccountViewController.swift b/iOS/Account/FeedWranglerAccountViewController.swift index 06bf376ee..1f5ba14c4 100644 --- a/iOS/Account/FeedWranglerAccountViewController.swift +++ b/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) + headerView.imageView.image = AppAssets.image(for: .feedWrangler)?.tinted(color: AccountType.feedWrangler.iconColor()) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift index ae769aba3..86fbe44a2 100644 --- a/iOS/Account/FeedbinAccountViewController.swift +++ b/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) + headerView.imageView.image = AppAssets.image(for: .feedbin)?.tinted(color: AccountType.feedbin.iconColor()) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/LocalAccountViewController.swift b/iOS/Account/LocalAccountViewController.swift index 0bcbe8fa2..5312adba6 100644 --- a/iOS/Account/LocalAccountViewController.swift +++ b/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) + headerView.imageView.image = AppAssets.image(for: .onMyMac)?.tinted(color: AccountType.onMyMac.iconColor()) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/NewsBlurAccountViewController.swift b/iOS/Account/NewsBlurAccountViewController.swift index c1bed5e2d..f435a7e33 100644 --- a/iOS/Account/NewsBlurAccountViewController.swift +++ b/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) + headerView.imageView.image = AppAssets.image(for: .newsBlur)?.tinted(color: AccountType.newsBlur.iconColor()) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift index e755f73cb..8c87e74d6 100644 --- a/iOS/Account/ReaderAPIAccountViewController.swift +++ b/iOS/Account/ReaderAPIAccountViewController.swift @@ -187,13 +187,13 @@ class ReaderAPIAccountViewController: UITableViewController { if let accountType = accountType { switch accountType { case .bazQux: - return AppAssets.accountBazQuxImage + return AppAssets.accountBazQuxImage.tinted(color: accountType.iconColor()) case .inoreader: - return AppAssets.accountInoreaderImage + return AppAssets.accountInoreaderImage.tinted(color: accountType.iconColor()) case .theOldReader: - return AppAssets.accountTheOldReaderImage + return AppAssets.accountTheOldReaderImage.tinted(color: accountType.iconColor()) case .freshRSS: - return AppAssets.accountFreshRSSImage + return AppAssets.accountFreshRSSImage.tinted(color: accountType.iconColor()) default: return nil }