Commit f7ce2041 authored by brizental's avatar brizental Committed by Pier Angelo Vendrame
Browse files

fixup! TB 34403 [android]: Disable Normal mode by default. 

Hide option to open bookmarks in normal mode.
parent fbab56e1

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt

+8 −6
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import androidx.compose.ui.text.style.TextAlign 
import androidx.compose.ui.text.style.TextOverflow

import androidx.compose.ui.unit.dp

import androidx.core.graphics.toColorInt

import androidx.compose.ui.platform.LocalContext

import androidx.lifecycle.compose.LocalLifecycleOwner

import androidx.navigation.NavHostController

import androidx.navigation.compose.NavHost
@@ -124,6 +125,7 @@ import org.mozilla.fenix.compose.Favicon 
import org.mozilla.fenix.compose.list.IconListItem

import org.mozilla.fenix.compose.list.SelectableFaviconListItem

import org.mozilla.fenix.compose.list.SelectableIconListItem

import org.mozilla.fenix.ext.settings

import org.mozilla.fenix.search.SearchFragmentAction.SuggestionClicked

import org.mozilla.fenix.search.SearchFragmentAction.SuggestionSelected

import org.mozilla.fenix.search.SearchFragmentState
@@ -1084,7 +1086,7 @@ private fun BookmarkListOverflowMenu( 
    onDismissRequest: () -> Unit,

    store: BookmarksStore,

) {

    val menuItems = listOf(

    val menuItems = listOfNotNull(

        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_select_all_bookmarks),

            onClick = { store.dispatch(BookmarksListMenuAction.SelectAll) },
@@ -1092,7 +1094,7 @@ private fun BookmarkListOverflowMenu( 
        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_open_in_new_tab_button),

            onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInNormalTabsClicked) },

        ),

        ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode },

        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_open_in_private_tab_button),

            onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInPrivateTabsClicked) },
@@ -1120,7 +1122,7 @@ private fun FolderListOverflowMenu( 
    onDismissRequest: () -> Unit,

    store: BookmarksStore,

) {

    val menuItems = listOf(

    val menuItems = listOfNotNull(

        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_select_all_bookmarks),

            onClick = { store.dispatch(BookmarksListMenuAction.SelectAll) },
@@ -1169,7 +1171,7 @@ private fun BookmarkListItemMenu( 
        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_open_in_new_tab_button),

            onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInNormalTabClicked(bookmark)) },

        ),

        ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode },

        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_open_in_private_tab_button),

            onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInPrivateTabClicked(bookmark)) },
@@ -1194,7 +1196,7 @@ private fun BookmarkListFolderMenu( 
    folder: BookmarkItem.Folder,

    store: BookmarksStore,

) {

    val menuItems = listOf(

    val menuItems = listOfNotNull(

        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_edit_button),

            onClick = { store.dispatch(BookmarksListMenuAction.Folder.EditClicked(folder)) },
@@ -1202,7 +1204,7 @@ private fun BookmarkListFolderMenu( 
        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_open_all_in_tabs_button),

            onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInNormalTabClicked(folder)) },

        ),

        ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode },

        MenuItem.TextItem(

            text = Text.Resource(R.string.bookmark_menu_open_all_in_private_tabs_button),

            onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInPrivateTabClicked(folder)) },