Merge remote-tracking branch 'origin/master'

app/src/main/java/com/base/scanqrclear/luma/ActivityJumpHelps.kt

@@ -73,7 +73,7 @@ object ActivityJumpHelps {
     fun requestPermission(
         context: Context,
         launcher: ActivityLauncher,
-        block: (() -> Unit?)? = null
+        block: (() -> Unit)? = null
     ) {
         if (PermissionHelps.checkFilesAccessPermission(context)) {
             block?.invoke()

app/src/main/java/com/base/scanqrclear/luma/HomeFragment.kt

@@ -124,47 +124,49 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
     }
 
     private fun initData() {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val totalStorage = async { AppHelps.getTotalExternalSize() }
-            val availableStorage = async { AppHelps.getAvailableExternalSize() }
-            val totalStorageSize = totalStorage.await()
-            val availableStorageSize = availableStorage.await()
-            val usedMemoryStorageSize = totalStorageSize - availableStorageSize
-            val usedMemoryStorageScale = usedMemoryStorageSize * 100 / totalStorageSize
+        ActivityJumpHelps.requestPermission(requireContext(), launcher) {
+            lifecycleScope.launch(Dispatchers.IO) {
+                val totalStorage = async { AppHelps.getTotalExternalSize() }
+                val availableStorage = async { AppHelps.getAvailableExternalSize() }
+                val totalStorageSize = totalStorage.await()
+                val availableStorageSize = availableStorage.await()
+                val usedMemoryStorageSize = totalStorageSize - availableStorageSize
+                val usedMemoryStorageScale = usedMemoryStorageSize * 100 / totalStorageSize
 
-            val totalMemoryUsed = async { AppHelps.getMemTotal(requireContext()) }
-            val availableMemoryUsed = async { AppHelps.getMemAvailable(requireContext()) }
-            val totalMemoryUsedSize = totalMemoryUsed.await()
-            val availableMemoryUsedSize = availableMemoryUsed.await()
-            val usedMemoryUsedSize = totalMemoryUsedSize - availableMemoryUsedSize
-            val usedMemoryUsedScale: Long = usedMemoryUsedSize * 100 / totalMemoryUsedSize
-            withContext(Dispatchers.Main) {
-                binding.tvStorageUsed.text = "${usedMemoryStorageScale.toInt()}%"
-                binding.tvMemoryUsed.text = "${usedMemoryUsedScale.toInt()}%"
-                binding.llStorageUsed.visibility = View.VISIBLE
-                binding.llMemoryUsed.visibility = View.VISIBLE
-                AnimationHelps.progress(binding.pbStorageUsed, usedMemoryStorageScale.toInt())
-                AnimationHelps.progress(binding.pbMemoryUsed, usedMemoryUsedScale.toInt())
+                val totalMemoryUsed = async { AppHelps.getMemTotal(requireContext()) }
+                val availableMemoryUsed = async { AppHelps.getMemAvailable(requireContext()) }
+                val totalMemoryUsedSize = totalMemoryUsed.await()
+                val availableMemoryUsedSize = availableMemoryUsed.await()
+                val usedMemoryUsedSize = totalMemoryUsedSize - availableMemoryUsedSize
+                val usedMemoryUsedScale: Long = usedMemoryUsedSize * 100 / totalMemoryUsedSize
+                withContext(Dispatchers.Main) {
+                    binding.tvStorageUsed.text = "${usedMemoryStorageScale.toInt()}%"
+                    binding.tvMemoryUsed.text = "${usedMemoryUsedScale.toInt()}%"
+                    binding.llStorageUsed.visibility = View.VISIBLE
+                    binding.llMemoryUsed.visibility = View.VISIBLE
+                    AnimationHelps.progress(binding.pbStorageUsed, usedMemoryStorageScale.toInt())
+                    AnimationHelps.progress(binding.pbMemoryUsed, usedMemoryUsedScale.toInt())
+                }
             }
-        }
-        lifecycleScope.launch(Dispatchers.IO) {
-            val emptyFoldersDeferred = async { FileHelps.findEmptyFolders(lifecycleScope) }
-            val filesDeferred = async { MediaHelps.findSpecifiedFiles(requireContext()) }
-            val emptyFolder = emptyFoldersDeferred.await()
-            val files = filesDeferred.await()
-            val emptyLength = emptyFolder.sumOf { it.length }
-            val filesLength = files.sumOf { it.length }
-            val totalLength = emptyLength + filesLength
-            val totalSize = Utils.getSize(totalLength)
-            withContext(Dispatchers.Main) {
-                val sp = SpannableString("$totalSize\n${getString(R.string.junk_files)}")
-                sp.setSpan(
-                    AbsoluteSizeSpan(16, true),
-                    sp.indexOf("\n"),
-                    sp.length,
-                    SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-                binding.tvJunkFiles.text = sp
+            lifecycleScope.launch(Dispatchers.IO) {
+                val emptyFoldersDeferred = async { FileHelps.findEmptyFolders(lifecycleScope) }
+                val filesDeferred = async { MediaHelps.findSpecifiedFiles(requireContext()) }
+                val emptyFolder = emptyFoldersDeferred.await()
+                val files = filesDeferred.await()
+                val emptyLength = emptyFolder.sumOf { it.length }
+                val filesLength = files.sumOf { it.length }
+                val totalLength = emptyLength + filesLength
+                val totalSize = Utils.getSize(totalLength)
+                withContext(Dispatchers.Main) {
+                    val sp = SpannableString("$totalSize\n${getString(R.string.junk_files)}")
+                    sp.setSpan(
+                        AbsoluteSizeSpan(16, true),
+                        sp.indexOf("\n"),
+                        sp.length,
+                        SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
+                    )
+                    binding.tvJunkFiles.text = sp
+                }
             }
         }
     }

app/src/main/res/layout/item_function_2.xml

@@ -10,7 +10,7 @@
         android:id="@+id/iv_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="10dp"
         android:src="@mipmap/icon_junk_scan"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"