From fa62acb585676f9149e05fe171d47bb277118e21 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 20 Jun 2019 07:22:51 -0500 Subject: [PATCH] Rebrand Reader API to FreshRSS --- Frameworks/Account/Account.swift | 10 +++++----- Mac/AppAssets.swift | 4 ++-- .../Accounts/AccountsAddViewController.swift | 5 +++-- .../AccountsPreferencesViewController.swift | 4 ++-- .../Accounts/AccountsReaderAPI.xib | 7 +++---- .../AccountsReaderAPIWindowController.swift | 18 ++++++++++++++++-- .../Contents.json | 2 +- .../accountFreshRSS.pdf} | Bin 3998 -> 4206 bytes Mac/Scriptability/Account+Scriptability.swift | 4 ++-- 9 files changed, 34 insertions(+), 20 deletions(-) rename Mac/Resources/Assets.xcassets/{accountReader.imageset => accountFreshRSS.imageset}/Contents.json (82%) rename Mac/Resources/Assets.xcassets/{accountReader.imageset/accountReader.pdf => accountFreshRSS.imageset/accountFreshRSS.pdf} (73%) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 36066fdf1..2f9682066 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -33,7 +33,7 @@ public enum AccountType: Int { case feedbin = 17 case feedWrangler = 18 case newsBlur = 19 - case readerAPI = 20 + case freshRSS = 20 // TODO: more } @@ -221,7 +221,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, self.delegate = LocalAccountDelegate() case .feedbin: self.delegate = FeedbinAccountDelegate(dataFolder: dataFolder, transport: transport) - case .readerAPI: + case .freshRSS: self.delegate = ReaderAPIAccountDelegate(dataFolder: dataFolder, transport: transport) default: fatalError("Only Local and Feedbin accounts are supported") @@ -250,8 +250,8 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, defaultName = "FeedWrangler" case .newsBlur: defaultName = "NewsBlur" - case .readerAPI: - defaultName = "Reader API" + case .freshRSS: + defaultName = "FreshRSS" } NotificationCenter.default.addObserver(self, selector: #selector(downloadProgressDidChange(_:)), name: .DownloadProgressDidChange, object: nil) @@ -331,7 +331,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, LocalAccountDelegate.validateCredentials(transport: transport, credentials: credentials, completion: completion) case .feedbin: FeedbinAccountDelegate.validateCredentials(transport: transport, credentials: credentials, completion: completion) - case .readerAPI: + case .freshRSS: ReaderAPIAccountDelegate.validateCredentials(transport: transport, credentials: credentials, endpoint: endpoint, completion: completion) default: break diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index a2610aa89..146af1bb1 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -34,8 +34,8 @@ struct AppAssets { return RSImage(named: "accountFeedbin") }() - static var accountReader: RSImage! = { - return RSImage(named: "accountReader") + static var accountFreshRSS: RSImage! = { + return RSImage(named: "accountFreshRSS") }() static var faviconTemplateImage: RSImage = { diff --git a/Mac/Preferences/Accounts/AccountsAddViewController.swift b/Mac/Preferences/Accounts/AccountsAddViewController.swift index 4e3019ea4..45d7adde6 100644 --- a/Mac/Preferences/Accounts/AccountsAddViewController.swift +++ b/Mac/Preferences/Accounts/AccountsAddViewController.swift @@ -64,8 +64,8 @@ extension AccountsAddViewController: NSTableViewDelegate { cell.accountNameLabel?.stringValue = NSLocalizedString("Feedbin", comment: "Feedbin") cell.accountImageView?.image = AppAssets.accountFeedbin case 2: - cell.accountNameLabel?.stringValue = NSLocalizedString("Reader API", comment: "Reader API") - cell.accountImageView?.image = AppAssets.accountReader + cell.accountNameLabel?.stringValue = NSLocalizedString("FreshRSS", comment: "FreshRSS") + cell.accountImageView?.image = AppAssets.accountFreshRSS default: break } @@ -92,6 +92,7 @@ extension AccountsAddViewController: NSTableViewDelegate { accountsAddWindowController = accountsFeedbinWindowController case 2: let accountsReaderAPIWindowController = AccountsReaderAPIWindowController() + accountsReaderAPIWindowController.accountType = .freshRSS accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!) accountsAddWindowController = accountsReaderAPIWindowController default: diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift index 5ad1aaa7a..4fa3af338 100644 --- a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift +++ b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift @@ -107,8 +107,8 @@ extension AccountsPreferencesViewController: NSTableViewDelegate { cell.imageView?.image = AppAssets.accountLocal case .feedbin: cell.imageView?.image = NSImage(named: "accountFeedbin") - case .readerAPI: - cell.imageView?.image = AppAssets.accountReader + case .freshRSS: + cell.imageView?.image = AppAssets.accountFreshRSS default: break } diff --git a/Mac/Preferences/Accounts/AccountsReaderAPI.xib b/Mac/Preferences/Accounts/AccountsReaderAPI.xib index 03f9f638d..ea4ee20e0 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPI.xib +++ b/Mac/Preferences/Accounts/AccountsReaderAPI.xib @@ -13,6 +13,8 @@ + + @@ -37,7 +39,7 @@ - + @@ -205,7 +207,4 @@ Gw - - - diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift index 4bdf31256..f41a6327d 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift @@ -12,6 +12,9 @@ import RSWeb class AccountsReaderAPIWindowController: NSWindowController { + @IBOutlet weak var titleImageView: NSImageView! + @IBOutlet weak var titleLabel: NSTextField! + @IBOutlet weak var progressIndicator: NSProgressIndicator! @IBOutlet weak var usernameTextField: NSTextField! @IBOutlet weak var apiURLTextField: NSTextField! @@ -20,6 +23,7 @@ class AccountsReaderAPIWindowController: NSWindowController { @IBOutlet weak var actionButton: NSButton! var account: Account? + var accountType: AccountType? private weak var hostWindow: NSWindow? @@ -28,6 +32,16 @@ class AccountsReaderAPIWindowController: NSWindowController { } override func windowDidLoad() { + if let accountType = accountType { + switch accountType { + case .freshRSS: + titleImageView.image = AppAssets.accountFreshRSS + titleLabel.stringValue = NSLocalizedString("FreshRSS", comment: "FreshRSS") + default: + break + } + } + if let account = account, let credentials = try? account.retrieveBasicCredentials() { if case .basic(let username, let password) = credentials { usernameTextField.stringValue = username @@ -71,7 +85,7 @@ class AccountsReaderAPIWindowController: NSWindowController { } let credentials = Credentials.readerAPIBasicLogin(username: usernameTextField.stringValue, password: passwordTextField.stringValue) - Account.validateCredentials(type: .readerAPI, credentials: credentials, endpoint: apiURL) { [weak self] result in + Account.validateCredentials(type: accountType!, credentials: credentials, endpoint: apiURL) { [weak self] result in guard let self = self else { return } @@ -89,7 +103,7 @@ class AccountsReaderAPIWindowController: NSWindowController { var newAccount = false if self.account == nil { - self.account = AccountManager.shared.createAccount(type: .readerAPI) + self.account = AccountManager.shared.createAccount(type: self.accountType!) newAccount = true } diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json similarity index 82% rename from Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json rename to Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json index d8d735f71..b2c62a136 100644 --- a/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "accountReader.pdf" + "filename" : "accountFreshRSS.pdf" } ], "info" : { diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf similarity index 73% rename from Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf rename to Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf index 8e49ad8aa5d3892d26cdd25be6177bebec4f3bd5..1ff98e115ed9096d447af7849c78bbd5906f8b00 100644 GIT binary patch delta 931 zcmbOy|4v~-Kz(kIXWn50o;|-sKR0SEaXEd-vVC5&%r6G!*oGwz51selUnryL7%efa z{Yio3sd$Tr+)~`HdbF<;brhOyH_;BsiV!=!+wt12#eUK?lhoHg@_b^mta9bK@;j?6 zB$n{yU9|GozW1@o-{ZuO0}pp>e8skKZkMVr_r;{mSCnpqg(N<%fAjhCm+zPScIgZA z|KIc=`?3`8{r=Ma^Z@nwp9R~~&8lwKDBt7p|Kjdqye9m_l2^7Yo7-ls(JMdjucy;n zUr6Qr5yPX_2YHvTIa{mjJNM4wf3b!4-nXdUV%gKH@um9t(OV3ftiD0QRx_ejd=2MT z4WA#smdD9>##zRfSN(P|S4k$MP1yaN@!$Qg`xgI5cTd&n>E2rI z{U*Qs4PB~Og~Jv1q|0ZYP{~uW`TK?WNN~3?S885LaY<2XVlIf4pOnRAs$if1qKyqr zU_wTd|MQ4W-oRKQukTt>;vQU*Sdyw>W22z&UTmab0aPEv1!Nj3SWcEmIX9qLQ5^4d+0BmXv^o)^I8yX-f_esr5FUe3aGz8hHpzo((tf23hQ<7Sg z2Xc|VOKMqW^5$5kEG{NP!^tOj)R_zoCV${DWj8W4Qvl-0TD)qEMw0`1)p+&8Qj3Z+ z^Yaw+4fRYWm+=;|8yOfHnpl`je#a{VXAAPlFd9$RH1|~*8 zub_$I}1I%$mQs`E}w-0teLMpXEXvyn^LNyhi$ zK8-G3dLJ6H=ZbAJx0gL$GDXVNaO>ryH6d49SGXpw5(++)B-c_u&CJ_%rA?66vY2+x zPpt36C(Mn?+jyvXNw7t?fARCc*)|7!ZkD>ZNBDeb^f}taCAN9pmA!p4%DY0@UquPe zY~kIqdpBdKa_8C9&fb%2svh6C&$@ZK&n~9=<=qC{b>G?-pE`QQr@QKP$yS;C)#qLv z-1Ya^{3@LvN1tEsz8KH(Z?B7$-K2j`yVCDIv8z|(-!eB>=Ni_Xai!*^6qgjGCgy@z`AJz^rV0iMAlk^%bn;ThNt5H4#5jCX^U_N)6f8I2 zU~1)Jw45BztIlXKxr5h~)!bOY+<5X4UNuI8$*+0UCd=~`Xc<}>TAG>|8AKTvr~{Fv zg1&Elic4Zis)B}#m63s=rGXh#$>g1UG75%V25_KYW@>6|s*t7t6*D$5HJ@zAufk$% zY-BcBmR~j9*wRn|tXv@vrpUm=(g0n|*a(X{Q&S5}b>97WtGFbwsHCDOHI2*I%*c>SRn^s>$&CvDcF*?5 diff --git a/Mac/Scriptability/Account+Scriptability.swift b/Mac/Scriptability/Account+Scriptability.swift index 6b338b75b..7b2fde624 100644 --- a/Mac/Scriptability/Account+Scriptability.swift +++ b/Mac/Scriptability/Account+Scriptability.swift @@ -142,8 +142,8 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta osType = "FWrg" case .newsBlur: osType = "NBlr" - case .readerAPI: - osType = "Grdr" + case .freshRSS: + osType = "Frsh" } return osType.fourCharCode() }