tor-browser

commit dc5e54883909d8a6743e9c894cbe64df33435f9a
parent ca80bd8c732a9e85b532a519582e94aae0997681
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Thu, 20 Nov 2025 07:45:44 +0000

Bug 1993856 - Part 11: Migrate RecentlyVisited to M3 Acorn color tokens r=android-reviewers,007

Card: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=61820-4186&m=dev

Differential Revision: https://phabricator.services.mozilla.com/D273046

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt
 | 
20
+++++++-------------

1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.home.recentvisits.view
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
@@ -19,6 +18,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -48,6 +49,7 @@ import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem
 import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem.RecentHistoryGroup
 import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem.RecentHistoryHighlight
 import org.mozilla.fenix.theme.FirefoxTheme
+import mozilla.components.ui.icons.R as iconsR
 
 // Number of recently visited items per column.
 private const val VISITS_PER_COLUMN = 3
@@ -72,7 +74,7 @@ private val contentPadding = 16.dp
 fun RecentlyVisited(
     recentVisits: List<RecentlyVisitedItem>,
     menuItems: List<RecentVisitMenuItem>,
-    backgroundColor: Color = FirefoxTheme.colors.layer2,
+    backgroundColor: Color = MaterialTheme.colorScheme.surfaceContainerLowest,
     onRecentVisitClick: (RecentlyVisitedItem, pageNumber: Int) -> Unit = { _, _ -> },
 ) {
     val isSingleColumn by remember(recentVisits) { derivedStateOf { recentVisits.size <= VISITS_PER_COLUMN } }
@@ -175,7 +177,7 @@ private fun RecentlyVisitedHistoryGroup(
                     onClick = { onRecentVisitClick(recentVisit) },
                     onLongClick = { isMenuExpanded = true },
                 ),
-            beforeIconPainter = painterResource(R.drawable.ic_multiple_tabs),
+            beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_tab_tray_24),
             description = stringResource(id = captionId, recentVisit.historyMetadata.size),
         )
 
@@ -237,11 +239,7 @@ private fun RecentlyVisitedHistoryHighlight(
 @PreviewLightDark
 private fun RecentlyVisitedMultipleColumnsPreview() {
     FirefoxTheme {
-        Box(
-            modifier = Modifier
-                .background(color = FirefoxTheme.colors.layer1)
-                .padding(vertical = contentPadding),
-        ) {
+        Surface {
             RecentlyVisited(
                 recentVisits = listOf(
                     RecentHistoryGroup(title = "running shoes"),
@@ -260,11 +258,7 @@ private fun RecentlyVisitedMultipleColumnsPreview() {
 @PreviewLightDark
 private fun RecentlyVisitedSingleColumnPreview() {
     FirefoxTheme {
-        Box(
-            modifier = Modifier
-                .background(color = FirefoxTheme.colors.layer1)
-                .padding(vertical = contentPadding),
-        ) {
+        Surface {
             RecentlyVisited(
                 recentVisits = listOf(
                     RecentHistoryGroup(title = "running shoes"),