Minor cleanup

This commit is contained in:
Jobobby04 2022-02-19 16:48:41 -05:00
parent 07e28ca5c2
commit 2bb9e596ba
5 changed files with 11 additions and 11 deletions

View File

@ -166,7 +166,13 @@ class LibraryCategoryAdapter(view: LibraryCategoryView, val controller: LibraryC
} }
} }
private suspend fun filterManga(queries: List<QueryComponent>, manga: LibraryManga, checkGenre: Boolean = true, searchTags: List<SearchTag>? = null, searchTitles: List<SearchTitle>? = null): Boolean { private fun filterManga(
queries: List<QueryComponent>,
manga: LibraryManga,
checkGenre: Boolean = true,
searchTags: List<SearchTag>? = null,
searchTitles: List<SearchTitle>? = null
): Boolean {
val mappedQueries = queries.groupBy { it.excluded } val mappedQueries = queries.groupBy { it.excluded }
val tracks = if (hasLoggedServices) db.getTracks(manga).executeAsBlocking().toList() else null val tracks = if (hasLoggedServices) db.getTracks(manga).executeAsBlocking().toList() else null
val source = sourceManager.get(manga.source) val source = sourceManager.get(manga.source)

View File

@ -1,10 +1,8 @@
package eu.kanade.tachiyomi.ui.library package eu.kanade.tachiyomi.ui.library
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import coil.clear import coil.clear
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.databinding.SourceComfortableGridItemBinding import eu.kanade.tachiyomi.databinding.SourceComfortableGridItemBinding
import eu.kanade.tachiyomi.util.view.loadAnyAutoPause import eu.kanade.tachiyomi.util.view.loadAnyAutoPause
@ -23,7 +21,7 @@ import reactivecircus.flowbinding.android.view.clicks
*/ */
class LibraryComfortableGridHolder( class LibraryComfortableGridHolder(
override val binding: SourceComfortableGridItemBinding, override val binding: SourceComfortableGridItemBinding,
adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>> adapter: FlexibleAdapter<*>
) : LibraryHolder<SourceComfortableGridItemBinding>(binding.root, adapter) { ) : LibraryHolder<SourceComfortableGridItemBinding>(binding.root, adapter) {
// SY --> // SY -->

View File

@ -2,11 +2,9 @@ package eu.kanade.tachiyomi.ui.library
import android.view.View import android.view.View
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import coil.clear import coil.clear
import coil.loadAny import coil.loadAny
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.databinding.SourceListItemBinding import eu.kanade.tachiyomi.databinding.SourceListItemBinding
/** /**
@ -20,9 +18,7 @@ import eu.kanade.tachiyomi.databinding.SourceListItemBinding
*/ */
class LibraryListHolder( class LibraryListHolder(
private val view: View, private val view: View,
// SY --> adapter: FlexibleAdapter<*>
adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>
// SY <--
) : LibraryHolder<SourceListItemBinding>(view, adapter) { ) : LibraryHolder<SourceListItemBinding>(view, adapter) {
override val binding = SourceListItemBinding.bind(view) override val binding = SourceListItemBinding.bind(view)

View File

@ -110,7 +110,7 @@ class ChaptersSettingsSheet(
override fun onItemClicked(item: Item) { override fun onItemClicked(item: Item) {
if (item is Item.DrawableSelection) { if (item is Item.DrawableSelection) {
val scanlators = presenter.allChapterScanlators.toTypedArray() val scanlators = presenter.allChapterScanlators.toTypedArray()
val filteredScanlators = presenter.manga.filtered_scanlators?.let { MdUtil.getScanlators(it) } ?: scanlators.toSet() val filteredScanlators = presenter.manga.filtered_scanlators?.let(MdUtil::getScanlators) ?: scanlators.toSet()
val selection = scanlators.map { val selection = scanlators.map {
it in filteredScanlators it in filteredScanlators
}.toBooleanArray() }.toBooleanArray()

View File

@ -314,7 +314,7 @@ class MangaInfoHeaderAdapter(
.filterNot { it in listOf("all", "other") } .filterNot { it in listOf("all", "other") }
// SY --> // SY -->
val isMergedSource = source?.id == MERGED_SOURCE_ID val isMergedSource = source.id == MERGED_SOURCE_ID
// SY <-- // SY <--
val hasOneActiveLanguages = enabledLanguages.size == 1 val hasOneActiveLanguages = enabledLanguages.size == 1
val isInEnabledLanguages = source.lang in enabledLanguages val isInEnabledLanguages = source.lang in enabledLanguages