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

Rename AppDefaults.addWebFeedFolderName to .addFeedFolderName.

Browse Source
This commit is contained in:
Brent Simmons
2023-07-02 15:28:15 -07:00
parent 5c2a33a800
commit 169f018c6a
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Mac/AppDefaults.swift
View File

@@ -35,7 +35,7 @@ final class AppDefaults {
static let articleTextSize = "articleTextSize"
static let refreshInterval = "refreshInterval"
static let addFeedAccountID = "addWebFeedAccountID"
static let addWebFeedFolderName = "addWebFeedFolderName"
static let addFeedFolderName = "addWebFeedFolderName"
static let addFolderAccountID = "addFolderAccountID"
static let importOPMLAccountID = "importOPMLAccountID"
static let exportOPMLAccountID = "exportOPMLAccountID"
@@ -161,12 +161,12 @@ final class AppDefaults {
}
}
var addWebFeedFolderName: String? {
var addFeedFolderName: String? {
get {
return AppDefaults.string(for: Key.addWebFeedFolderName)
return AppDefaults.string(for: Key.addFeedFolderName)
}
set {
AppDefaults.setString(for: Key.addWebFeedFolderName, newValue)
AppDefaults.setString(for: Key.addFeedFolderName, newValue)
}
}

6
Shared/Extensions/AddWebFeedDefaultContainer.swift
View File

@@ -14,7 +14,7 @@ struct AddWebFeedDefaultContainer {
static var defaultContainer: Container? {
if let accountID = AppDefaults.shared.addFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) {
if let folderName = AppDefaults.shared.addWebFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) {
if let folderName = AppDefaults.shared.addFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) {
return folder
} else {
return substituteContainerIfNeeded(account: account)
@@ -30,9 +30,9 @@ struct AddWebFeedDefaultContainer {
static func saveDefaultContainer(_ container: Container) {
AppDefaults.shared.addFeedAccountID = container.account?.accountID
if let folder = container as? Folder {
AppDefaults.shared.addWebFeedFolderName = folder.nameForDisplay
AppDefaults.shared.addFeedFolderName = folder.nameForDisplay
} else {
AppDefaults.shared.addWebFeedFolderName = nil
AppDefaults.shared.addFeedFolderName = nil
}
}

6
Shared/ShareExtension/ShareDefaultContainer.swift
View File

@@ -13,7 +13,7 @@ struct ShareDefaultContainer {
static func defaultContainer(containers: ExtensionContainers) -> ExtensionContainer? {
if let accountID = AppDefaults.shared.addFeedAccountID, let account = containers.accounts.first(where: { $0.accountID == accountID }) {
if let folderName = AppDefaults.shared.addWebFeedFolderName, let folder = account.folders.first(where: { $0.name == folderName }) {
if let folderName = AppDefaults.shared.addFeedFolderName, let folder = account.folders.first(where: { $0.name == folderName }) {
return folder
} else {
return substituteContainerIfNeeded(account: account)
@@ -29,9 +29,9 @@ struct ShareDefaultContainer {
static func saveDefaultContainer(_ container: ExtensionContainer) {
AppDefaults.shared.addFeedAccountID = container.accountID
if let folder = container as? ExtensionFolder {
AppDefaults.shared.addWebFeedFolderName = folder.name
AppDefaults.shared.addFeedFolderName = folder.name
} else {
AppDefaults.shared.addWebFeedFolderName = nil
AppDefaults.shared.addFeedFolderName = nil
}
}

8
iOS/AppDefaults.swift
View File

@@ -55,7 +55,7 @@ final class AppDefaults: ObservableObject {
static let hasUsedFullScreenPreviously = "hasUsedFullScreenPreviously"
static let confirmMarkAllAsRead = "confirmMarkAllAsRead"
static let addFeedAccountID = "addWebFeedAccountID"
static let addWebFeedFolderName = "addWebFeedFolderName"
static let addFeedFolderName = "addWebFeedFolderName"
static let addFolderAccountID = "addFolderAccountID"
static let useSystemBrowser = "useSystemBrowser"
static let currentThemeName = "currentThemeName"
@@ -102,12 +102,12 @@ final class AppDefaults: ObservableObject {
}
}
var addWebFeedFolderName: String? {
var addFeedFolderName: String? {
get {
return AppDefaults.string(for: Key.addWebFeedFolderName)
return AppDefaults.string(for: Key.addFeedFolderName)
}
set {
AppDefaults.setString(for: Key.addWebFeedFolderName, newValue)
AppDefaults.setString(for: Key.addFeedFolderName, newValue)
AppDefaults.shared.objectWillChange.send()
}
}