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 000000000..907e486bc Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf differ 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 */, );