Bug 1868262 - Add Menu button to nav bar

fenix/125.0
mike a 5 months ago committed by mergify[bot]
parent fcb100da84
commit 68ad8c148e

@ -59,7 +59,6 @@ import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.browser.state.state.content.DownloadState import mozilla.components.browser.state.state.content.DownloadState
import mozilla.components.browser.state.store.BrowserStore import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.browser.thumbnails.BrowserThumbnails import mozilla.components.browser.thumbnails.BrowserThumbnails
import mozilla.components.browser.toolbar.BrowserToolbar
import mozilla.components.concept.base.crash.Breadcrumb import mozilla.components.concept.base.crash.Breadcrumb
import mozilla.components.concept.engine.permission.SitePermissions import mozilla.components.concept.engine.permission.SitePermissions
import mozilla.components.concept.engine.prompt.ShareData import mozilla.components.concept.engine.prompt.ShareData
@ -92,8 +91,8 @@ import mozilla.components.feature.session.PictureInPictureFeature
import mozilla.components.feature.session.ScreenOrientationFeature import mozilla.components.feature.session.ScreenOrientationFeature
import mozilla.components.feature.session.SessionFeature import mozilla.components.feature.session.SessionFeature
import mozilla.components.feature.session.SwipeRefreshFeature import mozilla.components.feature.session.SwipeRefreshFeature
import mozilla.components.feature.sitepermissions.SitePermissionsFeature
import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
import mozilla.components.feature.sitepermissions.SitePermissionsFeature
import mozilla.components.feature.webauthn.WebAuthnFeature import mozilla.components.feature.webauthn.WebAuthnFeature
import mozilla.components.lib.state.ext.consumeFlow import mozilla.components.lib.state.ext.consumeFlow
import mozilla.components.lib.state.ext.flowScoped import mozilla.components.lib.state.ext.flowScoped

@ -32,7 +32,7 @@ class BottomToolbarContainerView(
container: ViewGroup, container: ViewGroup,
navigationItems: List<ActionItem> = NavigationItems.defaultItems, navigationItems: List<ActionItem> = NavigationItems.defaultItems,
androidToolbarView: View? = null, androidToolbarView: View? = null,
menuButton: MenuButton menuButton: MenuButton,
) { ) {
init { init {

@ -41,7 +41,7 @@ import org.mozilla.fenix.theme.Theme
@Composable @Composable
fun NavigationBar( fun NavigationBar(
actionItems: List<ActionItem>, actionItems: List<ActionItem>,
menuButton: MenuButton? = null menuButton: MenuButton? = null,
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier

Loading…
Cancel
Save