Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 1 commit into
base: 1.70.x
Choose a base branch
from
+15 −15
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/AdBlock/AdBlockDebugView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import WebKit

struct AdBlockDebugView: View {
var body: some View {
List {
Form {
CompileContentBlockersSectionView()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Search/BraveSearchDebugMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/Brave Wallet/BraveWalletDebugMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
8 changes: 4 additions & 4 deletions ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveCoreDebugSwitchesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -190,7 +190,7 @@ private struct CustomSwitchInputView: View {
}

var body: some View {
List {
Form {
Section {
TextField("Key", text: $key)
.disableAutocorrection(true)
Expand Down Expand Up @@ -310,7 +310,7 @@ struct BraveCoreDebugSwitchesView: View {
}

var body: some View {
List {
Form {
Section {
Text("Switches only affect fresh launches")
.frame(maxWidth: .infinity)
Expand Down
2 changes: 1 addition & 1 deletion ...Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/AdvancedShieldsSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct AdvancedShieldsSettingsView: View {
}

var body: some View {
List {
Form {
DefaultShieldsSectionView(settings: settings)
ClearDataSectionView(settings: settings)

Expand Down
2 changes: 1 addition & 1 deletion ...es/Brave/Frontend/Settings/Features/ShieldsPrivacy/FilterLists/FilterListAddURLView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct FilterListAddURLView: View {

var body: some View {
NavigationView {
List {
Form {
Section(
content: {
VStack(alignment: .leading) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/PrivacyReportSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion ...brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ShredSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct ShredSettingsView: View {
}

var body: some View {
List {
Form {
Section {
Picker(selection: $settings.shredLevel) {
ForEach(SiteShredLevel.allCases) { level in
Expand Down
2 changes: 1 addition & 1 deletion ios/brave-ios/Sources/Brave/Frontend/Settings/General/WebsiteRedirectsSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public struct NewsSettingsView: View {
}

public var body: some View {
List {
Form {
Section {
if isNewsEnabled.value {
destinations
Expand Down
2 changes: 1 addition & 1 deletion ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading