fix: Improve MessageBox colors

This commit is contained in:
Myzel394 2023-12-31 22:49:16 +01:00
parent e8337f2fc2
commit b581505c97
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B

View File

@ -31,22 +31,36 @@ fun MessageBox(
density: VisualDensity = VisualDensity.COMFORTABLE,
) {
val isDark = rememberIsInDarkMode()
val containerColor = when (type) {
val containerColorDarkMode = when (type) {
MessageType.ERROR -> MaterialTheme.colorScheme.errorContainer
MessageType.INFO -> MaterialTheme.colorScheme.tertiaryContainer
MessageType.SUCCESS -> Color.Green.copy(alpha = 0.3f)
MessageType.WARNING -> Color.Yellow.copy(alpha = 0.3f)
MessageType.SURFACE -> MaterialTheme.colorScheme.surfaceVariant
}
val onContainerColor = when (type) {
MessageType.ERROR -> MaterialTheme.colorScheme.onError
val onContainerColorDarkMode = when (type) {
MessageType.ERROR -> MaterialTheme.colorScheme.onErrorContainer
MessageType.INFO -> MaterialTheme.colorScheme.onTertiaryContainer
MessageType.SUCCESS -> Color.Green
MessageType.WARNING -> Color.Yellow
MessageType.SURFACE -> MaterialTheme.colorScheme.onSurfaceVariant
}
val textColor = if (isDark) onContainerColor else MaterialTheme.colorScheme.onSurface
val backgroundColor = if (isDark) containerColor else onContainerColor
val containerColorLightMode = when (type) {
MessageType.ERROR -> MaterialTheme.colorScheme.errorContainer
MessageType.INFO -> MaterialTheme.colorScheme.tertiaryContainer
MessageType.SUCCESS -> Color.Green
MessageType.WARNING -> Color.Yellow
MessageType.SURFACE -> MaterialTheme.colorScheme.onSurfaceVariant
}
val onContainerColorLightMode = when (type) {
MessageType.ERROR -> MaterialTheme.colorScheme.onErrorContainer
MessageType.INFO -> MaterialTheme.colorScheme.onTertiaryContainer
MessageType.SUCCESS -> MaterialTheme.colorScheme.onSurface
MessageType.WARNING -> MaterialTheme.colorScheme.onSurface
MessageType.SURFACE -> MaterialTheme.colorScheme.surfaceVariant
}
val textColor = if (isDark) onContainerColorDarkMode else onContainerColorLightMode
val backgroundColor = if (isDark) containerColorDarkMode else containerColorLightMode
Row(
verticalAlignment = Alignment.CenterVertically,