From 4dc2d6ce119526132fc826fe2e58e3ea724f8cf9 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Thu, 19 Sep 2024 16:54:09 +0000 Subject: [PATCH] Uplift of #25617 (squashed) to release --- .../Settings/Debug/AdBlock/AdBlockDebugView.swift | 2 +- .../Debug/Brave Search/BraveSearchDebugMenu.swift | 2 +- .../Debug/Brave Wallet/BraveWalletDebugMenu.swift | 2 +- .../Settings/Debug/BraveCoreDebugSwitchesView.swift | 8 ++++---- .../ShieldsPrivacy/AdvancedShieldsSettingsView.swift | 2 +- .../ShieldsPrivacy/FilterLists/FilterListAddURLView.swift | 2 +- .../ShieldsPrivacy/PrivacyReportSettingsView.swift | 2 +- .../Features/ShieldsPrivacy/ShredSettingsView.swift | 2 +- .../Settings/General/WebsiteRedirectsSettingsView.swift | 2 +- .../Sources/BraveNews/Customize/NewsSettingsView.swift | 2 +- .../BraveNews/Settings/BraveNewsDebugSettingsView.swift | 2 +- .../Sources/BraveWallet/Settings/Web3SettingsView.swift | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/AdBlock/AdBlockDebugView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/AdBlock/AdBlockDebugView.swift index 4b1c027039aa..06c45d3209a2 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/AdBlock/AdBlockDebugView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/AdBlock/AdBlockDebugView.swift @@ -8,7 +8,7 @@ import WebKit struct AdBlockDebugView: View { var body: some View { - List { + Form { CompileContentBlockersSectionView() } } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Search/BraveSearchDebugMenu.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Search/BraveSearchDebugMenu.swift index 3972fcc68d64..1658308be99f 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Search/BraveSearchDebugMenu.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Search/BraveSearchDebugMenu.swift @@ -15,7 +15,7 @@ struct BraveSearchDebugMenu: View { @State private var storageTypes: [String] = [] var body: some View { - List { + Form { Section { Toggle("Enable callback logging", isOn: $logging.isEnabled) .toggleStyle(SwitchToggleStyle(tint: .accentColor)) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Wallet/BraveWalletDebugMenu.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Wallet/BraveWalletDebugMenu.swift index bc51d5065cc4..9fdec48bffab 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Wallet/BraveWalletDebugMenu.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Wallet/BraveWalletDebugMenu.swift @@ -13,7 +13,7 @@ struct BraveWalletDebugMenu: View { @ObservedObject var enableBitcoinTestnet = Preferences.Wallet.isBitcoinTestnetEnabled var body: some View { - List { + Form { Section { Toggle("Enable Bitcoin Testnet", isOn: $enableBitcoinTestnet.value) .toggleStyle(SwitchToggleStyle(tint: .accentColor)) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveCoreDebugSwitchesView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveCoreDebugSwitchesView.swift index 0c975ab11239..a4c8be70aa99 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveCoreDebugSwitchesView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveCoreDebugSwitchesView.swift @@ -81,7 +81,7 @@ private struct BasicStringInputView: View { @State private var text: String = "" var body: some View { - List { + Form { Section { TextField(coreSwitch.displayString, text: $text) .disableAutocorrection(true) @@ -135,7 +135,7 @@ private struct BasicPickerInputView: View { @State private var selectedItem: String = "" var body: some View { - List { + Form { Picker("", selection: $selectedItem) { Text("Default") .foregroundColor(Color(.secondaryBraveLabel)) @@ -190,7 +190,7 @@ private struct CustomSwitchInputView: View { } var body: some View { - List { + Form { Section { TextField("Key", text: $key) .disableAutocorrection(true) @@ -310,7 +310,7 @@ struct BraveCoreDebugSwitchesView: View { } var body: some View { - List { + Form { Section { Text("Switches only affect fresh launches") .frame(maxWidth: .infinity) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/AdvancedShieldsSettingsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/AdvancedShieldsSettingsView.swift index ceb20238d834..df2b3e1cdb47 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/AdvancedShieldsSettingsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/AdvancedShieldsSettingsView.swift @@ -21,7 +21,7 @@ struct AdvancedShieldsSettingsView: View { } var body: some View { - List { + Form { DefaultShieldsSectionView(settings: settings) ClearDataSectionView(settings: settings) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/FilterLists/FilterListAddURLView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/FilterLists/FilterListAddURLView.swift index 6dfb42a51c60..c26af1bf1c82 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/FilterLists/FilterListAddURLView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/FilterLists/FilterListAddURLView.swift @@ -33,7 +33,7 @@ struct FilterListAddURLView: View { var body: some View { NavigationView { - List { + Form { Section( content: { VStack(alignment: .leading) { diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/PrivacyReportSettingsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/PrivacyReportSettingsView.swift index 1b4ce7b2d003..0bbd9447d1f2 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/PrivacyReportSettingsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/PrivacyReportSettingsView.swift @@ -16,7 +16,7 @@ struct PrivacyReportSettingsView: View { @State private var showClearDataPrompt: Bool = false var body: some View { - List { + Form { Section(footer: Text(Strings.PrivacyHub.settingsEnableShieldsFooter)) { Toggle(Strings.PrivacyHub.settingsEnableShieldsTitle, isOn: $shieldsDataEnabled.value) .toggleStyle(SwitchToggleStyle(tint: .accentColor)) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ShredSettingsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ShredSettingsView.swift index b044b8dcc545..fedbe21d8183 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ShredSettingsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ShredSettingsView.swift @@ -21,7 +21,7 @@ struct ShredSettingsView: View { } var body: some View { - List { + Form { Section { Picker(selection: $settings.shredLevel) { ForEach(SiteShredLevel.allCases) { level in diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/General/WebsiteRedirectsSettingsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/General/WebsiteRedirectsSettingsView.swift index 7e1f120a61b5..f8f0807c1405 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/General/WebsiteRedirectsSettingsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/General/WebsiteRedirectsSettingsView.swift @@ -13,7 +13,7 @@ struct WebsiteRedirectsSettingsView: View { @ObservedObject private var npr = Preferences.WebsiteRedirects.npr var body: some View { - List { + Form { Section { Toggle(isOn: $reddit.value) { Text("reddit.com \(Image(systemName: "arrow.right")) old.reddit.com") diff --git a/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift b/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift index 48ac197ff8d2..6f992ff481cd 100644 --- a/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift +++ b/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift @@ -204,7 +204,7 @@ public struct NewsSettingsView: View { } public var body: some View { - List { + Form { Section { if isNewsEnabled.value { destinations diff --git a/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift b/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift index 2222320d3053..5c8fd6061cd4 100644 --- a/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift +++ b/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift @@ -62,7 +62,7 @@ public struct BraveNewsDebugSettingsView: View { } public var body: some View { - List { + Form { Section { Picker("Environment", selection: $environment) { ForEach(FeedDataSource.Environment.allCases, id: \.self) { env in diff --git a/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift b/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift index 4ada03824c8c..15cd803ab950 100644 --- a/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift @@ -30,7 +30,7 @@ public struct Web3SettingsView: View { } public var body: some View { - List { + Form { if let settingsStore = settingsStore { if let networkStore = networkStore, let keyringStore = keyringStore { WalletSettingsView(