diff --git a/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsView.swift b/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsView.swift index 4cfd7e01f13..3a30c54c513 100644 --- a/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsView.swift +++ b/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsView.swift @@ -380,7 +380,8 @@ public struct AIChatAdvancedSettingsView: View { } } } - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .listStyle(.insetGrouped) } diff --git a/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatDefaultModelView.swift b/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatDefaultModelView.swift index ddbee38bb68..48b85b79fe6 100644 --- a/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatDefaultModelView.swift +++ b/ios/brave-ios/Sources/AIChat/Components/Settings/AIChatDefaultModelView.swift @@ -55,7 +55,8 @@ struct AIChatDefaultModelView: View { } } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .listStyle(.insetGrouped) .navigationTitle(Strings.AIChat.defaultModelViewTitle) .sheet(isPresented: $isPresentingPaywallPremium) { diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/CertificateViewer/CertificateViewController.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/CertificateViewer/CertificateViewController.swift index 4708eb6cc64..17f90db77c1 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/CertificateViewer/CertificateViewController.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/CertificateViewer/CertificateViewController.swift @@ -96,7 +96,8 @@ private struct CertificateView: View { content } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .toolbar { ToolbarItemGroup(placement: .navigationBarTrailing) { Button(Strings.done) { diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/PageZoom/PageZoomSettingsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/PageZoom/PageZoomSettingsView.swift index 1e34554b7de..ee0b3851488 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/PageZoom/PageZoomSettingsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/PageZoom/PageZoomSettingsView.swift @@ -122,7 +122,8 @@ struct PageZoomSettingsView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .listStyle(.insetGrouped) } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/AllVPNAlertsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/AllVPNAlertsView.swift index 4c168b82a3a..ef18d29efe0 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/AllVPNAlertsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/AllVPNAlertsView.swift @@ -123,7 +123,8 @@ extension PrivacyReportsView { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) Spacer() } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/PrivacyReportAllTimeListsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/PrivacyReportAllTimeListsView.swift index f4c7718c05f..060e7bd0ec3 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/PrivacyReportAllTimeListsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/PrivacyHub/PrivacyReportAllTimeListsView.swift @@ -113,7 +113,8 @@ struct PrivacyReportAllTimeListsView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) } private var websitesList: some View { @@ -137,7 +138,8 @@ struct PrivacyReportAllTimeListsView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) } var body: some View { diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/Tabs/RecentlyClosedTabs/RecentlyClosedTabsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/Tabs/RecentlyClosedTabs/RecentlyClosedTabsView.swift index 875946fce6b..4fe6c3adc40 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/Tabs/RecentlyClosedTabs/RecentlyClosedTabsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/Tabs/RecentlyClosedTabs/RecentlyClosedTabsView.swift @@ -109,7 +109,8 @@ struct RecentlyClosedTabsView: View { } .environment(\.defaultMinListHeaderHeight, 0) .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) } init(tabManager: TabManager? = nil) { 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 f5460da37bb..baa4e1d590b 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveCoreDebugSwitchesView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveCoreDebugSwitchesView.swift @@ -94,7 +94,8 @@ private struct BasicStringInputView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(coreSwitch.displayString) .onAppear { // SwiftUI bug, has to wait a bit @@ -147,7 +148,8 @@ private struct BasicPickerInputView: View { .pickerStyle(.inline) } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(coreSwitch.displayString) .onAppear { // SwiftUI bug, has to wait a bit @@ -215,7 +217,8 @@ private struct CustomSwitchInputView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle("Custom Switch") .onAppear { // SwiftUI bug, has to wait a bit @@ -482,7 +485,8 @@ struct BraveCoreDebugSwitchesView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitle("BraveCore Switches") } } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenu.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenu.swift index 1658308be99..a9b0016c03b 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenu.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenu.swift @@ -44,7 +44,8 @@ struct BraveSearchDebugMenu: View { Text(String(describing: storageTypes)) } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .onAppear(perform: loadRecords) } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenuDetail.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenuDetail.swift index 3807e2bec45..0742bcf1c17 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenuDetail.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveSearch/BraveSearchDebugMenuDetail.swift @@ -36,7 +36,8 @@ struct BraveSearchDebugMenuDetail: View { ) } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) } private var cookieNames: String { diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveWallet/BraveWalletDebugMenu.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveWallet/BraveWalletDebugMenu.swift index 98fecd30a6e..dc9eec4f98c 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveWallet/BraveWalletDebugMenu.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/BraveWallet/BraveWalletDebugMenu.swift @@ -22,7 +22,8 @@ struct BraveWalletDebugMenu: View { .toggleStyle(SwitchToggleStyle(tint: .accentColor)) } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle("Brave Wallet Debug") .navigationBarTitleDisplayMode(.inline) } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/SandboxInspectorView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/SandboxInspectorView.swift index 48688276b37..dde206eeffc 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/SandboxInspectorView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Debug/SandboxInspectorView.swift @@ -142,7 +142,8 @@ struct SandboxInspectorView: View { } .listRowBackground(Color(.secondaryBraveGroupedBackground)) } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle("Sandbox Inspector") .navigationBarTitleDisplayMode(.inline) .onAppear(perform: getNodes) 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 02ef25f48b3..f69f8d26cf4 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 @@ -59,7 +59,8 @@ struct FilterListAddURLView: View { ) } .animation(.easeInOut, value: errorMessage) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .listStyle(.insetGrouped) .navigationTitle(Strings.Shields.customFilterList) .navigationBarTitleDisplayMode(.inline) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ManageWebsiteDataView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ManageWebsiteDataView.swift index 730e33556f3..20a0b92ff01 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ManageWebsiteDataView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Features/ShieldsPrivacy/ManageWebsiteDataView.swift @@ -133,7 +133,8 @@ struct ManageWebsiteDataView: View { .listRowBackground(Color(.braveBackground)) } .listStyle(.plain) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .environment(\.editMode, $editMode) .overlay( Group { 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 0bbd9447d1f..46e6db6809b 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 @@ -65,7 +65,8 @@ struct PrivacyReportSettingsView: View { } .navigationTitle(Strings.PrivacyHub.privacyReportsTitle) .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) } } 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 f8f0807c140..87d5c527ae2 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/General/WebsiteRedirectsSettingsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/General/WebsiteRedirectsSettingsView.swift @@ -35,7 +35,8 @@ struct WebsiteRedirectsSettingsView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(Strings.urlRedirectsSettings) } } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/Tabs/PrivateTabsView.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/Tabs/PrivateTabsView.swift index 5d3e7a83f9d..09a3ea4020e 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Settings/Tabs/PrivateTabsView.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/Tabs/PrivateTabsView.swift @@ -136,7 +136,8 @@ struct PrivateTabsView: View { } .navigationBarTitle(Strings.TabsSettings.privateTabsSettingsTitle) .navigationBarTitleDisplayMode(.inline) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) } } diff --git a/ios/brave-ios/Sources/BraveNews/Customize/ChannelListView.swift b/ios/brave-ios/Sources/BraveNews/Customize/ChannelListView.swift index d6ad6579f5e..0ceef634fd1 100644 --- a/ios/brave-ios/Sources/BraveNews/Customize/ChannelListView.swift +++ b/ios/brave-ios/Sources/BraveNews/Customize/ChannelListView.swift @@ -38,7 +38,8 @@ private struct ChannelListView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } .listStyle(.grouped) - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .environment(\.defaultMinListRowHeight, 0) .navigationBarTitleDisplayMode(.inline) .navigationTitle(Strings.BraveNews.channelsTitle) diff --git a/ios/brave-ios/Sources/BraveNews/Customize/FollowingListView.swift b/ios/brave-ios/Sources/BraveNews/Customize/FollowingListView.swift index 0fbdd27f33e..9d3caa6ff16 100644 --- a/ios/brave-ios/Sources/BraveNews/Customize/FollowingListView.swift +++ b/ios/brave-ios/Sources/BraveNews/Customize/FollowingListView.swift @@ -66,7 +66,8 @@ struct FollowingListView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } } - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .listStyle(.grouped) .environment(\.defaultMinListRowHeight, 0) .navigationTitle(Strings.BraveNews.followingTitle) diff --git a/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift b/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift index 81bdb925aa1..03a355635a5 100644 --- a/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift +++ b/ios/brave-ios/Sources/BraveNews/Customize/NewsSettingsView.swift @@ -218,7 +218,8 @@ public struct NewsSettingsView: View { } .listStyle(.insetGrouped) .animation(.default, value: searchDelegate.isEditing) - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(Strings.BraveNews.braveNews) .navigationBarTitleDisplayMode(.inline) .onChange(of: searchDelegate.query) { _, query in diff --git a/ios/brave-ios/Sources/BraveNews/Customize/SearchResultsView.swift b/ios/brave-ios/Sources/BraveNews/Customize/SearchResultsView.swift index 99943b5eae7..ea196c33999 100644 --- a/ios/brave-ios/Sources/BraveNews/Customize/SearchResultsView.swift +++ b/ios/brave-ios/Sources/BraveNews/Customize/SearchResultsView.swift @@ -114,7 +114,8 @@ struct SearchResultsView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .overlay( Group { if results.isEmpty, urlQuery == nil { diff --git a/ios/brave-ios/Sources/BraveNews/Customize/SourceListView.swift b/ios/brave-ios/Sources/BraveNews/Customize/SourceListView.swift index 4731b26c1c6..84f14994753 100644 --- a/ios/brave-ios/Sources/BraveNews/Customize/SourceListView.swift +++ b/ios/brave-ios/Sources/BraveNews/Customize/SourceListView.swift @@ -43,7 +43,8 @@ private struct SourceListView: View { } } .environment(\.defaultMinListRowHeight, 44) - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .listStyle(.grouped) .navigationTitle(Strings.BraveNews.popularSourcesTitle) .navigationBarTitleDisplayMode(.inline) diff --git a/ios/brave-ios/Sources/BraveNews/Customize/SourceSuggestionsView.swift b/ios/brave-ios/Sources/BraveNews/Customize/SourceSuggestionsView.swift index 1a063bf28cf..18fa5b0ec09 100644 --- a/ios/brave-ios/Sources/BraveNews/Customize/SourceSuggestionsView.swift +++ b/ios/brave-ios/Sources/BraveNews/Customize/SourceSuggestionsView.swift @@ -68,7 +68,8 @@ private struct SourceSuggestionsView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } .environment(\.defaultMinListRowHeight, 44) - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .listStyle(.grouped) .navigationTitle(Strings.BraveNews.suggestedTitle) .navigationBarTitleDisplayMode(.inline) diff --git a/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift b/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift index a069d4c3806..5ec9a86b6d6 100644 --- a/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift +++ b/ios/brave-ios/Sources/BraveNews/Settings/BraveNewsDebugSettingsView.swift @@ -197,7 +197,8 @@ public struct BraveNewsDebugSettingsView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle("Brave News QA Settings") .navigationBarTitleDisplayMode(.inline) .animation(.default, value: fileList) diff --git a/ios/brave-ios/Sources/BraveUI/SwiftUI/ListBackground.swift b/ios/brave-ios/Sources/BraveUI/SwiftUI/ListBackground.swift deleted file mode 100644 index d3f37c73539..00000000000 --- a/ios/brave-ios/Sources/BraveUI/SwiftUI/ListBackground.swift +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2022 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -import Foundation -import SwiftUI - -extension View { - /// Sets the background color of a List when using iOS 16 which is no longer backed by `UITableView`, thus - /// not respecting `UIAppearance` overrides - @available( - iOS, - introduced: 14.0, - deprecated: 16.0, - message: "Use `scrollContentBackground` and `background` directly" - ) - public func listBackgroundColor(_ color: Color) -> some View { - return self.scrollContentBackground(.hidden).background(color) - } -} diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/AccountSelectionRootView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/AccountSelectionRootView.swift index 150c09fdfe4..fb2a597502a 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/AccountSelectionRootView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/AccountSelectionRootView.swift @@ -53,7 +53,8 @@ struct AccountSelectionRootView: View { } } } - .listBackgroundColor(Color(uiColor: WalletV2Design.containerBackground)) + .scrollContentBackground(.hidden) + .background(Color(uiColor: WalletV2Design.containerBackground)) .navigationTitle(navigationTitle) .navigationBarTitleDisplayMode(.inline) } diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/Details/AccountDetailsView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/Details/AccountDetailsView.swift index cf31f3ad265..91224e859e7 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/Details/AccountDetailsView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Accounts/Details/AccountDetailsView.swift @@ -113,7 +113,8 @@ struct AccountDetailsView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItemGroup(placement: .cancellationAction) { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Market/MarketView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Market/MarketView.swift index 2ee7d496b64..ee65e124633 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Market/MarketView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Market/MarketView.swift @@ -176,7 +176,8 @@ struct MarketView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .background( NavigationLink( isActive: Binding( diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/NFT/NFTDetailView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/NFT/NFTDetailView.swift index b4edae45916..e945f0555ba 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/NFT/NFTDetailView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/NFT/NFTDetailView.swift @@ -209,7 +209,8 @@ struct NFTDetailView: View { } } } - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .onChange( of: nftDetailStore.nftMetadata, perform: { newValue in diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/NetworkSelectionRootView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/NetworkSelectionRootView.swift index 9ca1e0498f1..ddbfeb3f604 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/NetworkSelectionRootView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/NetworkSelectionRootView.swift @@ -102,7 +102,8 @@ struct NetworkSelectionRootView: View { } } } - .listBackgroundColor(Color(uiColor: WalletV2Design.containerBackground)) + .scrollContentBackground(.hidden) + .background(Color(uiColor: WalletV2Design.containerBackground)) .navigationTitle(navigationTitle) .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/AddCustomAssetView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/AddCustomAssetView.swift index 66fa2aa96e4..3447bdf2ff3 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/AddCustomAssetView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/AddCustomAssetView.swift @@ -290,7 +290,8 @@ struct AddCustomAssetView: View { } } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .onChange( of: selectedTokenType, perform: { _ in diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/EditUserAssetsView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/EditUserAssetsView.swift index 3d4878bfa30..593bd7ca8fc 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/EditUserAssetsView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/EditUserAssetsView.swift @@ -159,7 +159,8 @@ struct EditUserAssetsView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .animation(.default, value: tokenStores) .navigationTitle(Strings.Wallet.editVisibleAssetsButtonTitle) .navigationBarTitleDisplayMode(.inline) diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/SelectAccountTokenView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/SelectAccountTokenView.swift index 207b28d6040..7998604395d 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/SelectAccountTokenView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/SelectAccountTokenView.swift @@ -47,7 +47,8 @@ struct SelectAccountTokenView: View { accountSections } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .searchable( text: $store.query, placement: .navigationBarDrawer(displayMode: .always) diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditGasFeeView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditGasFeeView.swift index 1a033f970dd..c65c41764db 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditGasFeeView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditGasFeeView.swift @@ -110,7 +110,8 @@ struct EditGasFeeView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .navigationTitle(Strings.Wallet.editGasTitle) .alert(isPresented: $isShowingAlert) { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditNonceView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditNonceView.swift index 4b97e285e34..d2247baa075 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditNonceView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditNonceView.swift @@ -54,7 +54,8 @@ struct EditNonceView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .navigationTitle(Strings.Wallet.advancedSettingsTransaction) .alert(isPresented: $isShowingAlert) { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPermissionsView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPermissionsView.swift index 77edefdf4c1..0d709927305 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPermissionsView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPermissionsView.swift @@ -143,7 +143,8 @@ struct EditPermissionsView: View { .listRowBackground(Color(.braveGroupedBackground)) } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .navigationTitle(Strings.Wallet.editPermissionsTitle) .alert(isPresented: $isShowingAlert) { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPriorityFeeView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPriorityFeeView.swift index 4c32a8fc41a..6b52baeb953 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPriorityFeeView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/TransactionConfirmations/EditPriorityFeeView.swift @@ -282,7 +282,8 @@ struct EditPriorityFeeView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .navigationTitle(Strings.Wallet.maxPriorityFeeTitle) .alert(isPresented: $isShowingAlert) { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyProviderSelectionView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyProviderSelectionView.swift index 9110c4f8b86..588f865fc7b 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyProviderSelectionView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyProviderSelectionView.swift @@ -72,7 +72,8 @@ struct BuyProviderSelectionView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) } } .navigationBarTitleDisplayMode(.inline) diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyTokenView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyTokenView.swift index f9565e3b6d5..2062bb18ba3 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyTokenView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/BuyTokenView.swift @@ -218,7 +218,8 @@ struct BuyTokenView: View { } .environment(\.defaultMinListHeaderHeight, 0) .environment(\.defaultMinListRowHeight, 0) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(Strings.Wallet.buy) .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SendTokenView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SendTokenView.swift index 592d19deca2..9d29911bae8 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SendTokenView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SendTokenView.swift @@ -337,7 +337,8 @@ struct SendTokenView: View { ) { } } - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .environment(\.defaultMinListHeaderHeight, 0) .environment(\.defaultMinListRowHeight, 0) .alert(isPresented: $isShowingError) { diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SwapCryptoView.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SwapCryptoView.swift index 037ca17ce36..93834a7ded9 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SwapCryptoView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/WalletActions/SwapCryptoView.swift @@ -611,7 +611,8 @@ struct SwapCryptoView: View { unsupportedSwapChainSection } } - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .environment(\.defaultMinListHeaderHeight, 0) .environment(\.defaultMinListRowHeight, 0) .navigationTitle(Strings.Wallet.swap) diff --git a/ios/brave-ios/Sources/BraveWallet/Panels/AddSuggestedNetwork/SuggestedNetworkView.swift b/ios/brave-ios/Sources/BraveWallet/Panels/AddSuggestedNetwork/SuggestedNetworkView.swift index 350f3d41522..b79182d487b 100644 --- a/ios/brave-ios/Sources/BraveWallet/Panels/AddSuggestedNetwork/SuggestedNetworkView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Panels/AddSuggestedNetwork/SuggestedNetworkView.swift @@ -222,7 +222,8 @@ struct SuggestedNetworkView: View { .accessibility(hidden: sizeCategory.isAccessibilityCategory) } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(navigationTitle) .navigationBarTitleDisplayMode(.inline) .overlay( diff --git a/ios/brave-ios/Sources/BraveWallet/Panels/Connect/EditSiteConnectionView.swift b/ios/brave-ios/Sources/BraveWallet/Panels/Connect/EditSiteConnectionView.swift index fcd337bc999..e0889f95196 100644 --- a/ios/brave-ios/Sources/BraveWallet/Panels/Connect/EditSiteConnectionView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Panels/Connect/EditSiteConnectionView.swift @@ -202,7 +202,8 @@ struct EditSiteConnectionView: View { .padding(.vertical) } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(Strings.Wallet.editSiteConnectionScreenTitle) .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/ios/brave-ios/Sources/BraveWallet/Panels/Connect/NewSiteConnectionView.swift b/ios/brave-ios/Sources/BraveWallet/Panels/Connect/NewSiteConnectionView.swift index fa51a8c5b5b..56f6d0f6dc9 100644 --- a/ios/brave-ios/Sources/BraveWallet/Panels/Connect/NewSiteConnectionView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Panels/Connect/NewSiteConnectionView.swift @@ -169,7 +169,8 @@ public struct NewSiteConnectionView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .navigationTitle(Strings.Wallet.newSiteConnectScreenTitle) .toolbar { @@ -255,7 +256,8 @@ public struct NewSiteConnectionView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(Strings.Wallet.newSiteConnectScreenTitle) .navigationBarTitleDisplayMode(.inline) } diff --git a/ios/brave-ios/Sources/BraveWallet/Settings/CustomNetworkDetailsView.swift b/ios/brave-ios/Sources/BraveWallet/Settings/CustomNetworkDetailsView.swift index 9e17db481c7..a3c300e2b29 100644 --- a/ios/brave-ios/Sources/BraveWallet/Settings/CustomNetworkDetailsView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Settings/CustomNetworkDetailsView.swift @@ -440,7 +440,8 @@ struct NetworkDetailsView: View { } } } - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitle(navigationTitle) .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/ios/brave-ios/Sources/BraveWallet/Settings/DappsSettings.swift b/ios/brave-ios/Sources/BraveWallet/Settings/DappsSettings.swift index 01f2104ce39..3ee404826aa 100644 --- a/ios/brave-ios/Sources/BraveWallet/Settings/DappsSettings.swift +++ b/ios/brave-ios/Sources/BraveWallet/Settings/DappsSettings.swift @@ -145,7 +145,8 @@ struct DappsSettings: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle( String.localizedStringWithFormat(Strings.Wallet.dappsSettingsNavTitle, coin.localizedTitle) ) @@ -297,7 +298,8 @@ private struct SiteConnectionDetailView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItem(placement: .principal) { diff --git a/ios/brave-ios/Sources/BraveWallet/Settings/NetworkListView.swift b/ios/brave-ios/Sources/BraveWallet/Settings/NetworkListView.swift index 1e01f520d20..255296cda5d 100644 --- a/ios/brave-ios/Sources/BraveWallet/Settings/NetworkListView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Settings/NetworkListView.swift @@ -161,7 +161,8 @@ struct NetworkListView: View { } } .listStyle(.insetGrouped) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(Strings.Wallet.transactionDetailsNetworkTitle) .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift b/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift index cd78ec89a09..328a7bf6f46 100644 --- a/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift +++ b/ios/brave-ios/Sources/BraveWallet/Settings/Web3SettingsView.swift @@ -48,7 +48,8 @@ public struct Web3SettingsView: View { } } .listStyle(InsetGroupedListStyle()) - .listBackgroundColor(Color(UIColor.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .navigationTitle(Strings.Wallet.web3) .navigationBarTitleDisplayMode(.inline) .background( diff --git a/ios/brave-ios/Sources/CredentialProviderUI/CredentialDetailView.swift b/ios/brave-ios/Sources/CredentialProviderUI/CredentialDetailView.swift index eb8157ad2a8..17fe418fe45 100644 --- a/ios/brave-ios/Sources/CredentialProviderUI/CredentialDetailView.swift +++ b/ios/brave-ios/Sources/CredentialProviderUI/CredentialDetailView.swift @@ -88,7 +88,8 @@ struct CredentialDetailView: View { .listRowBackground(Color(.secondaryBraveGroupedBackground)) } .foregroundColor(Color(braveSystemName: .textPrimary)) - .listBackgroundColor(Color(.braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(UIColor.braveGroupedBackground)) .toolbar { ToolbarItemGroup(placement: .confirmationAction) { Button { diff --git a/ios/brave-ios/Sources/CredentialProviderUI/CredentialListView.swift b/ios/brave-ios/Sources/CredentialProviderUI/CredentialListView.swift index 945f52e0f5a..409914d906c 100644 --- a/ios/brave-ios/Sources/CredentialProviderUI/CredentialListView.swift +++ b/ios/brave-ios/Sources/CredentialProviderUI/CredentialListView.swift @@ -159,7 +159,8 @@ public struct CredentialListView: View { prompt: Text(Strings.CredentialProvider.searchBarPrompt) ) .listStyle(.insetGrouped) - .listBackgroundColor(Color(uiColor: .braveGroupedBackground)) + .scrollContentBackground(.hidden) + .background(Color(uiColor: .braveGroupedBackground)) .toolbar { ToolbarItemGroup(placement: .cancellationAction) { Button(Strings.CredentialProvider.cancelButtonTitle) {