From df77449cbf994a48b7d480e6d73074b566710129 Mon Sep 17 00:00:00 2001 From: Noah Bond Date: Tue, 24 May 2022 17:27:30 -0700 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/25291 - Swap the new TextButton composable into WallpaperSettings --- .../settings/wallpaper/WallpaperSettings.kt | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt index 5b220f30e..7aa7f70f8 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt @@ -31,7 +31,6 @@ import androidx.compose.material.Surface import androidx.compose.material.Switch import androidx.compose.material.SwitchDefaults import androidx.compose.material.Text -import androidx.compose.material.TextButton import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -55,12 +54,12 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch import org.mozilla.fenix.R +import org.mozilla.fenix.compose.button.TextButton import org.mozilla.fenix.ext.components import org.mozilla.fenix.theme.FirefoxTheme import org.mozilla.fenix.theme.Theme import org.mozilla.fenix.wallpapers.Wallpaper import org.mozilla.fenix.wallpapers.WallpaperManager -import java.util.Locale /** * The screen for controlling settings around Wallpapers. When a new wallpaper is selected, @@ -143,18 +142,11 @@ private fun WallpaperSnackbar( }, action = { TextButton( - modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp), + text = stringResource(R.string.wallpaper_updated_snackbar_action), onClick = onViewWallpaper, - ) { - Text( - text = stringResource(R.string.wallpaper_updated_snackbar_action).uppercase( - Locale.getDefault() - ), - color = FirefoxTheme.colors.textOnColorPrimary, - fontFamily = FontFamily(Font(R.font.metropolis_medium)), - fontSize = 14.sp, - ) - } + modifier = Modifier.padding(all = 8.dp), + textColor = FirefoxTheme.colors.textOnColorPrimary, + ) }, ) }