| ... |
... |
@@ -64,6 +64,7 @@ import androidx.compose.ui.semantics.testTag |
|
64
|
64
|
import androidx.compose.ui.semantics.testTagsAsResourceId
|
|
65
|
65
|
import androidx.compose.ui.text.style.TextAlign
|
|
66
|
66
|
import androidx.compose.ui.unit.dp
|
|
|
67
|
+import androidx.compose.ui.platform.LocalContext
|
|
67
|
68
|
import androidx.lifecycle.compose.LocalLifecycleOwner
|
|
68
|
69
|
import androidx.navigation.NavHostController
|
|
69
|
70
|
import androidx.navigation.compose.NavHost
|
| ... |
... |
@@ -88,6 +89,7 @@ import org.mozilla.fenix.compose.list.SelectableIconListItem |
|
88
|
89
|
import org.mozilla.fenix.compose.snackbar.AcornSnackbarHostState
|
|
89
|
90
|
import org.mozilla.fenix.compose.snackbar.SnackbarHost
|
|
90
|
91
|
import org.mozilla.fenix.compose.snackbar.SnackbarState
|
|
|
92
|
+import org.mozilla.fenix.ext.settings
|
|
91
|
93
|
import org.mozilla.fenix.library.bookmarks.BookmarksTestTag.ADD_BOOKMARK_FOLDER_NAME_TEXT_FIELD
|
|
92
|
94
|
import org.mozilla.fenix.library.bookmarks.BookmarksTestTag.EDIT_BOOKMARK_ITEM_TITLE_TEXT_FIELD
|
|
93
|
95
|
import org.mozilla.fenix.library.bookmarks.BookmarksTestTag.EDIT_BOOKMARK_ITEM_URL_TEXT_FIELD
|
| ... |
... |
@@ -883,7 +885,7 @@ private fun BookmarkListOverflowMenu( |
|
883
|
885
|
onDismissRequest: () -> Unit,
|
|
884
|
886
|
store: BookmarksStore,
|
|
885
|
887
|
) {
|
|
886
|
|
- val menuItems = listOf(
|
|
|
888
|
+ val menuItems = listOfNotNull(
|
|
887
|
889
|
MenuItem(
|
|
888
|
890
|
title = stringResource(R.string.bookmark_menu_select_all_bookmarks),
|
|
889
|
891
|
onClick = { store.dispatch(BookmarksListMenuAction.SelectAll) },
|
| ... |
... |
@@ -891,7 +893,7 @@ private fun BookmarkListOverflowMenu( |
|
891
|
893
|
MenuItem(
|
|
892
|
894
|
title = stringResource(R.string.bookmark_menu_open_in_new_tab_button),
|
|
893
|
895
|
onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInNormalTabsClicked) },
|
|
894
|
|
- ),
|
|
|
896
|
+ ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode },
|
|
895
|
897
|
MenuItem(
|
|
896
|
898
|
title = stringResource(R.string.bookmark_menu_open_in_private_tab_button),
|
|
897
|
899
|
onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInPrivateTabsClicked) },
|
| ... |
... |
@@ -921,7 +923,7 @@ private fun BookmarkListItemMenu( |
|
921
|
923
|
bookmark: BookmarkItem.Bookmark,
|
|
922
|
924
|
store: BookmarksStore,
|
|
923
|
925
|
) {
|
|
924
|
|
- val menuItems = listOf(
|
|
|
926
|
+ val menuItems = listOfNotNull(
|
|
925
|
927
|
MenuItem(
|
|
926
|
928
|
title = stringResource(R.string.bookmark_menu_edit_button),
|
|
927
|
929
|
onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.EditClicked(bookmark)) },
|
| ... |
... |
@@ -937,7 +939,7 @@ private fun BookmarkListItemMenu( |
|
937
|
939
|
MenuItem(
|
|
938
|
940
|
title = stringResource(R.string.bookmark_menu_open_in_new_tab_button),
|
|
939
|
941
|
onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInNormalTabClicked(bookmark)) },
|
|
940
|
|
- ),
|
|
|
942
|
+ ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode },
|
|
941
|
943
|
MenuItem(
|
|
942
|
944
|
title = stringResource(R.string.bookmark_menu_open_in_private_tab_button),
|
|
943
|
945
|
onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInPrivateTabClicked(bookmark)) },
|
| ... |
... |
@@ -963,7 +965,7 @@ private fun BookmarkListFolderMenu( |
|
963
|
965
|
folder: BookmarkItem.Folder,
|
|
964
|
966
|
store: BookmarksStore,
|
|
965
|
967
|
) {
|
|
966
|
|
- val menuItems = listOf(
|
|
|
968
|
+ val menuItems = listOfNotNull(
|
|
967
|
969
|
MenuItem(
|
|
968
|
970
|
title = stringResource(R.string.bookmark_menu_edit_button),
|
|
969
|
971
|
onClick = { store.dispatch(BookmarksListMenuAction.Folder.EditClicked(folder)) },
|
| ... |
... |
@@ -971,7 +973,7 @@ private fun BookmarkListFolderMenu( |
|
971
|
973
|
MenuItem(
|
|
972
|
974
|
title = stringResource(R.string.bookmark_menu_open_all_in_tabs_button),
|
|
973
|
975
|
onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInNormalTabClicked(folder)) },
|
|
974
|
|
- ),
|
|
|
976
|
+ ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode },
|
|
975
|
977
|
MenuItem(
|
|
976
|
978
|
title = stringResource(R.string.bookmark_menu_open_all_in_private_tabs_button),
|
|
977
|
979
|
onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInPrivateTabClicked(folder)) },
|