v1.37_beta

- Better loading status
Hamza417 · Mar 16, 2024 · a0d80db · a0d80db
1 parent 58f027b
commit a0d80db
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/app/src/main/java/app/simple/peri/utils/FileUtils.kt b/app/src/main/java/app/simple/peri/utils/FileUtils.kt
@@ -5,6 +5,7 @@ import androidx.documentfile.provider.DocumentFile
 import app.simple.peri.utils.StringUtils.endsWithAny
 import java.text.CharacterIterator
 import java.text.StringCharacterIterator
+import java.util.Stack
 
 object FileUtils {
 
@@ -39,17 +40,24 @@ object FileUtils {
         return String.format("%.1f %cB", bytes / 1000.0, ci.current())
     }
 
-    fun DocumentFile.listCompleteFiles(): List<DocumentFile> {
+    fun DocumentFile.listCompleteFiles(func: (String) -> Unit): List<DocumentFile> {
         val allFiles = mutableListOf<DocumentFile>()
+        val stack = Stack<DocumentFile>()
+        stack.push(this)
 
-        listFiles().forEach { child ->
-            when {
-                child.isDirectory -> {
-                    allFiles.addAll(child.listCompleteFiles()) // Recursive call for subdirectory
-                }
+        while (stack.isNotEmpty()) {
+            val currentFile = stack.pop()
+
+            currentFile.listFiles().forEach { child ->
+                when {
+                    child.isDirectory -> {
+                        func(child.name!!)
+                        stack.push(child)
+                    }
 
-                child.isFile -> {
-                    allFiles.add(child)
+                    child.isFile -> {
+                        allFiles.add(child)
+                    }
                 }
             }
         }

diff --git a/app/src/main/java/app/simple/peri/viewmodels/WallpaperViewModel.kt b/app/src/main/java/app/simple/peri/viewmodels/WallpaperViewModel.kt
@@ -135,11 +135,14 @@ class WallpaperViewModel(application: Application) : AndroidViewModel(applicatio
 
             val uri = MainPreferences.getStorageUri()?.toUri()!!
             val pickedDirectory = DocumentFile.fromTreeUri(getApplication(), uri)
-            loadingStatus.postValue("0 : 0%")
-            val files = pickedDirectory?.listCompleteFiles()
+            loadingStatus.postValue(getApplication<Application>().getString(app.simple.peri.R.string.preparing))
+            val files = pickedDirectory?.listCompleteFiles() {
+                loadingStatus.postValue(it)
+            }
             var count = 0
             val total = files?.size ?: 0
 
+            loadingStatus.postValue("0 : 0%")
             files?.parallelStream()?.forEach { file ->
                 try {
                     val wallpaper = Wallpaper()