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

fix(privacy): Fix shred button visibility #26049

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Open

fix(privacy): Fix shred button visibility #26049

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
14 changes: 12 additions & 2 deletions ios/brave-ios/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,8 @@ class TabTrayController: AuthenticationController {
tabTrayView.isHidden = tabTrayMode == .sync
tabSyncView.isHidden = tabTrayMode == .local

updateShredButtonVisibility()

searchBarView?.searchBar.placeholder =
tabTrayMode == .local
? Strings.tabTraySearchBarTitle : Strings.OpenTabs.tabTrayOpenTabSearchBarTitle
Expand Down Expand Up @@ -510,8 +512,6 @@ class TabTrayController: AuthenticationController {
}

shredButton.tintColor = browserColors.textPrimary
shredButton.isHidden = tabManager.selectedTab == nil && tabTrayMode == .local
shredButton.isEnabled = tabManager.selectedTab != nil || tabTrayMode == .local

// Need to force a relayout for the nav controller for the appearance to take affect
navigationController?.view.setNeedsLayout()
Expand Down Expand Up @@ -690,6 +690,11 @@ class TabTrayController: AuthenticationController {
}
}

private func updateShredButtonVisibility() {
let totalItems = dataSource.snapshot().numberOfItems
shredButton.isHidden = tabTrayMode == .sync || (privateMode && totalItems == 0)
}

// MARK: - Actions

@objc func doneAction() {
Expand Down Expand Up @@ -785,6 +790,8 @@ class TabTrayController: AuthenticationController {
tabManager.willSwitchTabMode(leavingPBM: privateMode)
privateMode.toggle()

updateShredButtonVisibility()

// When we switch from Private => Regular make sure we reset _selectedIndex, fix for bug #888
tabManager.resetSelectedIndex()
if privateMode {
Expand All @@ -795,6 +802,7 @@ class TabTrayController: AuthenticationController {
|| tabManager.tabsForCurrentMode.isEmpty
{
tabTrayView.showPrivateModeInfo()
updateShredButtonVisibility()
// New private tab is created immediately to reflect changes on NTP.
// If user drags the modal down or dismisses it, a new private tab will be ready.
tabManager.addTabAndSelect(isPrivate: true)
Expand All @@ -813,6 +821,7 @@ class TabTrayController: AuthenticationController {
}

tabTrayView.hidePrivateModeInfo()
updateShredButtonVisibility()
tabTrayView.collectionView.reloadData()

// When you go back from normal mode, current tab should be selected
Expand Down Expand Up @@ -950,6 +959,7 @@ extension TabTrayController: PresentingModalViewControllerDelegate {

extension TabTrayController: TabManagerDelegate {
func tabManager(_ tabManager: TabManager, didAddTab tab: Tab) {
updateShredButtonVisibility()
applySnapshot()

// This check is mainly for entering private mode.
Expand Down
Loading