DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix library bugs (#7648)

Browse Source 
- Fix mixup in Action Menu
- Fix back action not clearing search
This commit is contained in:
Andreas 2022-07-30 04:42:18 +02:00 committed by GitHub
parent 7d74b174e0
commit db93d1da76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
View File

@ -53,8 +53,8 @@ fun LibraryScreen(
onChangeCategoryClicked = onChangeCategoryClicked, onChangeCategoryClicked = onChangeCategoryClicked,
onMarkAsReadClicked = onMarkAsReadClicked, onMarkAsReadClicked = onMarkAsReadClicked,
onMarkAsUnreadClicked = onMarkAsUnreadClicked, onMarkAsUnreadClicked = onMarkAsUnreadClicked,
onDownloadClicked = onDownloadClicked, onDownloadClicked = onDownloadClicked.takeIf { presenter.selection.none { it.source == LocalSource.ID } },
onDeleteClicked = onDeleteClicked.takeIf { presenter.selection.none { it.source == LocalSource.ID } }, onDeleteClicked = onDeleteClicked,
) )
}, },
) { paddingValues -> ) { paddingValues ->

12
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -78,11 +78,17 @@ class LibraryController(
} }
override fun handleBack(): Boolean { override fun handleBack(): Boolean {
if (presenter.selection.isNotEmpty()) { return when {
presenter.selection.isNotEmpty() -> {
presenter.clearSelection() presenter.clearSelection()
return true true
}
presenter.searchQuery != null -> {
presenter.searchQuery = null
true
}
else -> false
} }
return false
} }
override fun onViewCreated(view: View) { override fun onViewCreated(view: View) {