mirror of
https://github.com/thunderbird/thunderbird-android.git
synced 2024-09-19 19:52:14 +02:00
Replace Background by Surface
This commit is contained in:
parent
d72f6dee13
commit
b48bf023c5
@ -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()
|
||||
|
@ -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,
|
||||
|
@ -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 = {},
|
||||
)
|
||||
}
|
||||
}
|
@ -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,
|
||||
) {
|
||||
|
@ -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()
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user