Fix List layout crash with external storage

app/src/main/java/app/gamenative/data/LibraryItem.kt

@@ -1,7 +1,6 @@
 package app.gamenative.data
 
 import app.gamenative.Constants
-import app.gamenative.utils.CustomGameScanner
 
 enum class GameSource {
     STEAM,
@@ -55,13 +54,9 @@ data class LibraryItem(
                 ""
             }
             GameSource.CUSTOM_GAME -> {
-                // Attempt to resolve a local icon from the selected/unique exe folder
-                val localPath = CustomGameScanner.findIconFileForCustomGame(appId)
-                if (!localPath.isNullOrEmpty()) {
-                    if (localPath.startsWith("file://")) localPath else "file://$localPath"
-                } else {
-                    ""
-                }
+                // Return empty; icons are fetched asynchronously in UI components
+                // to avoid blocking the main thread with filesystem scans.
+                ""
             }
             GameSource.GOG -> {
                 // GoG Images are typically the full URL, but have fallback just in case.

app/src/main/java/app/gamenative/service/SteamService.kt

@@ -1410,7 +1410,7 @@ class SteamService : Service(), IChallengeUrlChanged {
         fun downloadApp(appId: Int, dlcAppIds: List<Int>, branch: String = "public", isUpdateOrVerify: Boolean): DownloadInfo? {
             if (!checkWifiOrNotify()) return null
             return getAppInfoOf(appId)?.let { appInfo ->
-                val container = ContainerManager(instance!!.applicationContext).getContainerById("STEAM_${appId}")
+                val container = ContainerManager.getInstance(instance!!.applicationContext).getContainerById("STEAM_${appId}")
                 val containerLanguage = if (container != null) {
                     container.language
                 } else {

app/src/main/java/app/gamenative/ui/screen/library/appscreen/CustomGameAppScreen.kt

@@ -281,7 +281,7 @@ class CustomGameAppScreen : BaseAppScreen() {
 
                 if (shouldExtract) {
                     // First, try using the container's selected executable if available
-                    val containerManager = com.winlator.container.ContainerManager(context)
+                    val containerManager = com.winlator.container.ContainerManager.getInstance(context)
                     val hasContainer = containerManager.hasContainer(libraryItem.appId)
                     Timber.tag("CustomGameAppScreen").d("Container exists: $hasContainer")
 

app/src/main/java/app/gamenative/ui/screen/library/appscreen/SteamAppScreen.kt

@@ -1015,7 +1015,7 @@ class SteamAppScreen : BaseAppScreen() {
             }
             try {
                 val info = withContext(Dispatchers.IO) {
-                    val container = ContainerManager(context).getContainerById("STEAM_$gameId")
+                    val container = ContainerManager.getInstance(context).getContainerById("STEAM_$gameId")
                     val language = container?.language ?: PrefManager.containerLanguage
                     val depots = SteamService.getDownloadableDepots(gameId, language)
                     Timber.i("There are ${depots.size} depots belonging to ${libraryItem.appId}")

app/src/main/java/app/gamenative/ui/screen/library/components/LibraryListCard.kt

@@ -115,9 +115,9 @@ internal fun ListViewCard(
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.spacedBy(12.dp),
         ) {
-            // Game icon
+            // Game icon - start with empty to avoid synchronous LibraryItem getter
             val iconUrl by produceState(
-                initialValue = appInfo.clientIconUrl,
+                initialValue = "",
                 key1 = appInfo.appId,
                 key2 = appInfo.clientIconUrl,
             ) {
@@ -220,13 +220,7 @@ private fun InstallStatusBadge(
     }
     val isDownloading = downloadInfo != null && downloadProgress < 1f
     var isInstalled by remember(appInfo.appId) {
-        mutableStateOf(
-            if (isSteam) {
-                SteamService.isAppInstalled(appInfo.gameId)
-            } else {
-                true // Custom Games always installed
-            },
-        )
+        mutableStateOf(appInfo.isInstalled)
     }
 
     LaunchedEffect(isRefreshing) {

app/src/main/java/app/gamenative/ui/screen/library/components/LibraryListPane.kt

@@ -7,6 +7,7 @@ import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,6 +19,7 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
@@ -301,19 +303,24 @@ internal fun LibraryListPane(
                                         Modifier
                                     }
 
-                                    if (item.index > 0 && currentLayout == PaneType.LIST) {
-                                        HorizontalDivider()
+                                    Column {
+                                        if (listIndex > 0 && currentLayout == PaneType.LIST) {
+                                            HorizontalDivider(
+                                                modifier = Modifier.padding(horizontal = horizontalPadding),
+                                                color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f)
+                                            )
+                                        }
+                                        AppItem(
+                                            modifier = appItemModifier,
+                                            appInfo = item,
+                                            onClick = { onNavigate(item.appId) },
+                                            paneType = currentLayout,
+                                            onFocus = { targetOfScroll = item.index },
+                                            imageRefreshCounter = state.imageRefreshCounter,
+                                            compatibilityStatus = state.compatibilityMap[item.name],
+                                            gameStats = state.statsFor(item),
+                                        )
                                     }
-                                    AppItem(
-                                        modifier = appItemModifier,
-                                        appInfo = item,
-                                        onClick = { onNavigate(item.appId) },
-                                        paneType = currentLayout,
-                                        onFocus = { targetOfScroll = item.index },
-                                        imageRefreshCounter = state.imageRefreshCounter,
-                                        compatibilityStatus = state.compatibilityMap[item.name],
-                                        gameStats = state.statsFor(item),
-                                    )
                                 }
                             }
                             if (state.appInfoList.size < state.totalAppsInFilter) {
@@ -354,12 +361,17 @@ internal fun LibraryListPane(
                         ),
                     ) {
                         items(totalSkeletonCount) { index ->
-                            if (index > 0 && currentLayout == PaneType.LIST) {
-                                HorizontalDivider()
+                            Column {
+                                if (index > 0 && currentLayout == PaneType.LIST) {
+                                    HorizontalDivider(
+                                        modifier = Modifier.padding(horizontal = horizontalPadding),
+                                        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f)
+                                    )
+                                }
+                                GameSkeletonLoader(
+                                    paneType = currentLayout,
+                                )
                             }
-                            GameSkeletonLoader(
-                                paneType = currentLayout,
-                            )
                         }
                     }
                 }

app/src/main/java/app/gamenative/utils/CustomGameScanner.kt

@@ -173,7 +173,7 @@ object CustomGameScanner {
 
         // 2) Try extracting from the selected container executable
         try {
-            val cm = ContainerManager(context)
+            val cm = ContainerManager.getInstance(context)
             if (cm.hasContainer(appId)) {
                 val container = cm.getContainerById(appId)
                 val relExe = container.executablePath
@@ -518,15 +518,19 @@ object CustomGameScanner {
         if (manualFolders.isNotEmpty()) {
             val existingAppIds = mutableSetOf<String>()
             for (manualPath in manualFolders) {
-                // Filter by query if provided
-                if (q.isNotEmpty()) {
-                    val folderName = File(manualPath).name
-                    if (!folderName.contains(q, ignoreCase = true)) continue
-                }
+                try {
+                    // Filter by query if provided
+                    if (q.isNotEmpty()) {
+                        val folderName = File(manualPath).name
+                        if (!folderName.contains(q, ignoreCase = true)) continue
+                    }
 
-                val manualItem = createLibraryItemFromFolder(manualPath)
-                if (manualItem != null && existingAppIds.add(manualItem.appId)) {
-                    items.add(manualItem.copy(index = indexCounter++))
+                    val manualItem = createLibraryItemFromFolder(manualPath)
+                    if (manualItem != null && existingAppIds.add(manualItem.appId)) {
+                        items.add(manualItem.copy(index = indexCounter++))
+                    }
+                } catch (e: Exception) {
+                    Timber.tag("CustomGameScanner").e(e, "Error scanning custom game folder: $manualPath")
                 }
             }
         }
@@ -565,8 +569,13 @@ object CustomGameScanner {
 
     fun createLibraryItemFromFolder(folderPath: String): LibraryItem? {
         val folder = File(folderPath)
-        if (!folder.exists() || !folder.isDirectory) {
-            Timber.tag("CustomGameScanner").w("Folder does not exist or is not a directory: $folderPath")
+        try {
+            if (!folder.exists() || !folder.isDirectory) {
+                Timber.tag("CustomGameScanner").w("Folder does not exist or is not a directory: $folderPath")
+                return null
+            }
+        } catch (e: Exception) {
+            Timber.tag("CustomGameScanner").e(e, "Error accessing folder: $folderPath")
             return null
         }
 

app/src/main/java/com/winlator/container/ContainerManager.java

@@ -32,6 +32,14 @@ public class ContainerManager {
     private final ArrayList<Container> containers = new ArrayList<>();
     private final File homeDir;
     private final Context context;
+    private static ContainerManager instance;
+
+    public static ContainerManager getInstance(Context context) {
+        if (instance == null) {
+            instance = new ContainerManager(context.getApplicationContext());
+        }
+        return instance;
+    }
 
     public ContainerManager(Context context) {
         this.context = context;