renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Continue renaming Id to ID (and similar renames).

Browse Source
This commit is contained in:
Brent Simmons
2023-09-16 22:04:43 -07:00
parent dd8df6e6c5
commit 5e3086667d
60 changed files with 420 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Account/NewsBlurAddAccountView.swift
View File

@@ -144,7 +144,7 @@ import RSCore
do {
do {
try self.account?.removeCredentials(type: .newsBlurBasic)
try self.account?.removeCredentials(type: .newsBlurSessionId)
try self.account?.removeCredentials(type: .newsBlurSessionID)
} catch {
NewsBlurAddAccountView.logger.error("\(error.localizedDescription)")
}

8
iOS/Account/ReaderAPIAddAccountView.swift
View File

@@ -22,7 +22,7 @@ import RSCore
@State private var accountCredentials: Credentials?
@State private var accountUserName: String = ""
@State private var accountSecret: String = ""
@State private var accountAPIUrl: String = ""
@State private var accountAPIURL: String = ""
@State private var showProgressIndicator: Bool = false
@State private var accountError: (Error?, Bool) = (nil, false)
@@ -88,7 +88,7 @@ import RSCore
SecureField("Password", text: $accountSecret, prompt: Text("textfield.placeholder.password", comment: "Password"))
.textContentType(.password)
if accountType == .freshRSS && accountCredentials == nil {
TextField("FreshRSS URL", text: $accountAPIUrl, prompt: Text(verbatim: "fresh.rss.net/api/greader.php"))
TextField("FreshRSS URL", text: $accountAPIURL, prompt: Text(verbatim: "fresh.rss.net/api/greader.php"))
.autocorrectionDisabled()
.autocapitalization(.none)
}
@@ -147,7 +147,7 @@ import RSCore
if accountType == nil { return false }
switch accountType! {
case .freshRSS:
if (accountUserName.trimmingWhitespace.count == 0) || (accountSecret.trimmingWhitespace.count == 0) || (accountAPIUrl.trimmingWhitespace.count == 0) {
if (accountUserName.trimmingWhitespace.count == 0) || (accountSecret.trimmingWhitespace.count == 0) || (accountAPIURL.trimmingWhitespace.count == 0) {
return false
}
default:
@@ -215,7 +215,7 @@ import RSCore
private func apiURL() -> URL? {
switch accountType! {
case .freshRSS:
return URL(string: accountAPIUrl)!
return URL(string: accountAPIURL)!
case .inoreader:
return URL(string: ReaderAPIVariant.inoreader.host)!
case .bazQux:

2
iOS/Intents/AddFeedIntentHandler.swift
View File

@@ -27,7 +27,7 @@ public class AddFeedIntentHandler: NSObject, AddFeedIntentHandling {
super.init()
}
public func resolveUrl(for intent: AddFeedIntent, with completion: @escaping (AddFeedUrlResolutionResult) -> Void) {
public func resolveURL(for intent: AddFeedIntent, with completion: @escaping (AddFeedURLResolutionResult) -> Void) {
guard let url = intent.url else {
completion(.unsupported(forReason: .required))
return