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

Merge branch 'master' of https://github.com/inorichi/tachiyomi

Browse Source 
# Conflicts:
#	README.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
This commit is contained in:
NerdNumber9
2018-04-15 13:39:29 -04:00
parent aafe863774 e7e1a9bf50
commit 234c3bb72a
6 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
View File

@@ -56,7 +56,7 @@ class LibraryCategoryAdapter(val view: LibraryCategoryView) :
* @param manga the manga to find.
*/
fun indexOf(manga: Manga): Int {
return mangas.indexOfFirst { it.manga.id == manga.id }
return currentItems.indexOfFirst { it.manga.id == manga.id }
}
fun performFilter() {

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

@@ -83,7 +83,7 @@ class LibraryController(
/**
* Currently selected mangas.
*/
val selectedMangas = mutableListOf<Manga>()
val selectedMangas = mutableSetOf<Manga>()
private var selectedCoverManga: Manga? = null
@@ -476,11 +476,13 @@ class LibraryController(
*/
fun setSelection(manga: Manga, selected: Boolean) {
if (selected) {
selectedMangas.add(manga)
selectionRelay.call(LibrarySelectionEvent.Selected(manga))
if (selectedMangas.add(manga)) {
selectionRelay.call(LibrarySelectionEvent.Selected(manga))
}
} else {
selectedMangas.remove(manga)
selectionRelay.call(LibrarySelectionEvent.Unselected(manga))
if (selectedMangas.remove(manga)) {
selectionRelay.call(LibrarySelectionEvent.Unselected(manga))
}
}
}