From a85df5bd09cbbf7d6fdbe6293b8ce4425351184e Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 20 Sep 2019 14:47:40 -0500 Subject: [PATCH] Add Feedly icon. Issue #1031 --- Mac/AppAssets.swift | 4 ++ Mac/Base.lproj/Preferences.storyboard | 55 +++++++++--------- Mac/Preferences/Accounts/AccountsAddLocal.xib | 23 ++++---- .../Accounts/AccountsAddViewController.swift | 4 +- .../AccountsPreferencesViewController.swift | 4 +- .../accountFeedly.imageset/Contents.json | 15 +++++ .../accountFeedly.imageset/accountFeedly.pdf | Bin 0 -> 4406 bytes NetNewsWire.xcodeproj/project.pbxproj | 6 +- 8 files changed, 67 insertions(+), 44 deletions(-) create mode 100644 Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json create mode 100644 Mac/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index e2df8ed5a..b67f10559 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -34,6 +34,10 @@ struct AppAssets { return RSImage(named: "accountFeedbin") }() + static var accountFeedly: RSImage! = { + return RSImage(named: "accountFeedly") + }() + static var accountFreshRSS: RSImage! = { return RSImage(named: "accountFreshRSS") }() diff --git a/Mac/Base.lproj/Preferences.storyboard b/Mac/Base.lproj/Preferences.storyboard index 1e66a24c9..46d049133 100644 --- a/Mac/Base.lproj/Preferences.storyboard +++ b/Mac/Base.lproj/Preferences.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -38,7 +39,7 @@ - + @@ -52,7 +53,7 @@ - + @@ -81,7 +82,7 @@ - + @@ -92,7 +93,7 @@ - + @@ -104,7 +105,7 @@ - + @@ -132,7 +133,7 @@ - + @@ -212,14 +213,14 @@ - + - + - + @@ -227,7 +228,7 @@ - + @@ -255,7 +256,7 @@ - + @@ -296,7 +297,7 @@ - + @@ -390,29 +391,29 @@ - - + + - + - + - + - - + + - + @@ -436,7 +437,7 @@ - + @@ -512,7 +513,7 @@ - + diff --git a/Mac/Preferences/Accounts/AccountsAddLocal.xib b/Mac/Preferences/Accounts/AccountsAddLocal.xib index 0a1e9c711..a0d1f1179 100644 --- a/Mac/Preferences/Accounts/AccountsAddLocal.xib +++ b/Mac/Preferences/Accounts/AccountsAddLocal.xib @@ -1,7 +1,8 @@ - + - + + @@ -18,13 +19,13 @@ - - - + + + - + @@ -35,7 +36,7 @@ - + @@ -53,10 +54,10 @@ - + - + @@ -64,7 +65,7 @@ - + @@ -111,7 +112,7 @@ Gw - + diff --git a/Mac/Preferences/Accounts/AccountsAddViewController.swift b/Mac/Preferences/Accounts/AccountsAddViewController.swift index d936a01a6..02b87bd38 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, .freshRSS, .feedly] + private let addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly, .freshRSS] init() { super.init(nibName: "AccountsAdd", bundle: nil) @@ -70,7 +70,7 @@ extension AccountsAddViewController: NSTableViewDelegate { cell.accountImageView?.image = AppAssets.accountFreshRSS case .feedly: cell.accountNameLabel?.stringValue = NSLocalizedString("Feedly", comment: "Feedly") - cell.accountImageView?.image = AppAssets.accountFreshRSS + cell.accountImageView?.image = AppAssets.accountFeedly default: break } diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift index 061d20bdf..cfc540d09 100644 --- a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift +++ b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift @@ -107,9 +107,11 @@ extension AccountsPreferencesViewController: NSTableViewDelegate { case .onMyMac: cell.imageView?.image = AppAssets.accountLocal case .feedbin: - cell.imageView?.image = NSImage(named: "accountFeedbin") + cell.imageView?.image = AppAssets.accountFeedbin case .freshRSS: cell.imageView?.image = AppAssets.accountFreshRSS + case .feedly: + cell.imageView?.image = AppAssets.accountFeedly default: break } diff --git a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json new file mode 100644 index 000000000..754629a4a --- /dev/null +++ b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "accountFeedly.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf new file mode 100644 index 0000000000000000000000000000000000000000..907e486bc4a0e1efc925ff12110144ddc8895b53 GIT binary patch literal 4406 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 literal 0 HcmV?d00001 diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index f7423fc64..8f6b62243 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -1884,8 +1884,6 @@ 84C9FC6F22629E1200D921D6 /* Accounts */ = { isa = PBXGroup; children = ( - 55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */, - 55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */, 84C9FC7022629E1200D921D6 /* AccountsTableViewBackgroundView.swift */, 84C9FC7122629E1200D921D6 /* AccountsControlsBackgroundView.swift */, 84C9FC7222629E1200D921D6 /* AccountsPreferencesViewController.swift */, @@ -1896,8 +1894,10 @@ 5144EA2E2279FAB600D19003 /* AccountsDetailViewController.swift */, 5144EA50227B8E4500D19003 /* AccountsFeedbin.xib */, 5144EA4F227B8E4500D19003 /* AccountsFeedbinWindowController.swift */, - 9EA33BB72318F8C10097B644 /* AccountsFeedlyWebWindowController.swift */, 9EA33BB82318F8C10097B644 /* AccountsFeedlyWeb.xib */, + 9EA33BB72318F8C10097B644 /* AccountsFeedlyWebWindowController.swift */, + 55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */, + 55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */, 5144EA352279FC3D00D19003 /* AccountsAddLocal.xib */, 5144EA372279FC6200D19003 /* AccountsAddLocalWindowController.swift */, );