danvics/ytdlnis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small fixes

Browse source
This commit is contained in:
deniscerri 2024-12-05 23:01:21 +01:00
parent dc5b66c575
commit 3c3ef92cbd
No known key found for this signature in database
GPG key ID: 95C43D517D830350
5 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/deniscerri/ytdl/ui/downloads/CancelledDownloadsFragment.kt
View file

@ -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<Long>{

3
app/src/main/java/com/deniscerri/ytdl/ui/downloads/ErroredDownloadsFragment.kt
View file

@ -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<Long>{

4
app/src/main/java/com/deniscerri/ytdl/ui/downloads/SavedDownloadsFragment.kt
View file

@ -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<Long>{

3
app/src/main/java/com/deniscerri/ytdl/ui/downloads/ScheduledDownloadsFragment.kt
View file

@ -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<Long>{

10
app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt
View file

@ -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 {