diff --git a/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/ListItem.kt b/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/ListItem.kt index 2676dfe..9961196 100644 --- a/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/ListItem.kt +++ b/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/ListItem.kt @@ -61,9 +61,9 @@ internal fun ChildListItem( ) } Column(modifier = Modifier.weight(1f)) { - BodyLargeText(title) + BodyLargeText(text = title, color = MaterialTheme.colorScheme.onSurface) if (subtitle != null) - BodyMediumText(text = subtitle) + BodyMediumText(text = subtitle, color = MaterialTheme.colorScheme.onSurfaceVariant) } if (isChecked != null && onCheckBoxClick != null) { IconToggleButton( diff --git a/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/Text.kt b/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/Text.kt index b7d5fae..363d9af 100644 --- a/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/Text.kt +++ b/libpickyou/src/main/kotlin/com/xayah/libpickyou/ui/components/Text.kt @@ -4,6 +4,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -30,20 +31,22 @@ internal fun TopBarSubTitle(modifier: Modifier, text: String) { } @Composable -internal fun BodyLargeText(text: String) { +internal fun BodyLargeText(text: String, color: Color = Color.Unspecified) { Text( text = text, - style = MaterialTheme.typography.bodyLarge + style = MaterialTheme.typography.bodyLarge, + color = color ) } @Composable -internal fun BodyMediumText(modifier: Modifier = Modifier, text: String, fontWeight: FontWeight? = null) { +internal fun BodyMediumText(modifier: Modifier = Modifier, text: String, fontWeight: FontWeight? = null, color: Color = Color.Unspecified) { Text( modifier = modifier, text = text, style = MaterialTheme.typography.bodyMedium, fontWeight = fontWeight, + color = color, ) }