corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1948633 - part 4 - Use pageOrigin in samples and Fenix r=android-reviewers,tchoh

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D245954
This commit is contained in:
Mugurell
2025-04-23 17:55:46 +00:00
parent b7c528df3b
commit f9ba1adec4
10 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/android-components/samples/toolbar/src/main/java/org/mozilla/samples/toolbar/ToolbarActivity.kt
View File

@@ -515,9 +515,6 @@ class ToolbarActivity : AppCompatActivity() {
AcornTheme {
BrowserToolbar(
store = store,
onDisplayToolbarClick = {
store.dispatch(BrowserToolbarAction.ToggleEditMode(editMode = true))
},
onTextEdit = { text ->
store.dispatch(BrowserEditToolbarAction.UpdateEditText(text = text))
},
@@ -565,7 +562,6 @@ class ToolbarActivity : AppCompatActivity() {
BrowserToolbar(
store = store,
onDisplayToolbarClick = {},
onTextEdit = {},
onTextCommit = {},
colors = BrowserToolbarDefaults.colors(),

28
mobile/android/android-components/samples/toolbar/src/main/java/org/mozilla/samples/toolbar/middleware/BrowserToolbarMiddleware.kt
View File

@@ -17,6 +17,7 @@ import mozilla.components.compose.browser.toolbar.concept.Action
import mozilla.components.compose.browser.toolbar.concept.Action.ActionButton
import mozilla.components.compose.browser.toolbar.concept.Action.DropdownAction
import mozilla.components.compose.browser.toolbar.concept.Action.TabCounterAction
import mozilla.components.compose.browser.toolbar.concept.PageOrigin
import mozilla.components.compose.browser.toolbar.store.BrowserDisplayToolbarAction
import mozilla.components.compose.browser.toolbar.store.BrowserDisplayToolbarAction.UpdateProgressBarConfig
import mozilla.components.compose.browser.toolbar.store.BrowserToolbarAction
@@ -33,6 +34,8 @@ import mozilla.components.compose.browser.toolbar.store.ProgressBarGravity.Botto
import mozilla.components.lib.state.Middleware
import mozilla.components.lib.state.MiddlewareContext
import org.mozilla.samples.toolbar.R
import org.mozilla.samples.toolbar.middleware.PageOriginInteractions.CopyOptionClicked
import org.mozilla.samples.toolbar.middleware.PageOriginInteractions.PageOriginClicked
import org.mozilla.samples.toolbar.middleware.SearchSelectorInteractions.BookmarksClicked
import org.mozilla.samples.toolbar.middleware.SearchSelectorInteractions.HistoryClicked
import org.mozilla.samples.toolbar.middleware.SearchSelectorInteractions.SettingsClicked
@@ -59,6 +62,11 @@ private sealed class StartPageInteractions : BrowserToolbarEvent {
data object SecurityIndicatorClicked : StartBrowserInteractions()
}
private sealed class PageOriginInteractions : BrowserToolbarEvent {
data object PageOriginClicked : PageOriginInteractions()
data object CopyOptionClicked : PageOriginInteractions()
}
private sealed class TabCounterInteractions : BrowserToolbarEvent {
data object TabCounterClicked : TabCounterInteractions()
data object Add10TabsClicked : TabCounterInteractions()
@@ -91,9 +99,9 @@ internal class BrowserToolbarMiddleware(
BrowserToolbarAction.Init(
mode = Mode.DISPLAY,
displayState = DisplayState(
hint = "Search or enter address",
browserActionsStart = buildStartBrowserActions(),
pageActionsStart = buildStartPageActions(),
pageOrigin = buildPageOrigin(),
pageActions = listOf(
ActionButton(
icon = iconsR.drawable.mozac_ic_arrow_clockwise_24,
@@ -122,6 +130,7 @@ internal class BrowserToolbarMiddleware(
is SearchSelectorInteractions,
is StartBrowserInteractions,
is StartPageInteractions,
is PageOriginInteractions,
-> Toast.makeText(dependencies.context, action.javaClass.simpleName, Toast.LENGTH_SHORT).show()
is TabCounterClicked -> {
@@ -169,6 +178,23 @@ internal class BrowserToolbarMiddleware(
),
)
private fun buildPageOrigin() = PageOrigin(
hint = R.string.toolbar_search_hint,
title = null,
url = null,
onClick = PageOriginClicked,
onLongClick = BrowserToolbarMenu {
listOf(
BrowserToolbarMenuButton(
iconResource = iconsR.drawable.mozac_ic_copy_24,
text = R.string.copy_url_button,
contentDescription = R.string.copy_url_button_description,
onClick = CopyOptionClicked,
),
)
},
)
private fun buildDisplayBrowserActions() = listOf(
TabCounterAction(
count = currentTabsNumber,

3
mobile/android/android-components/samples/toolbar/src/main/res/values/strings.xml
View File

@@ -21,4 +21,7 @@
<string name="page_action_clear_input_description">Clear input</string>
<string name="browser_action_home_button_description">Stay home</string>
<string name="browser_action_security_lock_description">Webpage security information</string>
<string name="toolbar_search_hint">Search or enter address</string>
<string name="copy_url_button">Copy</string>
<string name="copy_url_button_description">Copy the current url</string>
</resources>