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

Merged
merged 5 commits into from
Jul 22, 2025
Merged

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
108455b
Add a bottom toolbar to tab manager and match the omnibar position
0nko Jul 10, 2025
7479929
Use a constant
0nko Jul 21, 2025
97fa629
Remove the FABs
0nko Jul 10, 2025
0c39eda
Hide the keyboard when launching a tab switcher
0nko Jul 21, 2025
ab7c0b6
Hide the keyboard when launching duck.ai
0nko Jul 21, 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
5 changes: 5 additions & 0 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ import com.duckduckgo.common.ui.view.show
import com.duckduckgo.common.ui.view.toPx
import com.duckduckgo.common.ui.viewbinding.viewBinding
import com.duckduckgo.common.utils.DispatcherProvider
import com.duckduckgo.common.utils.extensions.hideKeyboard
import com.duckduckgo.common.utils.playstore.PlayStoreUtils
import com.duckduckgo.di.scopes.ActivityScope
import com.duckduckgo.duckchat.api.DuckAiFeatureState
Expand Down Expand Up @@ -808,6 +809,10 @@ open class BrowserActivity : DuckDuckGoActivity() {
} ?: run {
launchNewDuckChat(url)
}

currentTab?.omnibar?.newOmnibar?.omnibarTextInput?.let {
hideKeyboard(it)
}
}

private fun launchNewDuckChat(duckChatUrl: String?) {
Expand Down
70 changes: 42 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 @@ -27,6 +27,8 @@ import android.view.View
import androidx.activity.OnBackPressedCallback
import androidx.appcompat.app.AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR
import androidx.appcompat.widget.Toolbar
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.updateLayoutParams
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.flowWithLifecycle
import androidx.lifecycle.lifecycleScope
Expand All @@ -41,6 +43,7 @@ import com.duckduckgo.app.browser.R
import com.duckduckgo.app.browser.databinding.ActivityTabSwitcherBinding
import com.duckduckgo.app.browser.databinding.PopupTabsMenuBinding
import com.duckduckgo.app.browser.favicon.FaviconManager
import com.duckduckgo.app.browser.omnibar.model.OmnibarPosition
import com.duckduckgo.app.browser.tabpreview.WebViewPreviewPersister
import com.duckduckgo.app.di.AppCoroutineScope
import com.duckduckgo.app.downloads.DownloadsActivity
Expand Down Expand Up @@ -89,10 +92,10 @@ import com.duckduckgo.common.ui.view.gone
import com.duckduckgo.common.ui.view.hide
import com.duckduckgo.common.ui.view.show
import com.duckduckgo.common.ui.view.toDp
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 @@ -153,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 @@ -235,7 +235,11 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
configureViewReferences()
setupToolbar(toolbar)
configureRecycler()
configureFabs()

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

configureObservers()
configureOnBackPressedListener()

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

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

Expand All @@ -268,6 +272,13 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine

private fun configureViewReferences() {
tabsRecycler = findViewById(R.id.tabsRecycler)

if (settingsDataStore.omnibarPosition == OmnibarPosition.BOTTOM && viewModel.isNewDesignEnabled) {
binding.root.removeView(binding.tabSwitcherToolbarTop.root)
} else {
binding.root.removeView(binding.tabSwitcherToolbarBottom.root)
}

toolbar = findViewById(R.id.toolbar)
}

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

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

handleSelectionModeCancellation()
}

if (viewModel.isNewDesignEnabled) {
// Set the layout params for the tabs recycler view based on omnibar position
tabsRecycler.updateLayoutParams {
this as CoordinatorLayout.LayoutParams
this.behavior = null
if (settingsDataStore.omnibarPosition == OmnibarPosition.TOP) {
this.topMargin = TABS_CONTENT_PADDING_DP.toPx()
} else {
this.bottomMargin = TABS_CONTENT_PADDING_DP.toPx()
}
}
}
}

private fun handleSelectionModeCancellation() {
Expand Down Expand Up @@ -627,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 @@ -641,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 @@ -658,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 @@ -683,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 Expand Up @@ -1006,5 +1019,6 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
private const val TAB_GRID_MAX_COLUMN_COUNT = 4
private const val KEY_FIRST_TIME_LOADING = "FIRST_TIME_LOADING"
private const val FAB_SCROLL_THRESHOLD = 7
private const val TABS_CONTENT_PADDING_DP = 56
}
}
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