Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-18 23:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

ui: Improve MessageBox for light theme

Browse Source
This commit is contained in:
Myzel394 2023-08-06 15:49:11 +02:00
parent df0bc042c0
commit f97c791e10
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import app.myzel394.alibi.ui.utils.rememberIsInDarkMode
@Composable @Composable
@ -27,18 +28,21 @@ fun MessageBox(
message: String, message: String,
title: String? = null, title: String? = null,
) { ) {
val backgroundColor = when(type) { val isDark = rememberIsInDarkMode()
val containerColor = 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)
} }
val textColor = when(type) { val onContainerColor = when(type) {
MessageType.ERROR -> MaterialTheme.colorScheme.onError MessageType.ERROR -> MaterialTheme.colorScheme.onError
MessageType.INFO -> MaterialTheme.colorScheme.onTertiary MessageType.INFO -> MaterialTheme.colorScheme.onTertiary
MessageType.SUCCESS -> Color.Green MessageType.SUCCESS -> Color.Green
MessageType.WARNING -> Color.Yellow MessageType.WARNING -> Color.Yellow
} }
val textColor = if (isDark) onContainerColor else MaterialTheme.colorScheme.onSurface
val backgroundColor = if (isDark) containerColor else onContainerColor
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,

9
app/src/main/java/app/myzel394/alibi/ui/utils/theme.kt Normal file
View File

@ -0,0 +1,9 @@
package app.myzel394.alibi.ui.utils
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.runtime.Composable
@Composable
fun rememberIsInDarkMode(): Boolean {
return isSystemInDarkTheme()
}