[iOS] Fix settings picker layouts on iOS 18 (uplift to 1.71.x) (#25656)

Uplift of #25617 (squashed) to beta
brave · Sep 20, 2024 · 2198479 · 2198479
1 parent 9fc71b1
commit 2198479
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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/...Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/AdvancedShieldsSettingsView.swift b/...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/...es/Brave/Frontend/Settings/Features/ShieldsPrivacy/FilterLists/FilterListAddURLView.swift b/...es/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/...s/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/PrivacyReportSettingsView.swift b/...s/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/...brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ShredSettingsView.swift b/...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
@@ -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
@@ -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
@@ -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
@@ -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(