From 1d8d6d0904023e7c101e913ef46ac4e48c594eb5 Mon Sep 17 00:00:00 2001
From: Shihaam Abdul Rahman <shihaam@shihaam.me>
Date: Thu, 12 Mar 2026 17:06:00 +0500
Subject: [PATCH] Fix monet theme issues

---
 .../sh/sar/isodroid/ui/components/StatusCard.kt   | 15 ++++++---------
 .../sh/sar/isodroid/ui/screens/DownloadsScreen.kt |  3 ++-
 .../java/sh/sar/isodroid/ui/screens/MainScreen.kt |  3 ++-
 .../sh/sar/isodroid/ui/screens/SettingsScreen.kt  |  3 ++-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/sh/sar/isodroid/ui/components/StatusCard.kt b/app/src/main/java/sh/sar/isodroid/ui/components/StatusCard.kt
index c0c64d2..2155185 100644
--- a/app/src/main/java/sh/sar/isodroid/ui/components/StatusCard.kt
+++ b/app/src/main/java/sh/sar/isodroid/ui/components/StatusCard.kt
@@ -43,9 +43,6 @@ import coil.decode.SvgDecoder
 import coil.request.ImageRequest
 import sh.sar.isodroid.data.MountStatus
 import sh.sar.isodroid.data.MountType
-import sh.sar.isodroid.ui.theme.ErrorRed
-import sh.sar.isodroid.ui.theme.MountedGreen
-import sh.sar.isodroid.ui.theme.UnmountedGray
 import java.io.File
 
 @Composable
@@ -112,9 +109,9 @@ fun StatusCard(
                         },
                         contentDescription = null,
                         tint = when {
-                            hasError -> ErrorRed
-                            mountStatus.mounted -> MountedGreen
-                            else -> UnmountedGray
+                            hasError -> MaterialTheme.colorScheme.onErrorContainer
+                            mountStatus.mounted -> MaterialTheme.colorScheme.onPrimaryContainer
+                            else -> MaterialTheme.colorScheme.onSurfaceVariant
                         },
                         modifier = Modifier.size(32.dp)
                     )
@@ -201,20 +198,20 @@ fun StatusCard(
                     text = fileName,
                     style = MaterialTheme.typography.bodyMedium,
                     fontWeight = FontWeight.Medium,
-                    color = MaterialTheme.colorScheme.onSurface
+                    color = MaterialTheme.colorScheme.onPrimaryContainer
                 )
                 Spacer(modifier = Modifier.height(4.dp))
                 Row {
                     Text(
                         text = if (mountStatus.type == MountType.CDROM) "CD-ROM" else "Mass Storage",
                         style = MaterialTheme.typography.labelSmall,
-                        color = MaterialTheme.colorScheme.primary
+                        color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)
                     )
                     Spacer(modifier = Modifier.width(8.dp))
                     Text(
                         text = if (mountStatus.readOnly) "Read-Only" else "Read-Write",
                         style = MaterialTheme.typography.labelSmall,
-                        color = MaterialTheme.colorScheme.secondary
+                        color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)
                     )
                 }
             }
diff --git a/app/src/main/java/sh/sar/isodroid/ui/screens/DownloadsScreen.kt b/app/src/main/java/sh/sar/isodroid/ui/screens/DownloadsScreen.kt
index 37b5fac..f19ca14 100644
--- a/app/src/main/java/sh/sar/isodroid/ui/screens/DownloadsScreen.kt
+++ b/app/src/main/java/sh/sar/isodroid/ui/screens/DownloadsScreen.kt
@@ -114,7 +114,8 @@ fun DownloadsScreen(
                 },
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.primaryContainer,
-                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                    navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer
                 )
             )
         }
diff --git a/app/src/main/java/sh/sar/isodroid/ui/screens/MainScreen.kt b/app/src/main/java/sh/sar/isodroid/ui/screens/MainScreen.kt
index 95c5baa..b6c1bcf 100644
--- a/app/src/main/java/sh/sar/isodroid/ui/screens/MainScreen.kt
+++ b/app/src/main/java/sh/sar/isodroid/ui/screens/MainScreen.kt
@@ -117,7 +117,8 @@ fun MainScreen(
                 title = { Text("ISO Droid") },
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.primaryContainer,
-                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                    actionIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer
                 ),
                 actions = {
                     IconButton(
diff --git a/app/src/main/java/sh/sar/isodroid/ui/screens/SettingsScreen.kt b/app/src/main/java/sh/sar/isodroid/ui/screens/SettingsScreen.kt
index 13b9d3d..85c4ea1 100644
--- a/app/src/main/java/sh/sar/isodroid/ui/screens/SettingsScreen.kt
+++ b/app/src/main/java/sh/sar/isodroid/ui/screens/SettingsScreen.kt
@@ -158,7 +158,8 @@ fun SettingsScreen(
                 },
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.primaryContainer,
-                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                    navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer
                 )
             )
         }