commit b677b84e540078b543efe161d58a96e2001e5af1
parent 01836d285af78804dd7e3b8a538419937fed43f7
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 19 Nov 2025 02:24:21 +0000
Bug 1996444 - Part 2: Align the Bookmarks empty screen with the M3 specs r=android-reviewers,007
Top App Bar: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=63923-29115&m=dev
Bookmarks: https://www.figma.com/design/ctk1Pw1TBxUwVgTTOvjHb4/2025-Android-Fundamentals?node-id=623-21952&m=dev
Empty State: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=64640-18543&m=dev
Differential Revision: https://phabricator.services.mozilla.com/D270332
Diffstat:
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt
@@ -619,7 +619,7 @@ private fun BookmarksListTopBar(
title = {
Text(
color = textColor,
- style = FirefoxTheme.typography.headline6,
+ style = FirefoxTheme.typography.headline5,
text = if (selectedItems.isNotEmpty()) {
val total = selectedItems.size + (recursiveCount ?: 0)
stringResource(R.string.bookmarks_multi_select_title, total)
@@ -1010,7 +1010,7 @@ private fun SelectFolderTopBar(store: BookmarksStore) {
title = {
Text(
text = stringResource(R.string.bookmark_select_folder_fragment_label),
- style = FirefoxTheme.typography.headline6,
+ style = FirefoxTheme.typography.headline5,
)
},
navigationIcon = {
@@ -1144,19 +1144,22 @@ private fun EmptyList(
Column(
modifier = Modifier.width(FirefoxTheme.layout.size.containerMaxWidth),
horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(16.dp),
) {
Image(
painter = painterResource(state.drawableId()),
contentDescription = null,
)
+ Spacer(modifier = Modifier.height(FirefoxTheme.layout.space.static200))
+
Text(
text = stringResource(R.string.bookmark_empty_list_title),
color = MaterialTheme.colorScheme.onSurface,
- style = FirefoxTheme.typography.headline7,
+ style = FirefoxTheme.typography.headline6,
)
+ Spacer(modifier = Modifier.height(FirefoxTheme.layout.space.static100))
+
Text(
text = stringResource(state.descriptionId()),
color = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -1165,6 +1168,8 @@ private fun EmptyList(
)
if (state is EmptyListState.NotAuthenticated) {
+ Spacer(modifier = Modifier.height(FirefoxTheme.layout.space.static300))
+
FilledButton(
text = stringResource(R.string.bookmark_empty_list_guest_cta),
onClick = { dispatcher(SignIntoSyncClicked) },
@@ -1439,7 +1444,7 @@ private fun EditFolderTopBar(
title = {
Text(
text = stringResource(R.string.edit_bookmark_folder_fragment_title),
- style = FirefoxTheme.typography.headline6,
+ style = FirefoxTheme.typography.headline5,
)
},
navigationIcon = {
@@ -1527,7 +1532,7 @@ private fun AddFolderTopBar(onBackClick: () -> Unit) {
title = {
Text(
text = stringResource(R.string.bookmark_add_folder),
- style = FirefoxTheme.typography.headline6,
+ style = FirefoxTheme.typography.headline5,
)
},
navigationIcon = {
@@ -1711,7 +1716,7 @@ private fun EditBookmarkTopBar(
title = {
Text(
text = stringResource(R.string.edit_bookmark_fragment_title),
- style = FirefoxTheme.typography.headline6,
+ style = FirefoxTheme.typography.headline5,
)
},
navigationIcon = {