From fc149dfccdd66d4b44809fa4b2380123be91c761 Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Sun, 7 Mar 2021 19:00:17 +0100 Subject: [PATCH] Use light text in dark mode --- .../compose/ui/settings/NavActionSetting.kt | 4 ++-- .../lawnchair/compose/ui/settings/Settings.kt | 17 ++++++++++++++--- .../compose/ui/settings/SwitchSetting.kt | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/NavActionSetting.kt b/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/NavActionSetting.kt index 44b9746430..ffbbc740fc 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/NavActionSetting.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/NavActionSetting.kt @@ -28,10 +28,10 @@ fun NavActionSetting( .clickable { navController.navigate(route = destination) } .padding(start = 16.dp, end = 16.dp), ) { - Text(text = title, style = MaterialTheme.typography.subtitle1) + Text(text = title, style = MaterialTheme.typography.subtitle1, color = MaterialTheme.colors.onBackground) subtitle?.let { CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) { - Text(text = subtitle, style = MaterialTheme.typography.body2) + Text(text = it, style = MaterialTheme.typography.body2, color = MaterialTheme.colors.onBackground) } } } diff --git a/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/Settings.kt b/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/Settings.kt index a6bfc1a5a4..4d4f1cd9ea 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/Settings.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/Settings.kt @@ -42,12 +42,14 @@ sealed class Screen( subtitleResId = R.string.general_description, iconResId = R.drawable.ic_general ) + object HomeScreenSettings : Screen( route = "homeScreenSettings", titleResId = R.string.home_screen_label, subtitleResId = R.string.home_screen_description, iconResId = R.drawable.ic_home_screen ) + object IconPackSettings : Screen( route = "iconPackSettings", titleResId = R.string.icon_pack @@ -134,7 +136,8 @@ private fun TopBar(navController: NavController) { Text( text = title, style = MaterialTheme.typography.h6, - modifier = Modifier.padding(start = 16.dp) + modifier = Modifier.padding(start = 16.dp), + color = MaterialTheme.colors.onSurface ) } } @@ -160,10 +163,18 @@ private fun ScreenRow(titleResId: Int, onClick: () -> Unit, subtitleResId: Int?, ) } Column(Modifier.padding(start = 24.dp)) { - Text(text = stringResource(id = titleResId), style = MaterialTheme.typography.subtitle1) + Text( + text = stringResource(id = titleResId), + style = MaterialTheme.typography.subtitle1, + color = MaterialTheme.colors.onBackground + ) subtitleResId?.let { CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) { - Text(text = stringResource(id = it), style = MaterialTheme.typography.body2) + Text( + text = stringResource(id = it), + style = MaterialTheme.typography.body2, + color = MaterialTheme.colors.onBackground + ) } } } diff --git a/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/SwitchSetting.kt b/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/SwitchSetting.kt index b3e3ae66d8..99190793e5 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/SwitchSetting.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/compose/ui/settings/SwitchSetting.kt @@ -24,10 +24,10 @@ fun SwitchSetting( horizontalArrangement = Arrangement.SpaceBetween ) { Column { - Text(text = title, style = MaterialTheme.typography.subtitle1) + Text(text = title, style = MaterialTheme.typography.subtitle1, color = MaterialTheme.colors.onBackground) subtitle?.let { CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) { - Text(text = subtitle, style = MaterialTheme.typography.body2) + Text(text = subtitle, style = MaterialTheme.typography.body2, color = MaterialTheme.colors.onBackground) } } }