Skip to content

Tab manager update: Replace FABs with buttons #6384

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

Open
wants to merge 5 commits into
base: feature/ondrej/tab-manager-redesign-bottom-toolbar
Choose a base branch
from
+657 −186
Open

Tab manager update: Replace FABs with buttons #6384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd1260d
Remove the FABs
0nko Jul 10, 2025
345dc43
Make the single omnibar a requirement for the new design
0nko Jul 10, 2025
9444a5a
Update the tab manager menu and button items
0nko Jul 11, 2025
ef73696
Remove the Duck.ai menu item
0nko Jul 14, 2025
7da90cb
Update existing tests and add new onse for dynamic menu
0nko Jul 14, 2025
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
45 changes: 17 additions & 28 deletions app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ import com.duckduckgo.common.ui.view.toPx
import com.duckduckgo.common.ui.viewbinding.viewBinding
import com.duckduckgo.common.utils.DispatcherProvider
import com.duckduckgo.di.scopes.ActivityScope
import com.duckduckgo.duckchat.api.DuckAiFeatureState
import com.duckduckgo.duckchat.api.DuckChat
import java.util.ArrayList
import javax.inject.Inject
Expand Down Expand Up @@ -157,9 +156,6 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
@Inject
lateinit var duckChat: DuckChat

@Inject
lateinit var duckAiFeatureState: DuckAiFeatureState

@Inject
lateinit var tabSwitcherAnimationFeature: TabSwitcherAnimationFeature

Expand Down Expand Up @@ -239,7 +235,11 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
configureViewReferences()
setupToolbar(toolbar)
configureRecycler()
configureFabs()

if (!viewModel.isNewDesignEnabled) {
configureFabs()
}

configureObservers()
configureOnBackPressedListener()

Expand All @@ -256,7 +256,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
}

binding.aiChatFab.setOnClickListener {
viewModel.onDuckChatFabClicked()
viewModel.onDuckAIFabClicked()
}
}

Expand Down Expand Up @@ -306,7 +306,10 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
tabsRecycler.setHasFixedSize(true)

if (tabManagerFeatureFlags.multiSelection().isEnabled()) {
handleFabStateUpdates()
if (viewModel.isNewDesignEnabled) {
handleFabStateUpdates()
}

handleSelectionModeCancellation()
}

Expand Down Expand Up @@ -651,7 +654,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
)
} else {
menuInflater.inflate(R.menu.menu_tab_switcher_activity, menu)
layoutTypeMenuItem = menu.findItem(R.id.layoutTypeMenuItem)
layoutTypeMenuItem = menu.findItem(R.id.layoutTypeToolbarButton)

when (viewModel.layoutType.value) {
LayoutType.GRID -> showListLayoutButton()
Expand All @@ -665,7 +668,6 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine

private fun initMenuClickListeners() {
popupMenu.onMenuItemClicked(popupMenu.contentView.findViewById(R.id.newTabMenuItem)) { onNewTabRequested(fromOverflowMenu = true) }
popupMenu.onMenuItemClicked(popupMenu.contentView.findViewById(R.id.duckChatMenuItem)) { viewModel.onDuckChatMenuClicked() }
popupMenu.onMenuItemClicked(popupMenu.contentView.findViewById(R.id.selectAllMenuItem)) { viewModel.onSelectAllTabs() }
popupMenu.onMenuItemClicked(popupMenu.contentView.findViewById(R.id.deselectAllMenuItem)) { viewModel.onDeselectAllTabs() }
popupMenu.onMenuItemClicked(popupMenu.contentView.findViewById(R.id.shareSelectedLinksMenuItem)) { viewModel.onShareSelectedTabs() }
Expand All @@ -682,17 +684,11 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine

override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.layoutTypeMenuItem -> onLayoutTypeToggled()
R.id.fireMenuItem -> onFire()
R.id.popupMenuItem -> showPopupMenu(item.itemId)
R.id.newTab -> onNewTabRequested(fromOverflowMenu = false)
R.id.newTabOverflow -> onNewTabRequested(fromOverflowMenu = true)
R.id.duckChat -> {
viewModel.onDuckChatMenuClicked()
}
R.id.closeAllTabs -> closeAllTabs()
R.id.downloads -> showDownloads()
R.id.settings -> showSettings()
R.id.layoutTypeToolbarButton -> onLayoutTypeToggled()
R.id.fireToolbarButton -> onFireButtonClicked()
R.id.popupMenuToolbarButton -> showPopupMenu(item.itemId)
R.id.newTabToolbarButton -> onNewTabRequested(fromOverflowMenu = false)
R.id.duckAIToolbarButton -> viewModel.onDuckAIButtonClicked()
android.R.id.home -> {
viewModel.onUpButtonPressed()
return true
Expand All @@ -707,21 +703,14 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
viewModel.onMenuOpened()
}

override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
val duckChatMenuItem = menu?.findItem(R.id.duckChat)
duckChatMenuItem?.isVisible = duckAiFeatureState.showPopupMenuShortcut.value

return super.onPrepareOptionsMenu(menu)
}

override fun onMenuOpened(featureId: Int, menu: Menu): Boolean {
if (featureId == FEATURE_SUPPORT_ACTION_BAR) {
viewModel.onMenuOpened()
}
return super.onMenuOpened(featureId, menu)
}

private fun onFire() {
private fun onFireButtonClicked() {
pixel.fire(AppPixelName.FORGET_ALL_PRESSED_TABSWITCHING)
val dialog = FireDialog(
context = this,
Expand Down
19 changes: 10 additions & 9 deletions app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherMenuExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.BackBu
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.BackButtonType.CLOSE
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.DynamicInterface
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.FabType
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutButtonType.GRID
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutButtonType.HIDDEN
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutButtonType.LIST
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.GRID
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.HIDDEN
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.LIST
import com.duckduckgo.mobile.android.R as commonR
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
import com.google.android.material.floatingactionbutton.FloatingActionButton
Expand All @@ -43,8 +43,7 @@ fun Menu.createDynamicInterface(
toolbar: Toolbar,
dynamicMenu: DynamicInterface,
) {
popupMenu.newTabMenuItem.isVisible = dynamicMenu.isNewTabVisible
popupMenu.duckChatMenuItem.isVisible = dynamicMenu.isDuckChatVisible
popupMenu.newTabMenuItem.isVisible = dynamicMenu.isNewTabMenuVisible
popupMenu.selectAllMenuItem.isVisible = dynamicMenu.isSelectAllVisible
popupMenu.deselectAllMenuItem.isVisible = dynamicMenu.isDeselectAllVisible
popupMenu.selectionActionsDivider.isVisible = dynamicMenu.isSelectionActionsDividerVisible
Expand Down Expand Up @@ -98,8 +97,8 @@ fun Menu.createDynamicInterface(
CLOSE -> AppCompatResources.getDrawable(toolbar.context, commonR.drawable.ic_close_24)
}

findItem(R.id.layoutTypeMenuItem).apply {
when (dynamicMenu.layoutButtonType) {
findItem(R.id.layoutTypeToolbarButton).apply {
when (dynamicMenu.layoutButtonMode) {
GRID -> {
setIcon(com.duckduckgo.mobile.android.R.drawable.ic_view_grid_24)
title = toolbar.resources.getString(R.string.tabSwitcherGridViewMenu)
Expand All @@ -114,8 +113,10 @@ fun Menu.createDynamicInterface(
}
}

findItem(R.id.popupMenuItem).isEnabled = dynamicMenu.isMoreMenuItemEnabled
findItem(R.id.fireMenuItem).isVisible = dynamicMenu.isFireButtonVisible
findItem(R.id.popupMenuToolbarButton).isEnabled = dynamicMenu.isMenuButtonEnabled
findItem(R.id.fireToolbarButton).isVisible = dynamicMenu.isFireButtonVisible
findItem(R.id.duckAIToolbarButton).isVisible = dynamicMenu.isDuckAIButtonVisible
findItem(R.id.newTabToolbarButton).isVisible = dynamicMenu.isNewTabButtonVisible

val bottomPadding = if (dynamicMenu.isAIFabVisible) {
tabsRecycler.context.resources.getDimension(R.dimen.recyclerViewTwoFabsBottomPadding)
Expand Down
Loading
Loading