Tab manager update: Bottom toolbar menu

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

@@ -216,7 +216,11 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
 
     private val binding: ActivityTabSwitcherBinding by viewBinding()
     private val popupMenu by lazy {
-        PopupMenu(layoutInflater, R.layout.popup_tabs_menu)
+        if (settingsDataStore.omnibarPosition == OmnibarPosition.BOTTOM && viewModel.isNewDesignEnabled) {
+            PopupMenu(layoutInflater, R.layout.popup_tabs_menu_bottom)
+        } else {
+            PopupMenu(layoutInflater, R.layout.popup_tabs_menu)
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -668,6 +672,8 @@ 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.gridLayoutMenuItem)) { viewModel.onGridLayoutSelected() }
+        popupMenu.onMenuItemClicked(popupMenu.contentView.findViewById(R.id.listLayoutMenuItem)) { viewModel.onListLayoutSelected() }
         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() }

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

@@ -66,6 +66,34 @@ fun Menu.createDynamicInterface(
         setPrimaryText(resources.getQuantityString(R.plurals.closeTabsMenuItem, numSelectedTabs, numSelectedTabs))
     }
 
+    popupMenu.gridLayoutMenuItem.apply {
+        when (dynamicMenu.layoutMenuMode) {
+            GRID -> {
+                setTrailingIconVisibility(false)
+                isVisible = true
+            }
+            LIST -> {
+                setTrailingIconVisibility(true)
+                isVisible = true
+            }
+            HIDDEN -> isVisible = false
+        }
+    }
+
+    popupMenu.listLayoutMenuItem.apply {
+        when (dynamicMenu.layoutMenuMode) {
+            GRID -> {
+                setTrailingIconVisibility(true)
+                isVisible = true
+            }
+            LIST -> {
+                setTrailingIconVisibility(false)
+                isVisible = true
+            }
+            HIDDEN -> isVisible = false
+        }
+    }
+
     mainFab.apply {
         if (dynamicMenu.isMainFabVisible) {
             when (dynamicMenu.mainFabType) {

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt

@@ -530,19 +530,27 @@ class TabSwitcherViewModel @Inject constructor(
     }
 
     fun onLayoutTypeToggled() {
-        viewModelScope.launch(dispatcherProvider.io()) {
-            when (layoutType.value) {
-                GRID -> {
-                    pixel.fire(TAB_MANAGER_LIST_VIEW_BUTTON_CLICKED)
-                    tabRepository.setTabLayoutType(LIST)
-                }
+        when (layoutType.value) {
+            GRID -> onListLayoutSelected()
+            LIST -> onGridLayoutSelected()
+            else -> Unit
+        }
+    }
 
-                LIST -> {
-                    pixel.fire(TAB_MANAGER_GRID_VIEW_BUTTON_CLICKED)
-                    tabRepository.setTabLayoutType(GRID)
-                }
+    fun onListLayoutSelected() {
+        viewModelScope.launch(dispatcherProvider.io()) {
+            if (layoutType.value != LIST) {
+                pixel.fire(TAB_MANAGER_LIST_VIEW_BUTTON_CLICKED)
+                tabRepository.setTabLayoutType(LIST)
+            }
+        }
+    }
 
-                else -> Unit
+    fun onGridLayoutSelected() {
+        viewModelScope.launch(dispatcherProvider.io()) {
+            if (layoutType.value != GRID) {
+                pixel.fire(TAB_MANAGER_GRID_VIEW_BUTTON_CLICKED)
+                tabRepository.setTabLayoutType(GRID)
             }
         }
     }

app/src/main/res/layout/popup_tabs_menu.xml

@@ -27,6 +27,20 @@
         android:layout_height="wrap_content"
         app:primaryText="@string/newTabMenuItem" />
 
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/gridLayoutMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:trailingIcon="@drawable/ic_check_24"
+        app:primaryText="@string/tabSwitcherGridViewMenu" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/listLayoutMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:trailingIcon="@drawable/ic_check_24"
+        app:primaryText="@string/tabSwitcherListViewMenu" />
+
     <com.duckduckgo.common.ui.view.PopupMenuItemView
         android:id="@+id/selectAllMenuItem"
         android:layout_width="match_parent"

app/src/main/res/layout/popup_tabs_menu_bottom.xml

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/popup_menu_bg"
+    android:orientation="vertical">
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/closeSelectedTabsMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryTextType="destructive" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/closeOtherTabsMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/closeOtherTabsMenuItem"
+        app:primaryTextType="destructive" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/closeAllTabsMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/closeAllTabsMenuItem"
+        app:primaryTextType="destructive" />
+
+    <com.duckduckgo.common.ui.view.divider.HorizontalDivider
+        android:id="@+id/closeAllTabsDivider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:defaultPadding="false" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/selectTabsMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/selectTabsMenuItem" />
+
+    <com.duckduckgo.common.ui.view.divider.HorizontalDivider
+        android:id="@+id/selectTabsDivider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:defaultPadding="false" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/shareSelectedLinksMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/bookmarkSelectedTabsMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.duckduckgo.common.ui.view.divider.HorizontalDivider
+        android:id="@+id/selectionActionsDivider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:defaultPadding="false" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/deselectAllMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/deselectAllTabsMenuItem" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/selectAllMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/selectAllTabsMenuItem" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/listLayoutMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/tabSwitcherListViewMenu"
+        app:trailingIcon="@drawable/ic_check_24" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/gridLayoutMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/tabSwitcherGridViewMenu"
+        app:trailingIcon="@drawable/ic_check_24" />
+
+    <com.duckduckgo.common.ui.view.PopupMenuItemView
+        android:id="@+id/newTabMenuItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:primaryText="@string/newTabMenuItem" />
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -114,8 +114,8 @@
     <string name="tabClosed">Tab closed</string>
     <string name="tabClosedUndo">Undo</string>
     <string name="downloadsMenuItemTitle">Downloads</string>
-    <string name="tabSwitcherListViewMenu">List view</string>
-    <string name="tabSwitcherGridViewMenu">Grid view</string>
+    <string name="tabSwitcherListViewMenu">List View</string>
+    <string name="tabSwitcherGridViewMenu">Grid View</string>
 
     <!--Tab Switcher Animation-->
     <string name="trackersBlockedInTheLast7days" instruction="Placeholder is the number of trackers blocked > 1">&lt;b&gt;%1$s trackers blocked &lt;/b&gt; in the last 7 days</string>