Skip to content

Commit 76f7612

Browse files
0nko0nko
committed
Tab manager update: Replace FABs with buttons (#6384)
Task/Issue URL: https://app.asana.com/1/137249556945/project/1207418217763355/task/1210543205190057?focus=true ### Description This PR hides the FABs and replaces them with toolbar buttons (NTP, Duck.ai). ### Steps to test this PR _Normal mode_ - [x] Go to the tab manager - [x] Verify the FABs are gone - [x] Verify the layout button is gone (will be added to the menu later) - [x] Verify the Duck.ai and NTP buttons are visible - [x] Tap on the menu button - [x] Verify thew Net tab and Duck.ai menu items are gone - [x] Check that the new toolbar buttons are functional _Selection Mode_ - [x] Go to tab manager -> Tap on the Menu button -> Tap Select Tabs - [x] Verify all toolbar buttons are hidden - [x] Tap one the Menu button - [x] Verify Select All option is visible - [x] Tap on the Select All menu item - [x] Verify the toolbar buttons are still hidden - [x] Exit the selection mode - [x] Verify the Duck.ai and NTP buttons are visible now
1 parent 7be88be commit 76f7612

File tree

8 files changed

+662
-186
lines changed

8 files changed

+662
-186
lines changed

‎app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ import com.duckduckgo.common.ui.view.show
106106
import com.duckduckgo.common.ui.view.toPx
107107
import com.duckduckgo.common.ui.viewbinding.viewBinding
108108
import com.duckduckgo.common.utils.DispatcherProvider
109+
import com.duckduckgo.common.utils.extensions.hideKeyboard
109110
import com.duckduckgo.common.utils.playstore.PlayStoreUtils
110111
import com.duckduckgo.di.scopes.ActivityScope
111112
import com.duckduckgo.duckchat.api.DuckAiFeatureState
@@ -808,6 +809,10 @@ open class BrowserActivity : DuckDuckGoActivity() {
808809
} ?: run {
809810
launchNewDuckChat(url)
810811
}
812+
813+
currentTab?.omnibar?.newOmnibar?.omnibarTextInput?.let {
814+
hideKeyboard(it)
815+
}
811816
}
812817

813818
private fun launchNewDuckChat(duckChatUrl: String?) {

‎app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ import com.duckduckgo.common.ui.view.toPx
9696
import com.duckduckgo.common.ui.viewbinding.viewBinding
9797
import com.duckduckgo.common.utils.DispatcherProvider
9898
import com.duckduckgo.di.scopes.ActivityScope
99-
import com.duckduckgo.duckchat.api.DuckAiFeatureState
10099
import com.duckduckgo.duckchat.api.DuckChat
101100
import java.util.ArrayList
102101
import javax.inject.Inject
@@ -157,9 +156,6 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
157156
@Inject
158157
lateinit var duckChat: DuckChat
159158

160-
@Inject
161-
lateinit var duckAiFeatureState: DuckAiFeatureState
162-
163159
@Inject
164160
lateinit var tabSwitcherAnimationFeature: TabSwitcherAnimationFeature
165161

@@ -239,7 +235,11 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
239235
configureViewReferences()
240236
setupToolbar(toolbar)
241237
configureRecycler()
242-
configureFabs()
238+
239+
if (!viewModel.isNewDesignEnabled) {
240+
configureFabs()
241+
}
242+
243243
configureObservers()
244244
configureOnBackPressedListener()
245245

@@ -256,7 +256,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
256256
}
257257

258258
binding.aiChatFab.setOnClickListener {
259-
viewModel.onDuckChatFabClicked()
259+
viewModel.onDuckAIFabClicked()
260260
}
261261
}
262262

@@ -306,7 +306,10 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
306306
tabsRecycler.setHasFixedSize(true)
307307

308308
if (tabManagerFeatureFlags.multiSelection().isEnabled()) {
309-
handleFabStateUpdates()
309+
if (viewModel.isNewDesignEnabled) {
310+
handleFabStateUpdates()
311+
}
312+
310313
handleSelectionModeCancellation()
311314
}
312315

