✨

2024-12-15 16:25:00 +05:30
parent f44c231493
commit c9506143b4
13 changed files with 54 additions and 47 deletions
--- a/app/src/main/java/devs/org/calculator/activities/AudioGalleryActivity.kt
+++ b/app/src/main/java/devs/org/calculator/activities/AudioGalleryActivity.kt
@@ -20,37 +20,47 @@ class AudioGalleryActivity : BaseGalleryActivity(), FileProcessCallback {
        super.onCreate(savedInstanceState)
        setupFabButton()

-        pickAudioLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            if (result.resultCode == RESULT_OK) {
-                val clipData = result.data?.clipData
-                val uriList = mutableListOf<Uri>()
+        pickAudioLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                if (result.resultCode == RESULT_OK) {
+                    val clipData = result.data?.clipData
+                    val uriList = mutableListOf<Uri>()

-                if (clipData != null) {
-                    for (i in 0 until clipData.itemCount) {
-                        val uri = clipData.getItemAt(i).uri
-                        uriList.add(uri)
+                    if (clipData != null) {
+                        for (i in 0 until clipData.itemCount) {
+                            val uri = clipData.getItemAt(i).uri
+                            uriList.add(uri)
+                        }
+                    } else {
+                        result.data?.data?.let { uriList.add(it) } // Single file selected
                    }
-                } else {
-                    result.data?.data?.let { uriList.add(it) } // Single file selected
-                }

-                if (uriList.isNotEmpty()) {
-                    lifecycleScope.launch {
-                        FileManager(this@AudioGalleryActivity, this@AudioGalleryActivity).processMultipleFiles(uriList, fileType,this@AudioGalleryActivity )
+                    if (uriList.isNotEmpty()) {
+                        lifecycleScope.launch {
+                            FileManager(
+                                this@AudioGalleryActivity,
+                                this@AudioGalleryActivity
+                            ).processMultipleFiles(uriList, fileType, this@AudioGalleryActivity)
+                        }
+                    } else {
+                        Toast.makeText(this, "No files selected", Toast.LENGTH_SHORT).show()
                    }
-                } else {
-                    Toast.makeText(this, "No files selected", Toast.LENGTH_SHORT).show()
                }
            }
-        }
    }
+
    override fun onFilesProcessedSuccessfully(copiedFiles: List<File>) {
-        Toast.makeText(this@AudioGalleryActivity, "${copiedFiles.size} Audios hidden successfully", Toast.LENGTH_SHORT).show()
+        Toast.makeText(
+            this@AudioGalleryActivity,
+            "${copiedFiles.size} Audios hidden successfully",
+            Toast.LENGTH_SHORT
+        ).show()
        loadFiles()
    }

    override fun onFileProcessFailed() {
-        Toast.makeText(this@AudioGalleryActivity, "Failed to hide Audios", Toast.LENGTH_SHORT).show()
+        Toast.makeText(this@AudioGalleryActivity, "Failed to hide Audios", Toast.LENGTH_SHORT)
+            .show()
    }

    private fun setupFabButton() {
--- a/app/src/main/java/devs/org/calculator/utils/FileManager.kt
+++ b/app/src/main/java/devs/org/calculator/utils/FileManager.kt
@@ -141,10 +141,7 @@ class FileManager(private val context: Context, private val lifecycleOwner: Life
            null
        }
    }
-
-
-
-
+    
    suspend fun deletePhotoFromExternalStorage(photoUri: Uri) {
        withContext(Dispatchers.IO) {
            try {
@@ -275,11 +272,6 @@ class FileManager(private val context: Context, private val lifecycleOwner: Life
        }
    }

-
-
-
-
-
    suspend fun processMultipleFiles(
        uriList: List<Uri>,
        fileType: FileType,
--- a/app/src/main/res/drawable/ic_audio.xml
+++ b/app/src/main/res/drawable/ic_audio.xml
@@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textColor"
        android:pathData="M12,3v9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12 6,14.01 6,16.5S8.01,21 10.5,21c2.31,0 4.2,-1.75 4.45,-4H15V6h4V3h-7z"/>
 </vector> 
--- a/app/src/main/res/drawable/ic_document.xml
+++ b/app/src/main/res/drawable/ic_document.xml
@@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textColor"
        android:pathData="M14,2H6C4.9,2 4,2.9 4,4v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V8L14,2zM16,18H8v-2h8V18zM16,14H8v-2h8V14zM13,9V3.5L18.5,9H13z"/>
 </vector> 
--- a/app/src/main/res/drawable/ic_file.xml
+++ b/app/src/main/res/drawable/ic_file.xml
@@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textColor"
        android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8l-6,-6H6zM13,9V3.5L18.5,9H13z"/>
 </vector> 
--- a/app/src/main/res/drawable/ic_image.xml
+++ b/app/src/main/res/drawable/ic_image.xml
@@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textColor"
        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
 </vector> 
--- a/app/src/main/res/drawable/music.xml
+++ b/app/src/main/res/drawable/music.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="800dp"
-    android:height="800dp"
+    android:width="24dp"
+    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M13.75,2C13.75,1.586 13.414,1.25 13,1.25C12.586,1.25 12.25,1.586 12.25,2V14.536C11.4,13.738 10.257,13.25 9,13.25C6.377,13.25 4.25,15.377 4.25,18C4.25,20.623 6.377,22.75 9,22.75C11.623,22.75 13.75,20.623 13.75,18V6.243C14.988,7.772 16.879,8.75 19,8.75C19.414,8.75 19.75,8.414 19.75,8C19.75,7.586 19.414,7.25 19,7.25C16.101,7.25 13.75,4.899 13.75,2Z"
-      android:fillColor="#6e6e6e"/>
+      android:fillColor="@color/textColor"/>
 </vector>
--- a/app/src/main/res/drawable/next.xml
+++ b/app/src/main/res/drawable/next.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="800dp"
-    android:height="800dp"
+    android:width="24dp"
+    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M5,7.766c0,-1.554 1.696,-2.515 3.029,-1.715l7.056,4.234c1.295,0.777 1.295,2.653 0,3.43l-7.056,4.234c-1.333,0.8 -3.029,-0.16 -3.029,-1.715V7.766zM14.056,12L7,7.766v8.468L14.056,12zM18,6a1,1 0,0 0,-1 1v10a1,1 0,1 0,2 0V7a1,1 0,0 0,-1 -1z"
-      android:fillColor="#0D0D0D"
+      android:fillColor="@color/textColor"
      android:fillType="evenOdd"/>
 </vector>
--- a/app/src/main/res/drawable/pause.xml
+++ b/app/src/main/res/drawable/pause.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="800dp"
-    android:height="800dp"
+    android:width="24dp"
+    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M2,6C2,4.114 2,3.172 2.586,2.586C3.172,2 4.114,2 6,2C7.886,2 8.828,2 9.414,2.586C10,3.172 10,4.114 10,6V18C10,19.886 10,20.828 9.414,21.414C8.828,22 7.886,22 6,22C4.114,22 3.172,22 2.586,21.414C2,20.828 2,19.886 2,18V6Z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/textColor"/>
  <path
      android:pathData="M14,6C14,4.114 14,3.172 14.586,2.586C15.172,2 16.114,2 18,2C19.886,2 20.828,2 21.414,2.586C22,3.172 22,4.114 22,6V18C22,19.886 22,20.828 21.414,21.414C20.828,22 19.886,22 18,22C16.114,22 15.172,22 14.586,21.414C14,20.828 14,19.886 14,18V6Z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/textColor"/>
 </vector>
--- a/app/src/main/res/drawable/play.xml
+++ b/app/src/main/res/drawable/play.xml
@@ -1,5 +1,8 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
      
-    <path android:fillColor="#000000" android:pathData="M21.409,9.353C23.531,10.507 23.531,13.493 21.409,14.647L8.597,21.615C6.534,22.736 4,21.276 4,18.967L4,5.033C4,2.724 6.534,1.264 8.597,2.385L21.409,9.353Z"/>
+    <path android:fillColor="@color/textColor"
+        android:pathData="M21.409,9.353C23.531,10.507 23.531,13.493 21.409,14.647L8.597,21.615C6.534,22.736 4,21.276 4,18.967L4,5.033C4,2.724 6.534,1.264 8.597,2.385L21.409,9.353Z"/>
    
 </vector>
--- a/app/src/main/res/drawable/previous.xml
+++ b/app/src/main/res/drawable/previous.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="800dp"
-    android:height="800dp"
+    android:width="24dp"
+    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M19,7.766c0,-1.554 -1.696,-2.515 -3.029,-1.715l-7.056,4.234c-1.295,0.777 -1.295,2.653 0,3.43l7.056,4.234c1.333,0.8 3.029,-0.16 3.029,-1.715V7.766zM9.944,12L17,7.766v8.468L9.944,12zM6,6a1,1 0,0 1,1 1v10a1,1 0,1 1,-2 0V7a1,1 0,0 1,1 -1z"
-      android:fillColor="#0D0D0D"
+      android:fillColor="@color/textColor"
      android:fillType="evenOdd"/>
 </vector>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@mipmap/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@mipmap/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>