From b4b80c51bc2bfe0b416c42909c6792f38213a2ae Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 19 Jun 2019 15:40:03 -0500 Subject: [PATCH] Renamed google reader api to just reader api to make it consistent everywhere we use it --- Frameworks/Account/Account.swift | 22 +++++++++--------- .../ReaderAPI/ReaderAPIAccountDelegate.swift | 2 +- .../Account/ReaderAPI/ReaderAPICaller.swift | 4 ++-- Mac/AppAssets.swift | 4 ++++ Mac/Preferences/Accounts/AccountsAddLocal.xib | 19 ++++++++------- .../Accounts/AccountsAddViewController.swift | 4 ++-- .../AccountsPreferencesViewController.swift | 4 ++-- .../Accounts/AccountsReaderAPI.xib | 16 ++++++------- .../AccountsReaderAPIWindowController.swift | 8 +++---- .../accountReader.imageset/Contents.json | 15 ++++++++++++ .../accountReader.imageset/accountReader.pdf | Bin 0 -> 3998 bytes Mac/Scriptability/Account+Scriptability.swift | 2 +- .../SettingsReaderAPIAccountView.swift | 6 ++--- submodules/RSParser | 2 +- submodules/RSWeb | 2 +- 15 files changed, 65 insertions(+), 45 deletions(-) create mode 100644 Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json create mode 100644 Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index a498c04ce..87c061727 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 googleReaderAPI = 20 + case readerAPI = 20 // TODO: more } @@ -217,7 +217,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, self.delegate = LocalAccountDelegate() case .feedbin: self.delegate = FeedbinAccountDelegate(dataFolder: dataFolder, transport: transport) - case .googleReaderAPI: + case .readerAPI: self.delegate = ReaderAPIAccountDelegate(dataFolder: dataFolder, transport: transport) default: fatalError("Only Local and Feedbin accounts are supported") @@ -246,8 +246,8 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, defaultName = "FeedWrangler" case .newsBlur: defaultName = "NewsBlur" - case .googleReaderAPI: - defaultName = "Reader" + case .readerAPI: + defaultName = "Reader API" } NotificationCenter.default.addObserver(self, selector: #selector(downloadProgressDidChange(_:)), name: .DownloadProgressDidChange, object: nil) @@ -279,9 +279,9 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, switch credentials { case .basic(let username, _): self.username = username - case .googleBasicLogin(let username, _): + case .readerAPIBasicLogin(let username, _): self.username = username - case .googleAuthLogin(let username, _): + case .readerAPIAuthLogin(let username, _): self.username = username } @@ -306,18 +306,18 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, self.username = nil } - public func retrieveGoogleAuthCredentials() throws -> Credentials? { + public func retrieveReaderAPIAuthCredentials() throws -> Credentials? { guard let username = self.username, let server = delegate.server else { return nil } - return try CredentialsManager.retrieveGoogleAuthCredentials(server: server, username: username) + return try CredentialsManager.retrieveReaderAPIAuthCredentials(server: server, username: username) } - public func removeGoogleAuthCredentials() throws { + public func removeReaderAPIAuthCredentials() throws { guard let username = self.username, let server = delegate.server else { return } - try CredentialsManager.removeGoogleAuthCredentials(server: server, username: username) + try CredentialsManager.removeReaderAPIAuthCredentials(server: server, username: username) self.username = nil } @@ -327,7 +327,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 .googleReaderAPI: + case .readerAPI: ReaderAPIAccountDelegate.validateCredentials(transport: transport, credentials: credentials, endpoint: endpoint, completion: completion) default: break diff --git a/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift index 6c2143f66..b81c1cebc 100644 --- a/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift +++ b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift @@ -538,7 +538,7 @@ final class ReaderAPIAccountDelegate: AccountDelegate { func accountDidInitialize(_ account: Account) { accountMetadata = account.metadata - credentials = try? account.retrieveGoogleAuthCredentials() + credentials = try? account.retrieveReaderAPIAuthCredentials() } static func validateCredentials(transport: Transport, credentials: Credentials, endpoint: URL?, completion: @escaping (Result) -> Void) { diff --git a/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift b/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift index 4384af936..b2491a0a0 100644 --- a/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift +++ b/Frameworks/Account/ReaderAPI/ReaderAPICaller.swift @@ -84,7 +84,7 @@ final class ReaderAPICaller: NSObject { return } - guard case .googleBasicLogin(let username, _) = credentials else { + guard case .readerAPIBasicLogin(let username, _) = credentials else { completion(.failure(CredentialsError.incompleteCredentials)) return } @@ -117,7 +117,7 @@ final class ReaderAPICaller: NSObject { } // Save Auth Token for later use - self.credentials = .googleAuthLogin(username: username, apiKey: authString) + self.credentials = .readerAPIAuthLogin(username: username, apiKey: authString) completion(.success(self.credentials)) case .failure(let error): diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 8b1ab7796..a2610aa89 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -34,6 +34,10 @@ struct AppAssets { return RSImage(named: "accountFeedbin") }() + static var accountReader: RSImage! = { + return RSImage(named: "accountReader") + }() + static var faviconTemplateImage: RSImage = { return RSImage(named: "faviconTemplateImage")! }() diff --git a/Mac/Preferences/Accounts/AccountsAddLocal.xib b/Mac/Preferences/Accounts/AccountsAddLocal.xib index c035af932..5f56d2f4b 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 64d94eafc..4e3019ea4 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", comment: "Reader") - cell.accountImageView?.image = AppAssets.accountLocal + cell.accountNameLabel?.stringValue = NSLocalizedString("Reader API", comment: "Reader API") + cell.accountImageView?.image = AppAssets.accountReader default: break } diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift index 84673da8b..5ad1aaa7a 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 .googleReaderAPI: - cell.imageView?.image = AppAssets.accountLocal + case .readerAPI: + cell.imageView?.image = AppAssets.accountReader default: break } diff --git a/Mac/Preferences/Accounts/AccountsReaderAPI.xib b/Mac/Preferences/Accounts/AccountsReaderAPI.xib index 1da180f56..03f9f638d 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPI.xib +++ b/Mac/Preferences/Accounts/AccountsReaderAPI.xib @@ -1,8 +1,8 @@ - + - + @@ -23,13 +23,13 @@ - + - + @@ -37,11 +37,11 @@ - + - - + + @@ -206,6 +206,6 @@ Gw - + diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift index ac74eef50..4bdf31256 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift @@ -70,8 +70,8 @@ class AccountsReaderAPIWindowController: NSWindowController { return } - let credentials = Credentials.googleBasicLogin(username: usernameTextField.stringValue, password: passwordTextField.stringValue) - Account.validateCredentials(type: .googleReaderAPI, credentials: credentials, endpoint: apiURL) { [weak self] result in + let credentials = Credentials.readerAPIBasicLogin(username: usernameTextField.stringValue, password: passwordTextField.stringValue) + Account.validateCredentials(type: .readerAPI, credentials: credentials, endpoint: apiURL) { [weak self] result in guard let self = self else { return } @@ -89,14 +89,14 @@ class AccountsReaderAPIWindowController: NSWindowController { var newAccount = false if self.account == nil { - self.account = AccountManager.shared.createAccount(type: .googleReaderAPI) + self.account = AccountManager.shared.createAccount(type: .readerAPI) newAccount = true } do { self.account?.endpointURL = apiURL - try self.account?.removeGoogleAuthCredentials() + try self.account?.removeReaderAPIAuthCredentials() try self.account?.storeCredentials(validatedCredentials) if newAccount { diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json new file mode 100644 index 000000000..d8d735f71 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/accountReader.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "accountReader.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf b/Mac/Resources/Assets.xcassets/accountReader.imageset/accountReader.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8e49ad8aa5d3892d26cdd25be6177bebec4f3bd5 GIT binary patch literal 3998 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