Bug 1940628 - Add an URL background to BrowserEditToolbar r=android-reviewers,petru
- Adds a customizable URL background color to BrowserEditToolbar Differential Revision: https://phabricator.services.mozilla.com/D233606
This commit is contained in:
@@ -45,6 +45,7 @@ dependencies {
|
||||
implementation project(':browser-menu2')
|
||||
implementation project(':browser-domains')
|
||||
implementation project(':browser-state')
|
||||
implementation project(':compose-base')
|
||||
implementation project(':compose-browser-toolbar')
|
||||
|
||||
implementation project(':ui-colors')
|
||||
|
||||
@@ -39,6 +39,7 @@ import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
|
||||
import mozilla.components.browser.menu2.BrowserMenuController
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar.display.DisplayToolbar
|
||||
import mozilla.components.compose.base.theme.AcornTheme
|
||||
import mozilla.components.compose.browser.toolbar.store.BrowserEditToolbarAction
|
||||
import mozilla.components.compose.browser.toolbar.store.BrowserToolbarAction
|
||||
import mozilla.components.compose.browser.toolbar.store.BrowserToolbarStore
|
||||
@@ -489,28 +490,30 @@ class ToolbarActivity : AppCompatActivity() {
|
||||
showToolbar(isCompose = true)
|
||||
|
||||
binding.composeToolbar.setContent {
|
||||
val store = remember {
|
||||
BrowserToolbarStore()
|
||||
AcornTheme {
|
||||
val store = remember {
|
||||
BrowserToolbarStore()
|
||||
}
|
||||
|
||||
val uiState by store.observeAsState(initialValue = store.state) { it }
|
||||
|
||||
BrowserToolbar(
|
||||
onDisplayMenuClicked = {},
|
||||
onDisplayToolbarClick = {
|
||||
store.dispatch(BrowserToolbarAction.ToggleEditMode(editMode = true))
|
||||
},
|
||||
onTextEdit = { text ->
|
||||
store.dispatch(BrowserEditToolbarAction.UpdateEditText(text = text))
|
||||
},
|
||||
onTextCommit = {
|
||||
store.dispatch(BrowserToolbarAction.ToggleEditMode(editMode = false))
|
||||
},
|
||||
url = "https://www.mozilla.org/en-US/firefox/mobile/",
|
||||
hint = "Search or enter address",
|
||||
editMode = uiState.editMode,
|
||||
editText = uiState.editState.editText,
|
||||
)
|
||||
}
|
||||
|
||||
val uiState by store.observeAsState(initialValue = store.state) { it }
|
||||
|
||||
BrowserToolbar(
|
||||
onDisplayMenuClicked = {},
|
||||
onDisplayToolbarClick = {
|
||||
store.dispatch(BrowserToolbarAction.ToggleEditMode(editMode = true))
|
||||
},
|
||||
onTextEdit = { text ->
|
||||
store.dispatch(BrowserEditToolbarAction.UpdateEditText(text = text))
|
||||
},
|
||||
onTextCommit = {
|
||||
store.dispatch(BrowserToolbarAction.ToggleEditMode(editMode = false))
|
||||
},
|
||||
url = "https://www.mozilla.org/en-US/firefox/mobile/",
|
||||
hint = "Search or enter address",
|
||||
editMode = uiState.editMode,
|
||||
editText = uiState.editState.editText,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user