Add new layout type menu items

Author: 0nko

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

@@ -668,6 +668,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

@@ -534,19 +534,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/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>