improve media files retrieval

Raival-e · Raival-e · commit 5ffef99ac281 · 2025-08-21T22:15:35.000+04:00
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/holder/VirtualFileHolder.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/holder/VirtualFileHolder.kt
@@ -5,7 +5,6 @@ import com.raival.compose.file.explorer.R
 import com.raival.compose.file.explorer.common.emptyString
 import com.raival.compose.file.explorer.screen.main.tab.files.misc.ContentCount
 import com.raival.compose.file.explorer.screen.main.tab.files.misc.FileListCategory
-import com.raival.compose.file.explorer.screen.main.tab.files.misc.sortNewerFirst
 import com.raival.compose.file.explorer.screen.main.tab.files.provider.StorageProvider.getArchiveFiles
 import com.raival.compose.file.explorer.screen.main.tab.files.provider.StorageProvider.getAudioFiles
 import com.raival.compose.file.explorer.screen.main.tab.files.provider.StorageProvider.getBookmarks
@@ -59,7 +58,6 @@ class VirtualFileHolder(val type: Int) : ContentHolder() {
 
         if (type == RECENT && sortingPrefs == globalClass.preferencesManager.getDefaultSortingPrefs()) {
             return listContent().apply {
-                sortWith(sortNewerFirst)
                 if (!globalClass.preferencesManager.showHiddenFiles) {
                     removeIf { it.isHidden() }
                 }
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/provider/StorageProvider.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/provider/StorageProvider.kt
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/ui/FilesList.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/ui/FilesList.kt
@@ -577,6 +577,7 @@ private fun FileDetails(
     fontSize: Int,
     isHighlighted: Boolean
 ) {
+    val scope = rememberCoroutineScope()
     Isolate {
         var details by remember(
             key1 = currentItemPath,
@@ -587,9 +588,11 @@ private fun FileDetails(
             key1 = currentItemPath,
             key2 = item.lastModified
         ) {
-            if (details.isEmpty()) {
-                val det = item.getDetails()
-                withContext(Dispatchers.Main) { details = det }
+            scope.launch(Dispatchers.IO) {
+                if (details.isEmpty()) {
+                    val det = item.getDetails()
+                    details = det
+                }
             }
         }
 
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/ui/dialog/BookmarksDialog.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/ui/dialog/BookmarksDialog.kt
@@ -45,6 +45,7 @@ import com.raival.compose.file.explorer.common.ui.Space
 import com.raival.compose.file.explorer.screen.main.tab.files.FilesTab
 import com.raival.compose.file.explorer.screen.main.tab.files.holder.LocalFileHolder
 import com.raival.compose.file.explorer.screen.main.tab.files.ui.FileItemRow
+import kotlinx.coroutines.launch
 import java.io.File
 
 @OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class)
@@ -61,13 +62,16 @@ fun BookmarksDialog(
         }
 
         LaunchedEffect(Unit) {
-            val originalList = globalClass.preferencesManager.bookmarks
-            bookmarks.addAll(
-                originalList.map { LocalFileHolder(File(it)) }.filter { it.isValid() }
-            )
+            tab.scope.launch {
+                val originalList = globalClass.preferencesManager.bookmarks
+                bookmarks.addAll(
+                    originalList.map { LocalFileHolder(File(it)) }.filter { it.isValid() }
+                )
 
-            if (bookmarks.size isNot originalList.size) {
-                globalClass.preferencesManager.bookmarks = bookmarks.map { it.uniquePath }.toSet()
+                if (bookmarks.size isNot originalList.size) {
+                    globalClass.preferencesManager.bookmarks =
+                        bookmarks.map { it.uniquePath }.toSet()
+                }
             }
         }
 
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/home/ui/HomeLayoutSettingsScreen.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/home/ui/HomeLayoutSettingsScreen.kt
@@ -42,6 +42,7 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -62,6 +63,8 @@ import com.raival.compose.file.explorer.screen.main.tab.home.data.HomeLayout
 import com.raival.compose.file.explorer.screen.main.tab.home.data.HomeSectionConfig
 import com.raival.compose.file.explorer.screen.main.tab.home.data.HomeSectionType
 import com.raival.compose.file.explorer.screen.main.tab.home.data.getDefaultHomeLayout
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import sh.calvin.reorderable.ReorderableCollectionItemScope
 import sh.calvin.reorderable.ReorderableItem
 import sh.calvin.reorderable.rememberReorderableLazyListState
@@ -91,6 +94,7 @@ fun HomeLayoutSettingsScreen(
             usePlatformDefaultWidth = false
         )
     ) {
+        val scope = rememberCoroutineScope()
         val color = MaterialTheme.colorScheme.surfaceContainerHigh
         val systemUiController = rememberSystemUiController()
         DisposableEffect(systemUiController, useDarkIcons) {
@@ -99,17 +103,19 @@ fun HomeLayoutSettingsScreen(
         }
 
         LaunchedEffect(Unit) {
-            val config = try {
-                Gson().fromJson(
-                    globalClass.preferencesManager.homeTabLayout,
-                    HomeLayout::class.java
-                )
-            } catch (e: Exception) {
-                logger.logError(e)
-                getDefaultHomeLayout()
-            }.getSections().sortedBy { it.order }
+            scope.launch(Dispatchers.IO) {
+                val config = try {
+                    Gson().fromJson(
+                        globalClass.preferencesManager.homeTabLayout,
+                        HomeLayout::class.java
+                    )
+                } catch (e: Exception) {
+                    logger.logError(e)
+                    getDefaultHomeLayout()
+                }.getSections().sortedBy { it.order }
 
-            sections.addAll(config)
+                sections.addAll(config)
+            }
         }
 
         Scaffold(
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/home/ui/HomeTabContentView.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/home/ui/HomeTabContentView.kt
@@ -79,6 +79,8 @@ import com.raival.compose.file.explorer.screen.main.tab.home.data.HomeSectionTyp
 import com.raival.compose.file.explorer.screen.main.tab.home.data.getDefaultHomeLayout
 import com.raival.compose.file.explorer.screen.main.ui.SimpleNewTabViewItem
 import com.raival.compose.file.explorer.screen.main.ui.StorageDeviceView
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -89,19 +91,27 @@ fun ColumnScope.HomeTabContentView(tab: HomeTab) {
     val enabledSections = remember { mutableStateListOf<HomeSectionConfig>() }
 
     LaunchedEffect(tab.id) {
-        tab.fetchRecentFiles()
-        tab.getPinnedFiles()
-        val config = try {
-            Gson().fromJson(
-                globalClass.preferencesManager.homeTabLayout,
-                HomeLayout::class.java
-            )
-        } catch (e: Exception) {
-            logger.logError(e)
-            getDefaultHomeLayout()
-        }.getSections().filter { it.isEnabled }.sortedBy { it.order }
+        scope.launch(Dispatchers.IO) {
+            async {
+                tab.fetchRecentFiles()
+            }
+            async {
+                tab.getPinnedFiles()
+            }
+            async {
+                val config = try {
+                    Gson().fromJson(
+                        globalClass.preferencesManager.homeTabLayout,
+                        HomeLayout::class.java
+                    )
+                } catch (e: Exception) {
+                    logger.logError(e)
+                    getDefaultHomeLayout()
+                }.getSections().filter { it.isEnabled }.sortedBy { it.order }
 
-        enabledSections.addAll(config)
+                enabledSections.addAll(config)
+            }
+        }
     }
 
     if (tab.showCustomizeHomeTabDialog) {
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/preferences/PreferencesManager.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/preferences/PreferencesManager.kt
@@ -131,7 +131,7 @@ class PreferencesManager {
 
     var removeHiddenPathsFromRecentFiles by prefMutableState(
         keyName = "removeHiddenPathsFromRecentFiles",
-        defaultValue = true,
+        defaultValue = false,
         getPreferencesKey = { booleanPreferencesKey(it) }
     )
 
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/preferences/ui/RecentFilesContainer.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/preferences/ui/RecentFilesContainer.kt
@@ -243,7 +243,7 @@ fun RecentFilesContainer() {
             supportingText = stringResource(R.string.scan_hidden_files_and_folders),
             icon = Icons.AutoMirrored.Rounded.ManageSearch,
             switchState = !prefs.removeHiddenPathsFromRecentFiles,
-            onSwitchChange = { prefs.useBuiltInViewer = !it }
+            onSwitchChange = { prefs.removeHiddenPathsFromRecentFiles = !it }
         )
 
         HorizontalDivider(
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/viewer/pdf/ui/PdfViewerContent.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/viewer/pdf/ui/PdfViewerContent.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -29,6 +30,8 @@ import com.raival.compose.file.explorer.R
 import com.raival.compose.file.explorer.common.isNot
 import com.raival.compose.file.explorer.screen.viewer.pdf.PdfViewerInstance
 import com.raival.compose.file.explorer.screen.viewer.pdf.misc.PdfPageHolder
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.launch
 import my.nanihadesuka.compose.InternalLazyColumnScrollbar
 import my.nanihadesuka.compose.ScrollbarLayoutSide
 import my.nanihadesuka.compose.ScrollbarSettings
@@ -58,6 +61,7 @@ fun PdfViewerContent(instance: PdfViewerInstance, onBackPress: () -> Unit) {
                 listState.firstVisibleItemIndex == 0
             }
         }
+        val scope = rememberCoroutineScope()
 
         val visiblePageNumbers by remember {
             derivedStateOf {
@@ -79,17 +83,19 @@ fun PdfViewerContent(instance: PdfViewerInstance, onBackPress: () -> Unit) {
         }
 
         LaunchedEffect(Unit) {
-            instance.prepare { success ->
-                if (success) {
-                    defaultPageSize = Size(
-                        constraints.maxWidth,
-                        instance.defaultPageSize.height * constraints.maxWidth / instance.defaultPageSize.width
-                    )
-                    pdfPages.addAll(instance.pages)
-                    isLoading = false
-                } else {
-                    errorMessage = globalClass.getString(R.string.failed_to_load_pdf)
-                    isLoading = false
+            scope.launch(IO) {
+                instance.prepare { success ->
+                    if (success) {
+                        defaultPageSize = Size(
+                            constraints.maxWidth,
+                            instance.defaultPageSize.height * constraints.maxWidth / instance.defaultPageSize.width
+                        )
+                        pdfPages.addAll(instance.pages)
+                        isLoading = false
+                    } else {
+                        errorMessage = globalClass.getString(R.string.failed_to_load_pdf)
+                        isLoading = false
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class PreferencesManager {`
`131`	`131`
`132`	`132`	`var removeHiddenPathsFromRecentFiles by prefMutableState(`
`133`	`133`	`keyName = "removeHiddenPathsFromRecentFiles",`
`134`		`- defaultValue = true,`
	`134`	`+ defaultValue = false,`
`135`	`135`	`getPreferencesKey = { booleanPreferencesKey(it) }`
`136`	`136`	`)`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ fun RecentFilesContainer() {`
`243`	`243`	`supportingText = stringResource(R.string.scan_hidden_files_and_folders),`
`244`	`244`	`icon = Icons.AutoMirrored.Rounded.ManageSearch,`
`245`	`245`	`switchState = !prefs.removeHiddenPathsFromRecentFiles,`
`246`		`- onSwitchChange = { prefs.useBuiltInViewer = !it }`
	`246`	`+ onSwitchChange = { prefs.removeHiddenPathsFromRecentFiles = !it }`
`247`	`247`	`)`
`248`	`248`
`249`	`249`	`HorizontalDivider(`