Skip to content

Tab manager update: New layout type menu #6388

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 1 commit into
base: feature/ondrej/tab-manager-redesign-buttons
Choose a base branch
from
Open

Tab manager update: New layout type menu #6388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 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 @@ -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() }
Expand Down
28 changes: 28 additions & 0 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 @@ -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) {
Expand Down
30 changes: 19 additions & 11 deletions app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/layout/popup_tabs_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading