mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-01 22:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix selection in library (#8233)

Browse Source
This commit is contained in:
AntsyLich
2022-10-18 19:32:34 +06:00
committed by GitHub
parent 9c4051a5ba
commit ea092fa175
6 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@@ -588,19 +588,14 @@ class LibraryPresenter(
state.selection = emptyList()
}
private fun removeSelected(mutableList: MutableList<LibraryManga>, manga: LibraryManga): Boolean {
if (selection.fastAny { it.manga.id == manga.manga.id }) {
return mutableList.remove(manga)
}
return false
}
fun toggleSelection(manga: LibraryManga) {
val mutableList = state.selection.toMutableList()
if (!removeSelected(mutableList, manga)) {
mutableList.add(manga)
state.selection = selection.toMutableList().apply {
if (fastAny { it.id == manga.id }) {
removeAll { it.id == manga.id }
} else {
add(manga)
}
}
state.selection = mutableList
}
/**
@@ -608,22 +603,22 @@ class LibraryPresenter(
* same category as the given manga
*/
fun toggleRangeSelection(manga: LibraryManga) {
val mutableList = state.selection.toMutableList()
if (!removeSelected(mutableList, manga) && mutableList.fastAny
{ it.category == manga.category }
) {
state.selection = selection.toMutableList().apply {
val lastSelected = lastOrNull()
if (lastSelected == null || lastSelected.category != manga.category) {
add(manga)
return@apply
}
val items = (loadedManga[manga.category] ?: emptyList()).map { it.libraryManga }
val lastMangaIndex = items.indexOf(mutableList.findLast { it.category == manga.category })
val lastMangaIndex = items.indexOf(lastSelected)
val curMangaIndex = items.indexOf(manga)
val newList = when (lastMangaIndex >= curMangaIndex + 1) {
val selectedIds = map { it.id }
val newSelections = when (lastMangaIndex >= curMangaIndex + 1) {
true -> items.subList(curMangaIndex, lastMangaIndex)
false -> items.subList(lastMangaIndex, curMangaIndex + 1)
}
mutableList.addAll(newList.filterNot { it in selection })
} else {
mutableList.add(manga)
}.filterNot { it.id in selectedIds }
addAll(newSelections)
}
state.selection = mutableList
}
fun selectAll(index: Int) {