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

Renamed SettingsViewRow to SettingsRow

Browse Source
This commit is contained in:
Stuart Breckenridge
2023-03-23 21:18:59 +08:00
parent 23eb0cb079
commit 7cd575d6b3
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iOS/Settings/Appearance/DisplayAndBehaviorsView.swift
View File

@@ -20,17 +20,17 @@ struct DisplayAndBehaviorsView: View {
}
Section(header: Text("Timeline", comment: "Display & Behaviours: Timeline section header")) {
SettingsViewRows.sortOldestToNewest($appDefaults.timelineSortDirectionBool)
SettingsViewRows.groupByFeed($appDefaults.timelineGroupByFeed)
SettingsViewRows.confirmMarkAllAsRead($appDefaults.confirmMarkAllAsRead)
SettingsViewRows.markAsReadOnScroll($appDefaults.markArticlesAsReadOnScroll)
SettingsViewRows.refreshToClearReadArticles($appDefaults.refreshClearsReadArticles)
SettingsViewRows.timelineLayout
SettingsRow.sortOldestToNewest($appDefaults.timelineSortDirectionBool)
SettingsRow.groupByFeed($appDefaults.timelineGroupByFeed)
SettingsRow.confirmMarkAllAsRead($appDefaults.confirmMarkAllAsRead)
SettingsRow.markAsReadOnScroll($appDefaults.markArticlesAsReadOnScroll)
SettingsRow.refreshToClearReadArticles($appDefaults.refreshClearsReadArticles)
SettingsRow.timelineLayout
}
Section(header: Text("Article", comment: "Display & Behaviours: Article section header")) {
SettingsViewRows.themeSelection
SettingsViewRows.openLinksInNetNewsWire(Binding<Bool>(
SettingsRow.themeSelection
SettingsRow.openLinksInNetNewsWire(Binding<Bool>(
get: { !appDefaults.useSystemBrowser },
set: { appDefaults.useSystemBrowser = !$0 }
))

2
iOS/Settings/General/SettingsRows.swift
View File

@@ -13,7 +13,7 @@ import UniformTypeIdentifiers
// MARK: - Rows
struct SettingsViewRows {
struct SettingsRow {
/// This row, when tapped, will open iOS System Settings.
static var openSystemSettings: some View {

18
iOS/Settings/General/SettingsView.swift
View File

@@ -26,15 +26,15 @@ struct SettingsView: View {
// Device Permissions
Section(header: Text("Device Permissions", comment: "Settings: Device Permissions section header."),
footer: Text("Configure NetNewsWire's access to Siri, background app refresh, mobile data, and more.", comment: "Settings: Device Permissions section footer.")) {
SettingsViewRows.openSystemSettings
SettingsRow.openSystemSettings
}
// Account/Extensions/OPML Management
Section(header: Text("Accounts & Extensions", comment: "Settings: Accounts and Extensions section header."),
footer: Text("Add, delete, enable, or disable accounts and extensions.", comment: "Settings: Accounts and Extensions section footer.")) {
SettingsViewRows.addAccount
SettingsViewRows.manageExtensions
SettingsViewRows.importOPML(showImportActionSheet: $viewModel.showImportActionSheet)
SettingsRow.addAccount
SettingsRow.manageExtensions
SettingsRow.importOPML(showImportActionSheet: $viewModel.showImportActionSheet)
.confirmationDialog(Text("Choose an account to receive the imported feeds and folders", comment: "Import OPML confirmation title."),
isPresented: $viewModel.showImportActionSheet,
titleVisibility: .visible) {
@@ -46,7 +46,7 @@ struct SettingsView: View {
}
}
SettingsViewRows.exportOPML(showExportActionSheet: $viewModel.showExportActionSheet)
SettingsRow.exportOPML(showExportActionSheet: $viewModel.showExportActionSheet)
.confirmationDialog(Text("Choose an account with the subscriptions to export", comment: "Export OPML confirmation title."),
isPresented: $viewModel.showExportActionSheet,
titleVisibility: .visible) {
@@ -68,18 +68,18 @@ struct SettingsView: View {
// Appearance
Section(header: Text("Appearance", comment: "Settings: Appearance section header."),
footer: Text("Manage the look, feel, and behavior of NetNewsWire.", comment: "Settings: Appearance section footer.")) {
SettingsViewRows.configureAppearance($isConfigureAppearanceShown)
SettingsRow.configureAppearance($isConfigureAppearanceShown)
if viewModel.notificationPermissions == .authorized {
SettingsViewRows.configureNewArticleNotifications
SettingsRow.configureNewArticleNotifications
}
}
// Help
Section {
ForEach(0..<HelpSheet.allCases.count, id: \.self) { i in
SettingsViewRows.showHelpSheet(sheet: HelpSheet.allCases[i], selectedSheet: $viewModel.helpSheet, $viewModel.showHelpSheet)
SettingsRow.showHelpSheet(sheet: HelpSheet.allCases[i], selectedSheet: $viewModel.helpSheet, $viewModel.showHelpSheet)
}
SettingsViewRows.aboutNetNewsWire
SettingsRow.aboutNetNewsWire
}
}
.tint(Color(uiColor: AppAssets.primaryAccentColor))