mirror of
https://github.com/aniyomiorg/aniyomi.git
synced 2024-11-24 05:38:01 +03:00
Fix library bugs (#7648)
- Fix mixup in Action Menu - Fix back action not clearing search
This commit is contained in:
parent
7d74b174e0
commit
db93d1da76
2 changed files with 12 additions and 6 deletions
|
@ -53,8 +53,8 @@ fun LibraryScreen(
|
|||
onChangeCategoryClicked = onChangeCategoryClicked,
|
||||
onMarkAsReadClicked = onMarkAsReadClicked,
|
||||
onMarkAsUnreadClicked = onMarkAsUnreadClicked,
|
||||
onDownloadClicked = onDownloadClicked,
|
||||
onDeleteClicked = onDeleteClicked.takeIf { presenter.selection.none { it.source == LocalSource.ID } },
|
||||
onDownloadClicked = onDownloadClicked.takeIf { presenter.selection.none { it.source == LocalSource.ID } },
|
||||
onDeleteClicked = onDeleteClicked,
|
||||
)
|
||||
},
|
||||
) { paddingValues ->
|
||||
|
|
|
@ -78,11 +78,17 @@ class LibraryController(
|
|||
}
|
||||
|
||||
override fun handleBack(): Boolean {
|
||||
if (presenter.selection.isNotEmpty()) {
|
||||
presenter.clearSelection()
|
||||
return true
|
||||
return when {
|
||||
presenter.selection.isNotEmpty() -> {
|
||||
presenter.clearSelection()
|
||||
true
|
||||
}
|
||||
presenter.searchQuery != null -> {
|
||||
presenter.searchQuery = null
|
||||
true
|
||||
}
|
||||
else -> false
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View) {
|
||||
|
|
Loading…
Reference in a new issue