shihaam/ISODroid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Fix monet theme issues

Browse Source
This commit is contained in:
Shihaam Abdul Rahman
2026-03-12 17:06:00 +05:00
parent a40986f9b8
commit 1d8d6d0904
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/sh/sar/isodroid/ui/components/StatusCard.kt
View File

@@ -43,9 +43,6 @@ import coil.decode.SvgDecoder
import coil.request.ImageRequest import coil.request.ImageRequest
import sh.sar.isodroid.data.MountStatus import sh.sar.isodroid.data.MountStatus
import sh.sar.isodroid.data.MountType 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 import java.io.File
@Composable @Composable
@@ -112,9 +109,9 @@ fun StatusCard(
}, },
contentDescription = null, contentDescription = null,
tint = when { tint = when {
hasError -> ErrorRed hasError -> MaterialTheme.colorScheme.onErrorContainer
mountStatus.mounted -> MountedGreen mountStatus.mounted -> MaterialTheme.colorScheme.onPrimaryContainer
else -> UnmountedGray else -> MaterialTheme.colorScheme.onSurfaceVariant
}, },
modifier = Modifier.size(32.dp) modifier = Modifier.size(32.dp)
) )
@@ -201,20 +198,20 @@ fun StatusCard(
text = fileName, text = fileName,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
color = MaterialTheme.colorScheme.onSurface color = MaterialTheme.colorScheme.onPrimaryContainer
) )
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
Row { Row {
Text( Text(
text = if (mountStatus.type == MountType.CDROM) "CD-ROM" else "Mass Storage", text = if (mountStatus.type == MountType.CDROM) "CD-ROM" else "Mass Storage",
style = MaterialTheme.typography.labelSmall, style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.primary color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)
) )
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))
Text( Text(
text = if (mountStatus.readOnly) "Read-Only" else "Read-Write", text = if (mountStatus.readOnly) "Read-Only" else "Read-Write",
style = MaterialTheme.typography.labelSmall, style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.secondary color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)
) )
} }
} }

3
app/src/main/java/sh/sar/isodroid/ui/screens/DownloadsScreen.kt
View File

@@ -114,7 +114,8 @@ fun DownloadsScreen(
}, },
colors = TopAppBarDefaults.topAppBarColors( colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.primaryContainer, containerColor = MaterialTheme.colorScheme.primaryContainer,
titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer
) )
) )
} }

3
app/src/main/java/sh/sar/isodroid/ui/screens/MainScreen.kt
View File

@@ -117,7 +117,8 @@ fun MainScreen(
title = { Text("ISO Droid") }, title = { Text("ISO Droid") },
colors = TopAppBarDefaults.topAppBarColors( colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.primaryContainer, containerColor = MaterialTheme.colorScheme.primaryContainer,
titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
actionIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer
), ),
actions = { actions = {
IconButton( IconButton(

3
app/src/main/java/sh/sar/isodroid/ui/screens/SettingsScreen.kt
View File

@@ -158,7 +158,8 @@ fun SettingsScreen(
}, },
colors = TopAppBarDefaults.topAppBarColors( colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.primaryContainer, containerColor = MaterialTheme.colorScheme.primaryContainer,
titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer
) )
) )
} }