commit 89558f6ed006356642f8df0a4266d92d06f0da22
parent 6f952528ef7645c497123dcfc968896e06e8205c
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Tue, 18 Nov 2025 23:32:38 +0000
Bug 1993856 - Part 5: Align the Recent Tabs with the M3 Acorn Specs r=android-reviewers,007
Card Figma: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=61820-4186&m=dev
Differential Revision: https://phabricator.services.mozilla.com/D268822
Diffstat:
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-@file:Suppress("MagicNumber", "TooManyFunctions")
-
package org.mozilla.fenix.home.recenttabs.view
import android.graphics.Bitmap
@@ -25,6 +23,8 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -76,7 +76,7 @@ private const val THUMBNAIL_SIZE = 108
fun RecentTabs(
recentTabs: List<RecentTab>,
menuItems: List<RecentTabMenuItem>,
- backgroundColor: Color = FirefoxTheme.colors.layer2,
+ backgroundColor: Color = MaterialTheme.colorScheme.surfaceContainerLowest,
onRecentTabClick: (String) -> Unit = {},
) {
Column(
@@ -156,7 +156,7 @@ private fun RecentTabItem(
testTagsAsResourceId = true
testTag = "recent.tab.title"
},
- color = FirefoxTheme.colors.textPrimary,
+ color = MaterialTheme.colorScheme.onSurface,
fontSize = 14.sp,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
@@ -180,7 +180,7 @@ private fun RecentTabItem(
testTagsAsResourceId = true
testTag = "recent.tab.url"
},
- color = FirefoxTheme.colors.textSecondary,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
fontSize = 12.sp,
overflow = TextOverflow.Ellipsis,
maxLines = 1,
@@ -311,15 +311,21 @@ private fun PlaceHolderTabIcon(modifier: Modifier) {
@Composable
private fun RecentTabsPreview() {
FirefoxTheme {
- RecentTabs(
- recentTabs = FakeHomepagePreview.recentTabs(),
- menuItems = listOf(
- RecentTabMenuItem(
- title = "Menu item",
- onClick = {},
- ),
- ),
- onRecentTabClick = {},
- )
+ Surface {
+ Column(
+ modifier = Modifier.padding(all = FirefoxTheme.layout.space.static200),
+ ) {
+ RecentTabs(
+ recentTabs = FakeHomepagePreview.recentTabs(),
+ menuItems = listOf(
+ RecentTabMenuItem(
+ title = "Menu item",
+ onClick = {},
+ ),
+ ),
+ onRecentTabClick = {},
+ )
+ }
+ }
}
}
diff --git a/mobile/android/fenix/config/detekt-baseline.xml b/mobile/android/fenix/config/detekt-baseline.xml
@@ -113,7 +113,6 @@
<ID>ForbiddenSuppress:ProtectionPanel.kt$@Suppress("LongParameterList", "LongMethod", "CognitiveComplexMethod")</ID>
<ID>ForbiddenSuppress:RecentSyncedTab.kt$@Suppress("LongMethod", "CognitiveComplexMethod")</ID>
<ID>ForbiddenSuppress:RecentTabs.kt$@Suppress("LongMethod")</ID>
- <ID>ForbiddenSuppress:RecentTabs.kt$@file:Suppress("MagicNumber", "TooManyFunctions")</ID>
<ID>ForbiddenSuppress:RecentlyVisited.kt$@Suppress("CognitiveComplexMethod")</ID>
<ID>ForbiddenSuppress:RegionTools.kt$@Suppress("LongMethod")</ID>
<ID>ForbiddenSuppress:ReorderableGrid.kt$@Suppress("MagicNumber")</ID>