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

Rework library selection (#8290)

Browse Source
This commit is contained in:
AntsyLich 2022-10-26 19:22:12 +06:00 committed by GitHub
parent 3b5b9a1ae5
commit 2cbe946e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.util.fastAny import androidx.compose.ui.util.fastAny
import androidx.compose.ui.util.fastMap
import com.jakewharton.rxrelay.BehaviorRelay import com.jakewharton.rxrelay.BehaviorRelay
import eu.kanade.core.prefs.CheckboxState import eu.kanade.core.prefs.CheckboxState
import eu.kanade.core.prefs.PreferenceMutableState import eu.kanade.core.prefs.PreferenceMutableState
@ -610,14 +611,14 @@ class LibraryPresenter(
fun toggleRangeSelection(manga: LibraryManga) { fun toggleRangeSelection(manga: LibraryManga) {
state.selection = selection.toMutableList().apply { state.selection = selection.toMutableList().apply {
val lastSelected = lastOrNull() val lastSelected = lastOrNull()
if (lastSelected == null || lastSelected.category != manga.category) { if (lastSelected?.category != manga.category) {
add(manga) add(manga)
return@apply return@apply
} }
val items = (loadedManga[manga.category] ?: emptyList()).map { it.libraryManga } val items = loadedManga[manga.category].orEmpty().fastMap { it.libraryManga }
val lastMangaIndex = items.indexOf(lastSelected) val lastMangaIndex = items.indexOf(lastSelected)
val curMangaIndex = items.indexOf(manga) val curMangaIndex = items.indexOf(manga)
val selectedIds = map { it.id } val selectedIds = fastMap { it.id }
val newSelections = when (lastMangaIndex >= curMangaIndex + 1) { val newSelections = when (lastMangaIndex >= curMangaIndex + 1) {
true -> items.subList(curMangaIndex, lastMangaIndex) true -> items.subList(curMangaIndex, lastMangaIndex)
false -> items.subList(lastMangaIndex, curMangaIndex + 1) false -> items.subList(lastMangaIndex, curMangaIndex + 1)
@ -627,17 +628,25 @@ class LibraryPresenter(
} }
fun selectAll(index: Int) { fun selectAll(index: Int) {
val category = categories[index]
val items = loadedManga[category.id] ?: emptyList()
state.selection = state.selection.toMutableList().apply { state.selection = state.selection.toMutableList().apply {
addAll(items.filterNot { it.libraryManga in selection }.map { it.libraryManga }) val categoryId = categories[index].id
val items = loadedManga[categoryId].orEmpty().fastMap { it.libraryManga }
val selectedIds = fastMap { it.id }
val newSelections = items.filterNot { it.id in selectedIds }
addAll(newSelections)
} }
} }
fun invertSelection(index: Int) { fun invertSelection(index: Int) {
val category = categories[index] state.selection = selection.toMutableList().apply {
val items = (loadedManga[category.id] ?: emptyList()).map { it.libraryManga } val categoryId = categories[index].id
state.selection = items.filterNot { it in selection } val items = loadedManga[categoryId].orEmpty().fastMap { it.libraryManga }
val selectedIds = fastMap { it.id }
val (toRemove, toAdd) = items.partition { it.id in selectedIds }
val toRemoveIds = toRemove.fastMap { it.id }
removeAll { it.id in toRemoveIds }
addAll(toAdd)
}
} }
private fun <T, U, R> Observable<T>.combineLatest(o2: Observable<U>, combineFn: (T, U) -> R): Observable<R> { private fun <T, U, R> Observable<T>.combineLatest(o2: Observable<U>, combineFn: (T, U) -> R): Observable<R> {