null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 02:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show empty category when searching with show all categories disabled

Browse source
This commit is contained in:
Jays2Kings 2022-06-29 14:06:01 -04:00
parent 6897d45340
commit f521050228
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
View file

@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.util.lang.removeArticles
import eu.kanade.tachiyomi.util.system.isLTR
import eu.kanade.tachiyomi.util.system.timeSpanFromNow
import eu.kanade.tachiyomi.util.system.withDefContext
import kotlinx.coroutines.runBlocking
import uy.kohesive.injekt.injectLazy
import java.util.Locale
@ -130,17 +131,7 @@ class LibraryCategoryAdapter(val controller: LibraryController?) :
}
private fun performFilter() {
val s = getFilter(String::class.java)
if (s.isNullOrBlank()) {
if (mangas.firstOrNull()?.filter?.isNotBlank() == true) {
mangas.forEach { it.filter = "" }
}
updateDataSet(mangas)
} else {
updateDataSet(mangas.filter { it.filter(s) })
}
isLongPressDragEnabled = libraryListener?.canDrag() == true && s.isNullOrBlank()
setItemsPerCategoryMap()
runBlocking { performFilterAsync() }
}
suspend fun performFilterAsync() {
@ -152,7 +143,13 @@ class LibraryCategoryAdapter(val controller: LibraryController?) :
updateDataSet(mangas)
} else {
val filteredManga = withDefContext { mangas.filter { it.filter(s) } }
updateDataSet(filteredManga)
if (filteredManga.isEmpty() && controller?.presenter?.showAllCategories == false) {
val catId = mangas.firstOrNull()?.manga?.category
val blankItem = catId?.let { controller.presenter.blankItem(it) }
updateDataSet(blankItem ?: emptyList())
} else {
updateDataSet(filteredManga)
}
}
isLongPressDragEnabled = libraryListener?.canDrag() == true && s.isNullOrBlank()
setItemsPerCategoryMap()

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

@ -188,7 +188,7 @@ class LibraryPresenter(
)
}
private fun blankItem(id: Int = currentCategory): List<LibraryItem> {
fun blankItem(id: Int = currentCategory): List<LibraryItem> {
return listOf(
LibraryItem(
LibraryManga.createBlank(id),