Use light text in dark mode

This commit is contained in:
Patryk Michalik
2021-03-07 19:00:17 +01:00
parent e71afdb429
commit fc149dfccd
3 changed files with 18 additions and 7 deletions
@@ -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)
}
}
}
@@ -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
)
}
}
}
@@ -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)
}
}
}