github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Using library header category instead of finding the category in presenter

Browse source 
even though the header category also finds it in the presenter
This commit is contained in:
Jay 2020-05-15 02:14:09 -04:00
parent eed9e0c765
commit c9e3882077
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View file

@ -516,7 +516,7 @@ class LibraryController(
(recycler.layoutManager as LinearLayoutManager).findFirstCompletelyVisibleItemPosition()
var order = when (val item = adapter.getItem(position)) {
is LibraryHeaderItem -> item.category.order
is LibraryItem -> presenter.categories.find { it.id == item.manga.category }?.order
is LibraryItem -> item.header.category.order
else -> null
}
if (order == null) {
@ -524,7 +524,7 @@ class LibraryController(
(recycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
order = when (val item = adapter.getItem(fPosition)) {
is LibraryHeaderItem -> item.category.order
is LibraryItem -> presenter.categories.find { it.id == item.manga.category }?.order
is LibraryItem -> item.header.category.order
else -> null
}
}

13
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View file

@ -145,7 +145,7 @@ class LibraryPresenter(
val showAll = showAllCategories || preferences.hideCategories().getOrDefault() ||
categories.size == 1
if (!showAll) {
sectionedLibraryItems = items.groupBy { it.manga.category }.toMutableMap()
sectionedLibraryItems = items.groupBy { it.header.category.id ?: 0 }.toMutableMap()
if (currentCategory == -1) currentCategory = categories.find {
it.order == preferences.lastUsedCategory().getOrDefault()
}?.id ?: 0
@ -408,9 +408,10 @@ class LibraryPresenter(
i2: LibraryItem,
lastReadManga: Map<Long, Int>
): Int {
return if (i1.manga.category == i2.manga.category) {
val category = allCategories.find { it.id == i1.manga.category } ?: return 0
if (category.mangaOrder.isNullOrEmpty() && category.mangaSort == null) {
return if (i1.header.category.id == i2.header.category.id) {
val category = i1.header.category
if (!category.isDynamic &&
category.mangaOrder.isNullOrEmpty() && category.mangaSort == null) {
category.changeSortTo(preferences.librarySortingMode().getOrDefault())
if (category.id == 0) preferences.defaultMangaOrder()
.set(category.mangaSort.toString())
@ -465,8 +466,8 @@ class LibraryPresenter(
sortAlphabetical(i1, i2)
} else compare
} else {
val category = allCategories.find { it.id == i1.manga.category }?.order ?: -1
val category2 = allCategories.find { it.id == i2.manga.category }?.order ?: -1
val category = i1.header.category.order
val category2 = i2.header.category.order
category.compareTo(category2)
}
}