@@ -651,7 +654,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
651654
)
652655
} else {
653656
menuInflater.inflate(R.menu.menu_tab_switcher_activity, menu)
654-
layoutTypeMenuItem = menu.findItem(R.id.layoutTypeMenuItem)
657+
layoutTypeMenuItem = menu.findItem(R.id.layoutTypeToolbarButton)
655658

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

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

683685
override fun onOptionsItemSelected(item: MenuItem): Boolean {
684686
when (item.itemId) {
685-
R.id.layoutTypeMenuItem -> onLayoutTypeToggled()
686-
R.id.fireMenuItem -> onFire()
687-
R.id.popupMenuItem -> showPopupMenu(item.itemId)
688-
R.id.newTab -> onNewTabRequested(fromOverflowMenu = false)
689-
R.id.newTabOverflow -> onNewTabRequested(fromOverflowMenu = true)
690-
R.id.duckChat -> {
691-
viewModel.onDuckChatMenuClicked()
692-
}
693-
R.id.closeAllTabs -> closeAllTabs()
694-
R.id.downloads -> showDownloads()
695-
R.id.settings -> showSettings()
687+
R.id.layoutTypeToolbarButton -> onLayoutTypeToggled()
688+
R.id.fireToolbarButton -> onFireButtonClicked()
689+
R.id.popupMenuToolbarButton -> showPopupMenu(item.itemId)
690+
R.id.newTabToolbarButton -> onNewTabRequested(fromOverflowMenu = false)
691+
R.id.duckAIToolbarButton -> viewModel.onDuckAIButtonClicked()
696692
android.R.id.home -> {
697693
viewModel.onUpButtonPressed()
698694
return true
@@ -707,21 +703,14 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
707703
viewModel.onMenuOpened()
708704
}
709705

710-
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
711-
val duckChatMenuItem = menu?.findItem(R.id.duckChat)
712-
duckChatMenuItem?.isVisible = duckAiFeatureState.showPopupMenuShortcut.value
713-
714-
return super.onPrepareOptionsMenu(menu)
715-
}
716-
717706
override fun onMenuOpened(featureId: Int, menu: Menu): Boolean {
718707
if (featureId == FEATURE_SUPPORT_ACTION_BAR) {
719708
viewModel.onMenuOpened()
720709
}
721710
return super.onMenuOpened(featureId, menu)
722711
}
723712

724-
private fun onFire() {
713+
private fun onFireButtonClicked() {
725714
pixel.fire(AppPixelName.FORGET_ALL_PRESSED_TABSWITCHING)
726715
val dialog = FireDialog(
727716
context = this,

‎app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherMenuExt.kt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.BackBu
2727
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.BackButtonType.CLOSE
2828
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.DynamicInterface
2929
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.FabType
30-
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutButtonType.GRID
31-
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutButtonType.HIDDEN
32-
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutButtonType.LIST
30+
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.GRID
31+
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.HIDDEN
32+
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.LIST
3333
import com.duckduckgo.mobile.android.R as commonR
3434
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
3535
import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -43,8 +43,7 @@ fun Menu.createDynamicInterface(
4343
toolbar: Toolbar,
4444
dynamicMenu: DynamicInterface,
4545
) {
46-
popupMenu.newTabMenuItem.isVisible = dynamicMenu.isNewTabVisible
47-
popupMenu.duckChatMenuItem.isVisible = dynamicMenu.isDuckChatVisible
46+
popupMenu.newTabMenuItem.isVisible = dynamicMenu.isNewTabMenuVisible
4847
popupMenu.selectAllMenuItem.isVisible = dynamicMenu.isSelectAllVisible
4948
popupMenu.deselectAllMenuItem.isVisible = dynamicMenu.isDeselectAllVisible
5049
popupMenu.selectionActionsDivider.isVisible = dynamicMenu.isSelectionActionsDividerVisible
@@ -98,8 +97,8 @@ fun Menu.createDynamicInterface(
9897
CLOSE -> AppCompatResources.getDrawable(toolbar.context, commonR.drawable.ic_close_24)
9998
}
10099

101-
findItem(R.id.layoutTypeMenuItem).apply {
102-
when (dynamicMenu.layoutButtonType) {
100+
findItem(R.id.layoutTypeToolbarButton).apply {
101+
when (dynamicMenu.layoutButtonMode) {
103102
GRID -> {
104103
setIcon(com.duckduckgo.mobile.android.R.drawable.ic_view_grid_24)
105104
title = toolbar.resources.getString(R.string.tabSwitcherGridViewMenu)
@@ -114,8 +113,10 @@ fun Menu.createDynamicInterface(
114113
}
115114
}
116115

117-
findItem(R.id.popupMenuItem).isEnabled = dynamicMenu.isMoreMenuItemEnabled
118-
findItem(R.id.fireMenuItem).isVisible = dynamicMenu.isFireButtonVisible
116+
findItem(R.id.popupMenuToolbarButton).isEnabled = dynamicMenu.isMenuButtonEnabled
117+
findItem(R.id.fireToolbarButton).isVisible = dynamicMenu.isFireButtonVisible
118+
findItem(R.id.duckAIToolbarButton).isVisible = dynamicMenu.isDuckAIButtonVisible
119+
findItem(R.id.newTabToolbarButton).isVisible = dynamicMenu.isNewTabButtonVisible
119120

120121
val bottomPadding = if (dynamicMenu.isAIFabVisible) {
121122
tabsRecycler.context.resources.getDimension(R.dimen.recyclerViewTwoFabsBottomPadding)

0 commit comments

Comments
 (0)