diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index e6af844ff..4c01f583b 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -129,6 +129,8 @@ struct AppAssets { return AppAssets.accountFeedbin case .feedly: return AppAssets.accountFeedly + case .feedWrangler: + return AppAssets.accountFeedWrangler case .freshRSS: return AppAssets.accountFreshRSS default: diff --git a/Mac/Preferences/Accounts/AccountsAddViewController.swift b/Mac/Preferences/Accounts/AccountsAddViewController.swift index ed451924e..bfd0050b8 100644 --- a/Mac/Preferences/Accounts/AccountsAddViewController.swift +++ b/Mac/Preferences/Accounts/AccountsAddViewController.swift @@ -15,7 +15,7 @@ class AccountsAddViewController: NSViewController { private var accountsAddWindowController: NSWindowController? - private let addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly, .freshRSS] + private let addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly, .feedWrangler, .freshRSS] init() { super.init(nibName: "AccountsAdd", bundle: nil) diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift index 5c5022610..2c1212a98 100644 --- a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift +++ b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift @@ -103,18 +103,7 @@ extension AccountsPreferencesViewController: NSTableViewDelegate { if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? NSTableCellView { let account = sortedAccounts[row] cell.textField?.stringValue = account.nameForDisplay - switch account.type { - case .onMyMac: - cell.imageView?.image = AppAssets.accountLocal - case .feedbin: - cell.imageView?.image = AppAssets.accountFeedbin - case .freshRSS: - cell.imageView?.image = AppAssets.accountFreshRSS - case .feedly: - cell.imageView?.image = AppAssets.accountFeedly - default: - break - } + cell.imageView?.image = account.smallIcon?.image return cell } return nil diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json index b2c62a136..0721d5d1f 100644 --- a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "accountFreshRSS.pdf" + "filename" : "outline-512.png" } ], "info" : { diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/accountFreshRSS.pdf b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/accountFreshRSS.pdf deleted file mode 100644 index 1ff98e115..000000000 Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/accountFreshRSS.pdf and /dev/null differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png new file mode 100644 index 000000000..f7d29faa1 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png differ