From 3c3ef92cbd36345a98a3857848b72f0b0c9c95b1 Mon Sep 17 00:00:00 2001 From: deniscerri <64997243+deniscerri@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:01:21 +0100 Subject: [PATCH] small fixes --- .../ytdl/ui/downloads/CancelledDownloadsFragment.kt | 3 +++ .../ytdl/ui/downloads/ErroredDownloadsFragment.kt | 3 +++ .../ytdl/ui/downloads/SavedDownloadsFragment.kt | 4 ++++ .../ytdl/ui/downloads/ScheduledDownloadsFragment.kt | 3 +++ app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt | 10 ++++++++++ 5 files changed, 23 insertions(+) diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt index cf2ce7e2..7c98dfed 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt @@ -151,6 +151,7 @@ class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClic override fun onActionButtonClick(itemID: Long) { lifecycleScope.launch { runCatching { + actionMode?.finish() val item = withContext(Dispatchers.IO){ downloadViewModel.getItemByID(itemID) } @@ -247,6 +248,7 @@ class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClic override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean { mode!!.menuInflater.inflate(R.menu.cancelled_downloads_menu_context, menu) mode.title = "${adapter.getSelectedObjectsCount(totalSize)} ${getString(R.string.selected)}" + headerMenuBtn.isEnabled = false return true } @@ -342,6 +344,7 @@ class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClic override fun onDestroyActionMode(mode: ActionMode?) { actionMode = null adapter.clearCheckedItems() + headerMenuBtn.isEnabled = true } suspend fun getSelectedIDs() : List{ diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt index 22e806e0..c65ec249 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt @@ -148,6 +148,7 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL override fun onActionButtonClick(itemID: Long) { lifecycleScope.launch { + actionMode?.finish() val item = withContext(Dispatchers.IO){ downloadViewModel.getItemByID(itemID) } @@ -237,6 +238,7 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean { mode!!.menuInflater.inflate(R.menu.cancelled_downloads_menu_context, menu) mode.title = "${adapter.getSelectedObjectsCount(totalSize)} ${getString(R.string.selected)}" + headerMenuBtn.isEnabled = false return true } @@ -334,6 +336,7 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL override fun onDestroyActionMode(mode: ActionMode?) { actionMode = null adapter.clearCheckedItems() + headerMenuBtn.isEnabled = true } suspend fun getSelectedIDs() : List{ diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt index 117b4d47..c5ea851f 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt @@ -157,6 +157,8 @@ class SavedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLis override fun onActionButtonClick(itemID: Long) { lifecycleScope.launch { + actionMode?.finish() + val item = withContext(Dispatchers.IO){ downloadViewModel.getItemByID(itemID) } @@ -240,6 +242,7 @@ class SavedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLis override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean { mode!!.menuInflater.inflate(R.menu.saved_downloads_menu_context, menu) mode.title = "${adapter.getSelectedObjectsCount(totalSize)} ${getString(R.string.selected)}" + headerMenuBtn.isEnabled = false return true } @@ -339,6 +342,7 @@ class SavedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLis override fun onDestroyActionMode(mode: ActionMode?) { actionMode = null adapter.clearCheckedItems() + headerMenuBtn.isEnabled = true } suspend fun getSelectedIDs() : List{ diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt index 78644182..57793bc1 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt @@ -158,6 +158,7 @@ class ScheduledDownloadsFragment : Fragment(), ScheduledDownloadAdapter.OnItemCl override fun onActionButtonClick(itemID: Long) { lifecycleScope.launch { + actionMode?.finish() runCatching { withContext(Dispatchers.IO){ downloadViewModel.resetScheduleTimeForItemsAndStartDownload(listOf(itemID)) @@ -265,6 +266,7 @@ class ScheduledDownloadsFragment : Fragment(), ScheduledDownloadAdapter.OnItemCl override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean { mode!!.menuInflater.inflate(R.menu.scheduled_downloads_menu_context, menu) mode.title = "${adapter.getSelectedObjectsCount(totalSize)} ${getString(R.string.selected)}" + headerMenuBtn.isEnabled = false return true } @@ -351,6 +353,7 @@ class ScheduledDownloadsFragment : Fragment(), ScheduledDownloadAdapter.OnItemCl override fun onDestroyActionMode(mode: ActionMode?) { actionMode = null adapter.clearCheckedItems() + headerMenuBtn.isEnabled = true } suspend fun getSelectedIDs() : List{ diff --git a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt index 14b723bd..0a804547 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt @@ -632,6 +632,11 @@ object UiUtil { longClickDownloadButton(item) bottomSheet.cancel() } + download.setOnLongClickListener { + longClickDownloadButton(item) + bottomSheet.cancel() + true + } } DownloadRepository.Status.Scheduled -> { download!!.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_downloads, 0, 0, 0); @@ -642,6 +647,11 @@ object UiUtil { longClickDownloadButton(item) bottomSheet.cancel() } + download?.setOnLongClickListener { + longClickDownloadButton(item) + bottomSheet.cancel() + true + } } else -> { download?.setOnLongClickListener {