From f97c791e104c57beb80c6c7d9b011572b8d8d2ed Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Sun, 6 Aug 2023 15:49:11 +0200
Subject: [PATCH] ui: Improve MessageBox for light theme

---
 .../app/myzel394/alibi/ui/components/atoms/MessageBox.kt | 8 ++++++--
 app/src/main/java/app/myzel394/alibi/ui/utils/theme.kt   | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/app/myzel394/alibi/ui/utils/theme.kt

diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt b/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
index b94e215..31db793 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import app.myzel394.alibi.ui.utils.rememberIsInDarkMode
 
 
 @Composable
@@ -27,18 +28,21 @@ fun MessageBox(
     message: String,
     title: String? = null,
 ) {
-    val backgroundColor = when(type) {
+    val isDark = rememberIsInDarkMode()
+    val containerColor = 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)
     }
-    val textColor = when(type) {
+    val onContainerColor = when(type) {
         MessageType.ERROR -> MaterialTheme.colorScheme.onError
         MessageType.INFO -> MaterialTheme.colorScheme.onTertiary
         MessageType.SUCCESS -> Color.Green
         MessageType.WARNING -> Color.Yellow
     }
+    val textColor = if (isDark) onContainerColor else MaterialTheme.colorScheme.onSurface
+    val backgroundColor = if (isDark) containerColor else onContainerColor
 
     Row(
         verticalAlignment = Alignment.CenterVertically,
diff --git a/app/src/main/java/app/myzel394/alibi/ui/utils/theme.kt b/app/src/main/java/app/myzel394/alibi/ui/utils/theme.kt
new file mode 100644
index 0000000..b2d16f1
--- /dev/null
+++ b/app/src/main/java/app/myzel394/alibi/ui/utils/theme.kt
@@ -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()
+}
\ No newline at end of file