commit 9a77697f1bec6f78417b007192b38eef7923e9b0 parent 02dc395a6fa097e3137200469605b9e20fc9e16d Author: Gabriel Luong <gabriel.luong@gmail.com> Date: Sat, 18 Oct 2025 16:21:53 +0000 Bug 1993368 - Part 4: Migrate FirefoxTheme.colors.textAccent usages to MaterialTheme.colorScheme.tertiary r=android-reviewers,007 The textAccent color token maps directly to tertiary. Mass refactor of the textAccent color token to use tertiary. Figma: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=64745-6585&m=dev Differential Revision: https://phabricator.services.mozilla.com/D268431 Diffstat:
23 files changed, 57 insertions(+), 33 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 @@ -961,7 +961,7 @@ private fun FolderListItem( Spacer(modifier = Modifier.width(56.dp)) Text( text = folder.title, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.headline8, ) } @@ -984,9 +984,9 @@ private fun NewFolderListItem(onClick: () -> Unit) { IconListItem( label = stringResource(R.string.bookmark_select_folder_new_folder_button_title), modifier = Modifier.width(FirefoxTheme.layout.size.containerMaxWidth), - labelTextColor = FirefoxTheme.colors.textAccent, + labelTextColor = MaterialTheme.colorScheme.tertiary, beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_add_24), - beforeIconTint = FirefoxTheme.colors.textAccent, + beforeIconTint = MaterialTheme.colorScheme.tertiary, onClick = onClick, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/ClickableSubstringLink.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/ClickableSubstringLink.kt @@ -7,6 +7,7 @@ package org.mozilla.fenix.compose import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.text.ClickableText +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -36,7 +37,7 @@ fun ClickableSubstringLink( text: String, textStyle: TextStyle = FirefoxTheme.typography.caption, textColor: Color = FirefoxTheme.colors.textPrimary, - linkTextColor: Color = FirefoxTheme.colors.textAccent, + linkTextColor: Color = MaterialTheme.colorScheme.tertiary, linkTextDecoration: TextDecoration? = null, clickableStartIndex: Int, clickableEndIndex: Int, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/LinkText.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/LinkText.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Card +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.minimumInteractiveComponentSize @@ -76,7 +77,7 @@ fun LinkText( textAlign = TextAlign.Center, color = FirefoxTheme.colors.textSecondary, ), - linkTextColor: Color = FirefoxTheme.colors.textAccent, + linkTextColor: Color = MaterialTheme.colorScheme.tertiary, linkTextDecoration: TextDecoration = TextDecoration.None, textAlign: TextAlign? = null, shouldApplyAccessibleSize: Boolean = false, @@ -152,7 +153,7 @@ private fun LinksDialog( ) { Text( text = linkText.text, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, textDecoration = TextDecoration.Underline, style = FirefoxTheme.typography.button, ) @@ -166,7 +167,7 @@ private fun LinksDialog( ) { Text( text = stringResource(id = R.string.standard_snackbar_error_dismiss), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.button, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/home/HomeSectionHeader.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/home/HomeSectionHeader.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -67,9 +68,9 @@ fun HomeSectionHeader( textColor = wallpaperAdaptedTextColor ?: FirefoxTheme.colors.textPrimary, description = description, showAllTextColor = if (isWallpaperDefault) { - FirefoxTheme.colors.textAccent + MaterialTheme.colorScheme.tertiary } else { - wallpaperAdaptedTextColor ?: FirefoxTheme.colors.textAccent + wallpaperAdaptedTextColor ?: MaterialTheme.colorScheme.tertiary }, onShowAllClick = onShowAllClick, ) @@ -92,7 +93,7 @@ private fun HomeSectionHeaderContent( modifier: Modifier = Modifier, textColor: Color = FirefoxTheme.colors.textPrimary, description: String = "", - showAllTextColor: Color = FirefoxTheme.colors.textAccent, + showAllTextColor: Color = MaterialTheme.colorScheme.tertiary, onShowAllClick: (() -> Unit)? = null, ) { Row( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/list/ListItem.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/list/ListItem.kt @@ -943,6 +943,7 @@ private fun ListItemContent( overflow = TextOverflow.Ellipsis, ) } + Text( text = label, modifier = labelModifier, @@ -1058,6 +1059,7 @@ private fun IconListItemPreview() { IconListItem( label = "Left icon list item", + labelTextColor = MaterialTheme.colorScheme.tertiary, onClick = {}, beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_24), beforeIconDescription = "click me", @@ -1313,6 +1315,7 @@ private fun SelectableIconListItemPreview() { SelectableIconListItem( label = "Left icon list item", isSelected = false, + labelTextColor = MaterialTheme.colorScheme.tertiary, onClick = {}, beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_24), beforeIconDescription = "click me", @@ -1321,6 +1324,7 @@ private fun SelectableIconListItemPreview() { SelectableIconListItem( label = "Selected left icon list item", isSelected = true, + labelTextColor = MaterialTheme.colorScheme.tertiary, onClick = {}, beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_24), beforeIconDescription = "click me", diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/crashes/UnsubmittedCrashDialog.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/crashes/UnsubmittedCrashDialog.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Checkbox import androidx.compose.material3.CheckboxDefaults +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -186,7 +187,7 @@ private fun CrashCard( ) { Text( text = stringResource(R.string.unsubmitted_crash_dialog_negative_button_2), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.button, ) } @@ -203,7 +204,7 @@ private fun CrashCard( ) { Text( text = stringResource(R.string.unsubmitted_crash_dialog_positive_button_2), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.button, ) } @@ -306,7 +307,7 @@ private fun AnnotatedStringBody() { ), linkTextStates = listOf(linkStateLearnMore), style = FirefoxTheme.typography.body2.copy(FirefoxTheme.colors.textPrimary), - linkTextColor = FirefoxTheme.colors.textAccent, + linkTextColor = MaterialTheme.colorScheme.tertiary, linkTextDecoration = TextDecoration.Underline, textAlign = null, shouldApplyAccessibleSize = false, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/cfrs/CfrTools.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/cfrs/CfrTools.kt @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -210,7 +211,7 @@ private fun CfrSectionTitle( Text( text = text, modifier = Modifier.padding(horizontal = FirefoxTheme.layout.space.dynamic400), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.headline6, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/gleandebugtools/ui/GleanDebugToolsScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/gleandebugtools/ui/GleanDebugToolsScreen.kt @@ -15,6 +15,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -227,7 +228,7 @@ private fun GleanDebugSectionTitle( Text( text = text, modifier = Modifier.padding(horizontal = FirefoxTheme.layout.space.dynamic400), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.subtitle1, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt @@ -5,6 +5,7 @@ package org.mozilla.fenix.home.fake import android.content.Context +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import mozilla.components.browser.state.state.ContentState @@ -404,7 +405,7 @@ internal object FakeHomepagePreview { categoriesSelections = emptyList(), categoryColors = SelectableChipColors.buildColors(), textColor = FirefoxTheme.colors.textPrimary, - linkTextColor = FirefoxTheme.colors.textAccent, + linkTextColor = MaterialTheme.colorScheme.tertiary, showDiscoverMoreButton = false, ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/PocketState.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/PocketState.kt @@ -5,6 +5,7 @@ package org.mozilla.fenix.home.pocket import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import mozilla.components.compose.base.SelectableChipColors @@ -48,7 +49,7 @@ data class PocketState( @Composable internal fun build(appState: AppState, settings: Settings) = with(appState) { var textColor = FirefoxTheme.colors.textPrimary - var linkTextColor = FirefoxTheme.colors.textAccent + var linkTextColor = MaterialTheme.colorScheme.tertiary wallpaperState.currentWallpaper.let { currentWallpaper -> currentWallpaper.textColor?.let { diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/ui/AppIconSelection.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/ui/AppIconSelection.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.AlertDialog import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -136,7 +137,7 @@ private fun AppIconGroupHeader(title: IconGroupTitle) { .wrapContentHeight(Alignment.CenterVertically) .semantics { heading() }, style = FirefoxTheme.typography.headline8, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/ManagePrivacyPreferencesDialog.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/ManagePrivacyPreferencesDialog.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.wrapContentWidth 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.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -190,7 +191,7 @@ private fun DialogButton(text: String, onClick: () -> Unit) { TextButton(onClick = onClick) { Text( text.uppercase(), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.button, maxLines = 1, ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt @@ -103,7 +103,7 @@ private fun SelectedCheckmark(selected: Boolean = false) { .size(24.dp) .padding(1.dp) .clip(CircleShape) - .background(FirefoxTheme.colors.textAccent), + .background(MaterialTheme.colorScheme.tertiary), contentAlignment = Alignment.Center, ) { Icon( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/perf/ProfilerReusableComposable.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/perf/ProfilerReusableComposable.kt @@ -20,6 +20,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -185,11 +186,11 @@ fun BaseProfilerDialogContent( modifier = Modifier.fillMaxWidth(), ) { TextButton(onClick = onNegativeAction) { - Text(negativeActionText, color = FirefoxTheme.colors.textAccent) + Text(negativeActionText, color = MaterialTheme.colorScheme.tertiary) } Spacer(modifier = Modifier.width(8.dp)) TextButton(onClick = onPositiveAction) { - Text(positiveActionText, color = FirefoxTheme.colors.textAccent) + Text(positiveActionText, color = MaterialTheme.colorScheme.tertiary) } } } @@ -222,7 +223,7 @@ fun ProfilerErrorDialog( modifier = Modifier.padding(bottom = 16.dp), ) TextButton(onClick = onDismiss) { - Text(dismissButtonText, color = FirefoxTheme.colors.textAccent) + Text(dismissButtonText, color = MaterialTheme.colorScheme.tertiary) } } } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/PrivateSuggestionsCard.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/PrivateSuggestionsCard.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.material3.Button import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -91,7 +92,7 @@ internal fun PrivateSuggestionsCard( onClick = { onLearnMoreClick() }, ), ), - linkTextColor = FirefoxTheme.colors.textAccent, + linkTextColor = MaterialTheme.colorScheme.tertiary, ) Spacer(modifier = Modifier.height(12.dp)) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/datachoices/DataChoicesScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/datachoices/DataChoicesScreen.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Switch import androidx.compose.material3.SwitchDefaults import androidx.compose.material3.Text @@ -217,7 +218,7 @@ private fun TitleText(text: String, modifier: Modifier) { Text( text = text, style = FirefoxTheme.typography.body2, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, modifier = modifier, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/info/InfoScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/info/InfoScreen.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -91,7 +92,7 @@ private fun Title( ) { Text( text = title, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.headline8, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineShortcuts.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineShortcuts.kt @@ -25,6 +25,7 @@ import androidx.compose.material3.Checkbox import androidx.compose.material3.CheckboxDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -120,7 +121,7 @@ private fun Title(title: String) { ) { Text( text = title, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, fontWeight = FontWeight.W400, modifier = Modifier.padding(horizontal = 16.dp), style = FirefoxTheme.typography.headline8, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt @@ -24,6 +24,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -163,7 +164,7 @@ private fun WallpaperGroupHeading( ClickableSubstringLink( text = text, textColor = FirefoxTheme.colors.textSecondary, - linkTextColor = FirefoxTheme.colors.textAccent, + linkTextColor = MaterialTheme.colorScheme.tertiary, linkTextDecoration = TextDecoration.Underline, clickableStartIndex = linkStartIndex, clickableEndIndex = linkEndIndex, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/TranslationSettings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/TranslationSettings.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -95,7 +96,7 @@ fun TranslationSettings( .fillMaxWidth() .padding(start = 72.dp, end = 16.dp, bottom = 8.dp, top = 8.dp) .semantics { heading() }, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.headline8, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesPreference.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/preferences/downloadlanguages/DownloadLanguagesPreference.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -262,7 +263,7 @@ private fun DownloadLanguagesHeader(title: String) { .semantics { heading() } .defaultMinSize(minHeight = 36.dp) .wrapContentHeight(), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, style = FirefoxTheme.typography.headline8, ) } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -107,7 +108,7 @@ fun WallpaperOnboarding( ) { Text( text = stringResource(R.string.wallpapers_onboarding_dialog_explore_more_button_text), - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, overflow = TextOverflow.Ellipsis, maxLines = 1, style = FirefoxTheme.typography.button, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt @@ -25,6 +25,7 @@ import androidx.compose.material3.CheckboxDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -121,7 +122,7 @@ fun WebCompatReporter( ), ), style = FirefoxTheme.typography.body2.copy(color = FirefoxTheme.colors.textPrimary), - linkTextColor = FirefoxTheme.colors.textAccent, + linkTextColor = MaterialTheme.colorScheme.tertiary, linkTextDecoration = TextDecoration.Underline, textAlign = TextAlign.Start, ) @@ -253,7 +254,7 @@ fun WebCompatReporter( store.dispatch(WebCompatReporterAction.SendMoreInfoClicked) }, style = FirefoxTheme.typography.body2, - color = FirefoxTheme.colors.textAccent, + color = MaterialTheme.colorScheme.tertiary, textDecoration = TextDecoration.Underline, )