From b48bf023c5a3abd4f5a504f8b98e26188b422d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Fri, 19 Apr 2024 13:03:11 +0200 Subject: [PATCH] Replace Background by Surface --- .../app/k9mail/ui/catalog/ui/CatalogScreen.kt | 4 +-- .../ResponsiveWidthContainerPreview.kt | 4 +-- .../compose/designsystem/atom/Background.kt | 32 ------------------- .../ui/compose/designsystem/atom/Surface.kt | 2 +- .../feature/launcher/ui/FeatureLauncherApp.kt | 8 ++--- .../onboarding/welcome/ui/WelcomeContent.kt | 4 +-- 6 files changed, 10 insertions(+), 44 deletions(-) delete mode 100644 core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Background.kt diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/CatalogScreen.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/CatalogScreen.kt index 813c2bc09b..2430c4824a 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/CatalogScreen.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/CatalogScreen.kt @@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import app.k9mail.core.ui.compose.common.mvi.observe -import app.k9mail.core.ui.compose.designsystem.atom.Background +import app.k9mail.core.ui.compose.designsystem.atom.SurfaceContainer import app.k9mail.ui.catalog.ui.CatalogContract.Event.OnThemeChanged import app.k9mail.ui.catalog.ui.CatalogContract.Event.OnThemeVariantChanged import app.k9mail.ui.catalog.ui.CatalogContract.ViewModel @@ -23,7 +23,7 @@ fun CatalogScreen( theme = state.value.theme, themeVariant = state.value.themeVariant, ) { - Background( + SurfaceContainer( modifier = Modifier .fillMaxSize() .safeDrawingPadding() diff --git a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ResponsiveWidthContainerPreview.kt b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ResponsiveWidthContainerPreview.kt index c3e57ebedf..52fa6757ec 100644 --- a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ResponsiveWidthContainerPreview.kt +++ b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ResponsiveWidthContainerPreview.kt @@ -13,9 +13,7 @@ import app.k9mail.core.ui.compose.theme2.MainTheme @PreviewDevices internal fun ResponsiveWidthContainerPreview() { PreviewWithTheme { - Surface( - color = MainTheme.colors.surfaceContainer, - ) { + Surface { ResponsiveWidthContainer { Surface( color = MainTheme.colors.error, diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Background.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Background.kt deleted file mode 100644 index 0fc5efa3b5..0000000000 --- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Background.kt +++ /dev/null @@ -1,32 +0,0 @@ -package app.k9mail.core.ui.compose.designsystem.atom - -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import app.k9mail.core.ui.compose.theme.MainTheme -import app.k9mail.core.ui.compose.theme.PreviewWithThemes -import androidx.compose.material.Surface as MaterialSurface - -@Composable -fun Background( - modifier: Modifier = Modifier, - content: @Composable () -> Unit, -) { - MaterialSurface( - modifier = modifier, - content = content, - color = MainTheme.colors.background, - ) -} - -@Preview(showBackground = true) -@Composable -internal fun BackgroundPreview() { - PreviewWithThemes { - Background( - modifier = Modifier.fillMaxSize(), - content = {}, - ) - } -} diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Surface.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Surface.kt index 1005664f0c..4f79927c08 100644 --- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Surface.kt +++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Surface.kt @@ -13,7 +13,7 @@ import androidx.compose.material3.Surface as Material3Surface fun Surface( modifier: Modifier = Modifier, shape: Shape = RectangleShape, - color: Color = Color.Unspecified, + color: Color = MainTheme.colors.surface, tonalElevation: Dp = MainTheme.elevations.level0, content: @Composable () -> Unit, ) { diff --git a/feature/launcher/src/main/kotlin/app/k9mail/feature/launcher/ui/FeatureLauncherApp.kt b/feature/launcher/src/main/kotlin/app/k9mail/feature/launcher/ui/FeatureLauncherApp.kt index bdff314109..5aba28e425 100644 --- a/feature/launcher/src/main/kotlin/app/k9mail/feature/launcher/ui/FeatureLauncherApp.kt +++ b/feature/launcher/src/main/kotlin/app/k9mail/feature/launcher/ui/FeatureLauncherApp.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.navigation.compose.rememberNavController import app.k9mail.core.ui.compose.common.activity.LocalActivity -import app.k9mail.core.ui.compose.designsystem.atom.Background +import app.k9mail.core.ui.compose.designsystem.atom.Surface import app.k9mail.core.ui.compose.theme.K9Theme import app.k9mail.feature.launcher.FeatureLauncherExternalContract.FeatureThemeProvider import app.k9mail.feature.launcher.navigation.FeatureLauncherNavHost @@ -19,9 +19,9 @@ fun FeatureLauncherApp( ) { val navController = rememberNavController() - themeProvider.WithTheme { - K9Theme { - Background( + K9Theme { + themeProvider.WithTheme { + Surface( modifier = Modifier .fillMaxSize() .safeDrawingPadding() diff --git a/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt b/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt index c487d0236d..3c14d9144a 100644 --- a/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt +++ b/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import app.k9mail.core.ui.compose.common.annotation.PreviewDevices -import app.k9mail.core.ui.compose.designsystem.atom.Background +import app.k9mail.core.ui.compose.designsystem.atom.Surface import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonFilled import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonText import app.k9mail.core.ui.compose.designsystem.atom.text.TextBody1 @@ -42,7 +42,7 @@ internal fun WelcomeContent( onImportClick: () -> Unit, modifier: Modifier = Modifier, ) { - Background( + Surface( modifier = modifier, ) { ResponsiveContent {