show OS icon in status banner

This commit is contained in:
2026-03-10 14:15:28 +05:00
parent 67392cbdae
commit 3a4acd9a16
2 changed files with 99 additions and 18 deletions

View File

@@ -20,9 +20,9 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
import androidx.compose.material.icons.filled.Album import androidx.compose.material.icons.filled.Album
import androidx.compose.material.icons.filled.Folder import androidx.compose.material.icons.filled.Folder
import androidx.compose.material.icons.filled.InsertDriveFile
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@@ -200,8 +200,8 @@ private fun FileItem(
Icon( Icon(
imageVector = when { imageVector = when {
isIso -> Icons.Default.Album isIso -> Icons.Default.Album
isImg -> Icons.Default.InsertDriveFile isImg -> Icons.AutoMirrored.Filled.InsertDriveFile
else -> Icons.Default.InsertDriveFile else -> Icons.AutoMirrored.Filled.InsertDriveFile
}, },
contentDescription = null, contentDescription = null,
tint = MaterialTheme.colorScheme.onPrimary, tint = MaterialTheme.colorScheme.onPrimary,
@@ -219,8 +219,8 @@ private fun FileItem(
imageVector = when { imageVector = when {
isDirectory -> Icons.Default.Folder isDirectory -> Icons.Default.Folder
isIso -> Icons.Default.Album isIso -> Icons.Default.Album
isImg -> Icons.Default.InsertDriveFile isImg -> Icons.AutoMirrored.Filled.InsertDriveFile
else -> Icons.Default.InsertDriveFile else -> Icons.AutoMirrored.Filled.InsertDriveFile
}, },
contentDescription = null, contentDescription = null,
tint = when { tint = when {

View File

@@ -1,15 +1,20 @@
package sh.sar.isodroid.ui.components package sh.sar.isodroid.ui.components
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
import androidx.compose.material.icons.filled.Album import androidx.compose.material.icons.filled.Album
import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.Error import androidx.compose.material.icons.filled.Error
@@ -22,13 +27,44 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
import coil.decode.SvgDecoder
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.ErrorRed
import sh.sar.isodroid.ui.theme.MountedGreen import sh.sar.isodroid.ui.theme.MountedGreen
import sh.sar.isodroid.ui.theme.UnmountedGray import sh.sar.isodroid.ui.theme.UnmountedGray
import java.io.File
/**
* Finds a matching OS icon filename for a given file by dynamically checking available icons.
*/
private fun findOsIcon(context: android.content.Context, filename: String): String? {
return try {
val availableIcons = context.assets.list("osicons")
?.filter { it.endsWith(".svg", ignoreCase = true) }
?.map { it.removeSuffix(".svg").lowercase() }
?: emptyList()
val lowerFilename = filename.lowercase()
availableIcons
.filter { lowerFilename.contains(it) }
.maxWithOrNull(compareBy(
{ it.length },
{ -lowerFilename.indexOf(it) }
))
?.let { "$it.svg" }
} catch (e: Exception) {
null
}
}
@Composable @Composable
fun StatusCard( fun StatusCard(
@@ -37,6 +73,8 @@ fun StatusCard(
deviceSupported: Boolean?, deviceSupported: Boolean?,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
val context = LocalContext.current
// Only show errors when explicitly false (not null = checking) // Only show errors when explicitly false (not null = checking)
val showRootError = rootAvailable == false val showRootError = rootAvailable == false
val showSupportError = deviceSupported == false val showSupportError = deviceSupported == false
@@ -47,6 +85,12 @@ fun StatusCard(
return return
} }
// Extract filename and find OS icon if mounted
val fileName = mountStatus.path?.let { File(it).name }
val osIcon = fileName?.let { findOsIcon(context, it) }
val isIso = fileName?.lowercase()?.endsWith(".iso") == true
val isImg = fileName?.lowercase()?.endsWith(".img") == true
Card( Card(
modifier = modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
colors = CardDefaults.cardColors( colors = CardDefaults.cardColors(
@@ -111,24 +155,61 @@ fun StatusCard(
} }
if (mountStatus.mounted) { if (mountStatus.mounted) {
Icon( Box(modifier = Modifier.size(40.dp)) {
imageVector = if (mountStatus.type == MountType.CDROM) if (osIcon != null) {
Icons.Default.Album // Show OS icon with file type badge
else AsyncImage(
Icons.Default.Usb, model = ImageRequest.Builder(context)
contentDescription = null, .data("file:///android_asset/osicons/$osIcon")
tint = MaterialTheme.colorScheme.primary, .decoderFactory(SvgDecoder.Factory())
modifier = Modifier.size(24.dp) .build(),
) contentDescription = fileName,
modifier = Modifier.size(40.dp),
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary)
)
// Small file type badge in bottom-right corner
Icon(
imageVector = when {
isIso -> Icons.Default.Album
isImg -> Icons.AutoMirrored.Filled.InsertDriveFile
else -> Icons.AutoMirrored.Filled.InsertDriveFile
},
contentDescription = null,
tint = MaterialTheme.colorScheme.onPrimary,
modifier = Modifier
.size(16.dp)
.align(Alignment.BottomEnd)
.offset(x = 2.dp, y = 2.dp)
.clip(CircleShape)
.background(MaterialTheme.colorScheme.primary)
.padding(2.dp)
)
} else {
// Fallback to file type icon
Icon(
imageVector = if (isIso)
Icons.Default.Album
else if (isImg)
Icons.AutoMirrored.Filled.InsertDriveFile
else
Icons.Default.Usb,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(40.dp)
)
}
}
} }
} }
if (mountStatus.mounted && mountStatus.path != null) { if (mountStatus.mounted && fileName != null) {
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))
Text( Text(
text = mountStatus.path, text = fileName,
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant fontWeight = FontWeight.Medium,
color = MaterialTheme.colorScheme.onSurface
) )
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
Row { Row {