From bb49e744ae448e6498a5344cab0a0d222adb91c5 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Sat, 12 Nov 2022 21:35:59 +0800 Subject: [PATCH] simplifies Settings options --- .../Assets.xcassets/Settings/Contents.json | 6 +++ .../app.account.imageset/Contents.json | 12 +++++ .../app.account.imageset/app.account.pdf | Bin 0 -> 5357 bytes .../app.appearance.imageset/Contents.json | 12 +++++ .../app.appearance.pdf | Bin 0 -> 5150 bytes .../app.extension.imageset/Contents.json | 12 +++++ .../app.extension.imageset/app.extension.pdf | Bin 0 -> 5266 bytes .../Contents.json | 12 +++++ .../notifications.sounds.pdf | Bin 0 -> 5369 bytes .../system.settings.imageset/Contents.json | 12 +++++ .../system.settings.pdf | Bin 0 -> 5825 bytes iOS/Settings/Settings View/SettingsRows.swift | 49 ++++++++++-------- iOS/Settings/Settings View/SettingsView.swift | 44 ++++++---------- 13 files changed, 109 insertions(+), 50 deletions(-) create mode 100644 iOS/Resources/Assets.xcassets/Settings/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/Settings/app.account.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/Settings/app.account.imageset/app.account.pdf create mode 100644 iOS/Resources/Assets.xcassets/Settings/app.appearance.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/Settings/app.appearance.imageset/app.appearance.pdf create mode 100644 iOS/Resources/Assets.xcassets/Settings/app.extension.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/Settings/app.extension.imageset/app.extension.pdf create mode 100644 iOS/Resources/Assets.xcassets/Settings/notifications.sounds.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/Settings/notifications.sounds.imageset/notifications.sounds.pdf create mode 100644 iOS/Resources/Assets.xcassets/Settings/system.settings.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/Settings/system.settings.imageset/system.settings.pdf diff --git a/iOS/Resources/Assets.xcassets/Settings/Contents.json b/iOS/Resources/Assets.xcassets/Settings/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/iOS/Resources/Assets.xcassets/Settings/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/Resources/Assets.xcassets/Settings/app.account.imageset/Contents.json b/iOS/Resources/Assets.xcassets/Settings/app.account.imageset/Contents.json new file mode 100644 index 000000000..7c6a92182 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/Settings/app.account.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "app.account.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/Resources/Assets.xcassets/Settings/app.account.imageset/app.account.pdf b/iOS/Resources/Assets.xcassets/Settings/app.account.imageset/app.account.pdf new file mode 100644 index 0000000000000000000000000000000000000000..e339edc4e93eafb5ba39a8b3ce50f7bf79937b88 GIT binary patch literal 5357 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 B_o4s* literal 0 HcmV?d00001 diff --git a/iOS/Resources/Assets.xcassets/Settings/app.appearance.imageset/Contents.json b/iOS/Resources/Assets.xcassets/Settings/app.appearance.imageset/Contents.json new file mode 100644 index 000000000..330472128 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/Settings/app.appearance.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "app.appearance.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/Resources/Assets.xcassets/Settings/app.appearance.imageset/app.appearance.pdf b/iOS/Resources/Assets.xcassets/Settings/app.appearance.imageset/app.appearance.pdf new file mode 100644 index 0000000000000000000000000000000000000000..19f943839b5c24168f4fb3b0e72f42319681a2a0 GIT binary patch literal 5150 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 literal 0 HcmV?d00001 diff --git a/iOS/Resources/Assets.xcassets/Settings/app.extension.imageset/Contents.json b/iOS/Resources/Assets.xcassets/Settings/app.extension.imageset/Contents.json new file mode 100644 index 000000000..3e6386566 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/Settings/app.extension.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "app.extension.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/Resources/Assets.xcassets/Settings/app.extension.imageset/app.extension.pdf b/iOS/Resources/Assets.xcassets/Settings/app.extension.imageset/app.extension.pdf new file mode 100644 index 0000000000000000000000000000000000000000..1893a41f08fb2414f69efb51210006e7a5c91fbd GIT binary patch literal 5266 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 KxVV;~HuOJP-Oc9! literal 0 HcmV?d00001 diff --git a/iOS/Resources/Assets.xcassets/Settings/notifications.sounds.imageset/Contents.json b/iOS/Resources/Assets.xcassets/Settings/notifications.sounds.imageset/Contents.json new file mode 100644 index 000000000..6222d7dd9 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/Settings/notifications.sounds.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "notifications.sounds.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/Resources/Assets.xcassets/Settings/notifications.sounds.imageset/notifications.sounds.pdf b/iOS/Resources/Assets.xcassets/Settings/notifications.sounds.imageset/notifications.sounds.pdf new file mode 100644 index 0000000000000000000000000000000000000000..be7e7123299e42a615355f3aa2674dc3ef684be8 GIT binary patch literal 5369 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 KprATN1M+|Wi}_Cg literal 0 HcmV?d00001 diff --git a/iOS/Resources/Assets.xcassets/Settings/system.settings.imageset/Contents.json b/iOS/Resources/Assets.xcassets/Settings/system.settings.imageset/Contents.json new file mode 100644 index 000000000..842c6a591 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/Settings/system.settings.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "system.settings.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/Resources/Assets.xcassets/Settings/system.settings.imageset/system.settings.pdf b/iOS/Resources/Assets.xcassets/Settings/system.settings.imageset/system.settings.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c17072520682efd3b88ccf7caa92c91c8413684b GIT binary patch literal 5825 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 -> some View { HStack { - Text("Accounts") + //Text("Accounts") Spacer() Button { showAddAccount.wrappedValue.toggle() @@ -43,12 +43,11 @@ struct SettingsViewRows { Label { Text("Open System Settings") } icon: { - Image(systemName: "gear.circle.fill") + Image("system.settings") .resizable() - .renderingMode(.template) - .foregroundColor(.gray) .aspectRatio(contentMode: .fit) .frame(width: 25.0, height: 25.0) + .clipShape(RoundedRectangle(cornerRadius: 6)) } .onTapGesture { UIApplication.shared.open(URL(string: "\(UIApplication.openSettingsURLString)")!) @@ -60,14 +59,12 @@ struct SettingsViewRows { static var ConfigureNewArticleNotifications: some View { NavigationLink(destination: NotificationsViewControllerRepresentable().edgesIgnoringSafeArea(.all)) { Label { - Text("New Article Notifications") + Text("Notifications and Sounds") } icon: { - Image(systemName: "bell.square.fill") + Image("notifications.sounds") .resizable() - .renderingMode(.template) - .foregroundColor(.red) - .aspectRatio(contentMode: .fit) .frame(width: 25.0, height: 25.0) + .clipShape(RoundedRectangle(cornerRadius: 6)) } } } @@ -77,14 +74,12 @@ struct SettingsViewRows { static var AddAccount: some View { NavigationLink(destination: AddAccountViewControllerRepresentable().edgesIgnoringSafeArea(.all)) { Label { - Text("Add Account") + Text("Manage Accounts") } icon: { - Image(systemName: "plus.app.fill") + Image("app.account") .resizable() - .renderingMode(.template) - .foregroundColor(Color(uiColor: AppAssets.primaryAccentColor)) - .aspectRatio(contentMode: .fit) .frame(width: 25.0, height: 25.0) + .clipShape(RoundedRectangle(cornerRadius: 6)) } } } @@ -110,12 +105,12 @@ struct SettingsViewRows { static var AddExtension: some View { NavigationLink(destination: NotificationsViewControllerRepresentable()) { Label { - Text("Add Extension") + Text("Manage Extensions") } icon: { - Image(systemName: "puzzlepiece.extension") + Image("app.extension") .resizable() - .aspectRatio(contentMode: .fit) .frame(width: 25.0, height: 25.0) + .clipShape(RoundedRectangle(cornerRadius: 6)) } } } @@ -219,14 +214,12 @@ struct SettingsViewRows { static var ConfigureAppearance: some View { NavigationLink(destination: NotificationsViewControllerRepresentable().edgesIgnoringSafeArea(.all)) { Label { - Text("Configure Appearance") + Text("Appearance") } icon: { - Image(systemName: "rectangle.trailinghalf.filled") + Image("app.appearance") .resizable() - .renderingMode(.template) - .foregroundColor(.black) - .aspectRatio(contentMode: .fit) .frame(width: 25.0, height: 25.0) + .clipShape(RoundedRectangle(cornerRadius: 6)) } } } @@ -253,4 +246,16 @@ struct SettingsViewRows { show.wrappedValue.toggle() } } + + static var AboutNetNewsWire: some View { + NavigationLink { + AboutView() + } label: { + Label { + Text("About NetNewsWire") + } icon: { + Image(systemName: "questionmark.square.dashed") + } + } + } } diff --git a/iOS/Settings/Settings View/SettingsView.swift b/iOS/Settings/Settings View/SettingsView.swift index 82f05315d..83f116da6 100644 --- a/iOS/Settings/Settings View/SettingsView.swift +++ b/iOS/Settings/Settings View/SettingsView.swift @@ -15,50 +15,35 @@ struct SettingsView: View { @State private var showAddAccountView: Bool = false @State private var helpSheet: HelpSheet = .help @State private var showHelpSheet: Bool = false + @State private var showAbout: Bool = false var body: some View { NavigationView { List { - Section("Notifications, Badge, Data, and More") { + + // System Settings + Section(footer: Text("Configure access to Siri, background app refresh, mobile data, and more.")) { SettingsViewRows.OpenSystemSettings - SettingsViewRows.ConfigureNewArticleNotifications } - Section(header: SettingsViewHeaders.AddAccountHeader($showAddAccountView)) { - SettingsViewRows.ActiveAccounts - } - - Section("Extensions") { + Section(footer: Text("Add, delete, or disable accounts and extensions.")) { + SettingsViewRows.AddAccount SettingsViewRows.AddExtension } - Section("Subscriptions") { - SettingsViewRows.ImportSubscription - SettingsViewRows.ExportSubscription - } - - Section("Timeline") { - SettingsViewRows.SortOldestToNewest($appDefaults.timelineSortDirectionBool) - SettingsViewRows.GroupByFeed($appDefaults.timelineGroupByFeed) - SettingsViewRows.RefreshToClearReadArticles($appDefaults.refreshClearsReadArticles) - SettingsViewRows.TimelineLayout - } - - Section("Articles") { - SettingsViewRows.ThemeSelection - SettingsViewRows.ConfirmMarkAllAsRead($appDefaults.confirmMarkAllAsRead) - SettingsViewRows.OpenLinksInNetNewsWire($appDefaults.useSystemBrowser) - SettingsViewRows.EnableFullScreenArticles($appDefaults.articleFullscreenEnabled) - } - - Section("Appearance") { + Section(footer: Text("Configure the look and feel of NetNewsWire.")) { + SettingsViewRows.ConfigureNewArticleNotifications SettingsViewRows.ConfigureAppearance } - Section("Help") { + + + Section { ForEach(0..