From c9506143b4e6543b553a84cd9eff27ecf61989cc Mon Sep 17 00:00:00 2001 From: Binondi Date: Sun, 15 Dec 2024 16:25:00 +0530 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activities/AudioGalleryActivity.kt | 48 +++++++++++-------- .../devs/org/calculator/utils/FileManager.kt | 10 +--- app/src/main/res/drawable/ic_audio.xml | 2 +- app/src/main/res/drawable/ic_document.xml | 2 +- app/src/main/res/drawable/ic_file.xml | 2 +- app/src/main/res/drawable/ic_image.xml | 2 +- app/src/main/res/drawable/music.xml | 6 +-- app/src/main/res/drawable/next.xml | 6 +-- app/src/main/res/drawable/pause.xml | 8 ++-- app/src/main/res/drawable/play.xml | 7 ++- app/src/main/res/drawable/previous.xml | 6 +-- .../res/mipmap-anydpi-v26/ic_launcher.xml | 1 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 1 + 13 files changed, 54 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/devs/org/calculator/activities/AudioGalleryActivity.kt b/app/src/main/java/devs/org/calculator/activities/AudioGalleryActivity.kt index 7a52bd0..10c24da 100644 --- 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() + pickAudioLauncher = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode == RESULT_OK) { + val clipData = result.data?.clipData + val uriList = mutableListOf() - 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) { - 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() { diff --git a/app/src/main/java/devs/org/calculator/utils/FileManager.kt b/app/src/main/java/devs/org/calculator/utils/FileManager.kt index 19892ae..b47ddc6 100644 --- 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, fileType: FileType, diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml index 47bd994..605c2df 100644 --- 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"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_document.xml b/app/src/main/res/drawable/ic_document.xml index 91c794b..b910720 100644 --- 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"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml index 811d503..53c0205 100644 --- 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"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_image.xml b/app/src/main/res/drawable/ic_image.xml index bd827d4..55c6b6d 100644 --- 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"> \ No newline at end of file diff --git a/app/src/main/res/drawable/music.xml b/app/src/main/res/drawable/music.xml index 272e244..c2032f3 100644 --- a/app/src/main/res/drawable/music.xml +++ b/app/src/main/res/drawable/music.xml @@ -1,9 +1,9 @@ + android:fillColor="@color/textColor"/> diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml index 70b36b2..9083cd8 100644 --- a/app/src/main/res/drawable/next.xml +++ b/app/src/main/res/drawable/next.xml @@ -1,10 +1,10 @@ diff --git a/app/src/main/res/drawable/pause.xml b/app/src/main/res/drawable/pause.xml index 88c6599..e208617 100644 --- a/app/src/main/res/drawable/pause.xml +++ b/app/src/main/res/drawable/pause.xml @@ -1,12 +1,12 @@ + android:fillColor="@color/textColor"/> + android:fillColor="@color/textColor"/> diff --git a/app/src/main/res/drawable/play.xml b/app/src/main/res/drawable/play.xml index 0dd3e53..629314a 100644 --- a/app/src/main/res/drawable/play.xml +++ b/app/src/main/res/drawable/play.xml @@ -1,5 +1,8 @@ - + - + diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml index d74a42d..170179b 100644 --- a/app/src/main/res/drawable/previous.xml +++ b/app/src/main/res/drawable/previous.xml @@ -1,10 +1,10 @@ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 4ae7d12..1a4bfc9 100644 --- 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 @@ + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 4ae7d12..1a4bfc9 100644 --- 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 @@ + \ No newline at end of file