diff --git a/compose/snippets/src/debug/java/com/example/compose/snippets/designsystems/PreviewSettingsMock.kt b/compose/snippets/src/debug/java/com/example/compose/snippets/designsystems/PreviewSettingsMock.kt new file mode 100644 index 000000000..19507c954 --- /dev/null +++ b/compose/snippets/src/debug/java/com/example/compose/snippets/designsystems/PreviewSettingsMock.kt @@ -0,0 +1,32 @@ +import android.content.res.Configuration +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.runtime.Composable +import com.example.compose.snippets.designsystems.ColorScheme +import com.example.compose.snippets.designsystems.SettingsMock + +@Preview( + name = "SettingsMock — Night", + uiMode = Configuration.UI_MODE_NIGHT_YES, + showBackground = true, + widthDp = 360, + heightDp = 720 +) +@Composable +fun PreviewSettingsMock_Night() { + // Force darkTheme = true so the preview uses the dark color scheme + ColorScheme.ReplyTheme(darkTheme = true) { + SettingsMock( + itemsList = listOf( + "Display", + "Battery", + "Wallpaper and style", + "Themes", + "Home screen", + "Lock screen", + "Security and privacy", + "Location", + "Safety and emergency" + ) + ) + } +} diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/Material3Snippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/Material3Snippets.kt index 5d5d72d37..80568edf8 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/Material3Snippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/Material3Snippets.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -102,6 +103,10 @@ private object ColorScheme { val md_theme_dark_primary = Color(0xFFACD370) val md_theme_dark_onPrimary = Color(0xFF213600) val md_theme_dark_primaryContainer = Color(0xFF324F00) + // Ensure absolutely dark surfaces/background: + val md_theme_dark_background = Color(0xFF000000) + val md_theme_dark_surface = Color(0xFF000000) + val md_theme_dark_surfaceVariant = Color(0xFF000000) // .. // .. // [END android_compose_material3_theme_colors] @@ -117,6 +122,9 @@ private object ColorScheme { primary = md_theme_dark_primary, onPrimary = md_theme_dark_onPrimary, primaryContainer = md_theme_dark_primaryContainer, + background = md_theme_dark_background, + surface = md_theme_dark_surface, + surfaceVariant = md_theme_dark_surfaceVariant, // .. ) @@ -187,6 +195,40 @@ private object ColorScheme { // [END android_compose_material3_use_color_theme_2] } + + /** + * Examples to avoid tonal elevation / overlays and make surfaces absolutely dark. + * Use these patterns where you want a pure black surface and no tonal tinting. + */ + @Composable + fun AbsoluteDarkExamples() { + // Surface with zero tonal elevation — keeps surface color as-is (no overlay) + Surface( + tonalElevation = 0.dp, + shadowElevation = 0.dp, + color = MaterialTheme.colorScheme.surface + ) { + // Card that explicitly uses the surface color and zero elevation + Card( + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + contentColor = MaterialTheme.colorScheme.onSurface + ), + elevation = CardDefaults.cardElevation(defaultElevation = 0.dp) + ) { + Text( + text = "Card with pure black surface", + modifier = Modifier.padding(16.dp), + color = MaterialTheme.colorScheme.onSurface + ) + } + } + + // Note: to make status/navigation bars pure black as well, use a system UI controller: + // rememberSystemUiController().setSystemBarsColor(Color.Black, darkIcons = false) + // (Accompanist library or platform APIs required) + } + } private object TypographySnippets { diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/SettingsMock.kt b/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/SettingsMock.kt new file mode 100644 index 000000000..52dd82d49 --- /dev/null +++ b/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/SettingsMock.kt @@ -0,0 +1,41 @@ +package com.example.compose.snippets.designsystems + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +/** + * A simple full-screen settings-like mock that uses the current MaterialTheme surface color + * and disables tonal elevation so the surfaces render as pure black when the dark scheme is set to black. + */ +@Composable +fun SettingsMock(itemsList: List) { + LazyColumn { + items(itemsList) { title -> + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 8.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + contentColor = MaterialTheme.colorScheme.onSurface + ), + elevation = CardDefaults.cardElevation(defaultElevation = 0.dp) + ) { + Text( + text = title, + modifier = Modifier.padding(20.dp), + color = MaterialTheme.colorScheme.onSurface + ) + } + } + } +}