From 3368f38a45dd82c25a3bea2a88ee6ebb401f13f5 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Wed, 6 Mar 2024 19:43:58 -0600 Subject: [PATCH] Configure dark theme on current screens - Show light and dark screen previews for current composables --- .../kee/ui/component/topappbar/TopAppBar.kt | 14 ++++++++++++++ .../net/agorise/kee/ui/screen/home/HomeScreen.kt | 11 +++++++++-- .../ui/screen/importaccount/ImportAccountScreen.kt | 11 +++++++++-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/component/topappbar/TopAppBar.kt b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/component/topappbar/TopAppBar.kt index 737dda3..f39086e 100644 --- a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/component/topappbar/TopAppBar.kt +++ b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/component/topappbar/TopAppBar.kt @@ -6,6 +6,8 @@ import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults.topAppBarColors import androidx.compose.runtime.Composable +import org.jetbrains.compose.ui.tooling.preview.Preview +import ui.theme.KeeTheme @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -22,3 +24,15 @@ fun KeeTopAppBar( } ) } + +@Preview +@Composable +private fun TopAppBarLightPreview() = KeeTheme(useDarkTheme = false) { + KeeTopAppBar("Kee Wallet") +} + +@Preview +@Composable +private fun TopAppBarDarkPreview() = KeeTheme(useDarkTheme = true) { + KeeTopAppBar("Kee Wallet") +} diff --git a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/home/HomeScreen.kt b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/home/HomeScreen.kt index 438030f..88a388b 100644 --- a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/home/HomeScreen.kt +++ b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/home/HomeScreen.kt @@ -13,11 +13,12 @@ import net.agorise.kee.getPlatform import net.agorise.kee.ui.component.topappbar.KeeTopAppBar import net.agorise.kee.ui.screen.importaccount.ImportAccountScreen import org.jetbrains.compose.ui.tooling.preview.Preview +import ui.theme.KeeTheme class HomeScreen : Screen { @Composable - override fun Content() { + override fun Content() = KeeTheme { HomeScreenContent() } } @@ -46,6 +47,12 @@ private fun HomeScreenContent() { @Preview @Composable -private fun HomeScreenContentPreview() { +private fun HomeScreenContentLightPreview() = KeeTheme(useDarkTheme = false) { + HomeScreenContent() +} + +@Preview +@Composable +private fun HomeScreenContentDarkPreview() = KeeTheme(useDarkTheme = true) { HomeScreenContent() } diff --git a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt index a756e0c..bfa9d30 100644 --- a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt +++ b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt @@ -15,11 +15,12 @@ import net.agorise.kee.ui.screen.home.HomeScreen import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.vectorResource import org.jetbrains.compose.ui.tooling.preview.Preview +import ui.theme.KeeTheme class ImportAccountScreen : Screen { @Composable - override fun Content() { + override fun Content() = KeeTheme { ImportAccountScreenContent() } } @@ -65,6 +66,12 @@ private fun ImportAccountScreenContent() { @Preview @Composable -private fun ImportAccountScreenContentPreview() { +private fun ImportAccountScreenContentLightPreview() = KeeTheme(useDarkTheme = false) { + ImportAccountScreenContent() +} + +@Preview +@Composable +private fun ImportAccountScreenContentDarkPreview() = KeeTheme(useDarkTheme = true) { ImportAccountScreenContent() }