diff --git a/iOS/Account/CloudKitAccountViewController.swift b/iOS/Account/CloudKitAccountViewController.swift index 4ab0690f3..a72f8203f 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)?.tinted(color: AccountType.cloudKit.iconColor()) + headerView.imageView.image = AppAssets.image(for: .cloudKit) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/FeedWranglerAccountViewController.swift b/iOS/Account/FeedWranglerAccountViewController.swift index 1f5ba14c4..06bf376ee 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)?.tinted(color: AccountType.feedWrangler.iconColor()) + headerView.imageView.image = AppAssets.image(for: .feedWrangler) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift index 86fbe44a2..ae769aba3 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)?.tinted(color: AccountType.feedbin.iconColor()) + headerView.imageView.image = AppAssets.image(for: .feedbin) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/LocalAccountViewController.swift b/iOS/Account/LocalAccountViewController.swift index 5312adba6..0bcbe8fa2 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)?.tinted(color: AccountType.onMyMac.iconColor()) + headerView.imageView.image = AppAssets.image(for: .onMyMac) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/NewsBlurAccountViewController.swift b/iOS/Account/NewsBlurAccountViewController.swift index f435a7e33..c1bed5e2d 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)?.tinted(color: AccountType.newsBlur.iconColor()) + headerView.imageView.image = AppAssets.image(for: .newsBlur) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift index 8c87e74d6..e755f73cb 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.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 } diff --git a/iOS/Inspector/AccountInspectorViewController.swift b/iOS/Inspector/AccountInspectorViewController.swift index d418022ac..cc7c5be5b 100644 --- a/iOS/Inspector/AccountInspectorViewController.swift +++ b/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) diff --git a/iOS/Resources/Assets.xcassets/Account icon colors/theoldreaderColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/Account icon colors/theoldreaderColor.colorset/Contents.json index 04158365b..77b47025f 100644 --- a/iOS/Resources/Assets.xcassets/Account icon colors/theoldreaderColor.colorset/Contents.json +++ b/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" diff --git a/iOS/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json index 5dc93b35e..25d8387f8 100644 --- a/iOS/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json +++ b/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" } } diff --git a/iOS/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-any.pdf b/iOS/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-any.pdf new file mode 100644 index 000000000..d13a0defd Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-any.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-logo.png b/iOS/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-logo.png deleted file mode 100644 index a73b4eb8c..000000000 Binary files a/iOS/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-logo.png and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf new file mode 100644 index 000000000..27a2f136a Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf new file mode 100644 index 000000000..c2777a879 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json index fc07d2975..abd37acbd 100644 --- a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json +++ b/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" } } diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json index 0721d5d1f..a29363d1e 100644 --- a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json +++ b/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" } -} \ No newline at end of file +} diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png new file mode 100644 index 000000000..e2c215e32 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png new file mode 100644 index 000000000..da7ec8828 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png new file mode 100644 index 000000000..6ee6ef7ce Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png new file mode 100644 index 000000000..4eb275ba0 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png new file mode 100644 index 000000000..672efa478 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png new file mode 100644 index 000000000..f10de405b Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png b/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png deleted file mode 100644 index f7d29faa1..000000000 Binary files a/iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json index 3495fe8ef..84adbb73b 100644 --- a/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json +++ b/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" } } diff --git a/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-any.pdf b/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-any.pdf new file mode 100644 index 000000000..b7635e887 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-any.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-dark.pdf b/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-dark.pdf new file mode 100644 index 000000000..97d007add Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-dark.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo.pdf b/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo.pdf deleted file mode 100644 index de686614a..000000000 Binary files a/iOS/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json index 754629a4a..236ba8fa6 100644 --- a/iOS/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json +++ b/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" } -} \ No newline at end of file +} diff --git a/iOS/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf b/iOS/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf deleted file mode 100644 index 907e486bc..000000000 Binary files a/iOS/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-any.pdf b/iOS/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-any.pdf new file mode 100644 index 000000000..e1ccaab94 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-any.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-dark.pdf b/iOS/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-dark.pdf new file mode 100644 index 000000000..f287b271b Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-dark.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json index b2c62a136..151fb1a8e 100644 --- a/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json +++ b/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" } -} \ No newline at end of file +} diff --git a/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo.pdf b/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf similarity index 77% rename from iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo.pdf rename to iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf index 6ae613d52..78d2bca2b 100644 Binary files a/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo.pdf and b/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json index 979b7673c..8711b150a 100644 --- a/iOS/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json +++ b/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" } } diff --git a/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf b/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf new file mode 100644 index 000000000..d22c40842 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf b/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf new file mode 100644 index 000000000..4de910eaf Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json index 7fe4e483c..9e763872c 100644 --- a/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json +++ b/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" } -} \ No newline at end of file +} diff --git a/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon.pdf b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/accountLocalPad-any.pdf similarity index 59% rename from iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon.pdf rename to iOS/Resources/Assets.xcassets/accountLocalPad.imageset/accountLocalPad-any.pdf index 8a8a3baa6..e8b6e0188 100644 Binary files a/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon.pdf and b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/accountLocalPad-any.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/accountLocalPad-dark.pdf similarity index 55% rename from iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf rename to iOS/Resources/Assets.xcassets/accountLocalPad.imageset/accountLocalPad-dark.pdf index 1ff98e115..0ef067fd3 100644 Binary files a/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf and b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/accountLocalPad-dark.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/localAccountPad.pdf b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/localAccountPad.pdf deleted file mode 100644 index cfc6ca9f0..000000000 Binary files a/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/localAccountPad.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json index 05bb5e471..d8acd1b72 100644 --- a/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json +++ b/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" } -} \ No newline at end of file +} diff --git a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/accountLocalPhone-any.pdf similarity index 55% rename from iOS/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf rename to iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/accountLocalPhone-any.pdf index 74406f4cb..75768db1d 100644 Binary files a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf and b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/accountLocalPhone-any.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/accountLocalPhone-dark.pdf b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/accountLocalPhone-dark.pdf new file mode 100644 index 000000000..f1c59bc0b Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/accountLocalPhone-dark.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/localAccountPhone.pdf b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/localAccountPhone.pdf deleted file mode 100644 index c807edece..000000000 Binary files a/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/localAccountPhone.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json index 99f78349c..f560c64f3 100644 --- a/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json +++ b/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" } -} \ No newline at end of file +} diff --git a/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf b/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf new file mode 100644 index 000000000..d2b62c6eb Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/newsblur-512.png b/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/newsblur-512.png deleted file mode 100644 index 5fab67691..000000000 Binary files a/iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/newsblur-512.png and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json index 54e6957d5..31c201dd0 100644 --- a/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json +++ b/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" } } diff --git a/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf b/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf new file mode 100644 index 000000000..2c1511bf2 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf b/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf new file mode 100644 index 000000000..1f3dac415 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf differ diff --git a/iOS/Settings/AddAccountViewController.swift b/iOS/Settings/AddAccountViewController.swift index 3638c18df..f3b9074c3 100644 --- a/iOS/Settings/AddAccountViewController.swift +++ b/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 diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index ab5abab97..0782867f8 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/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 }