Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-19 07:15:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Improve MessageBox colors

Browse Source
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
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
View File

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