Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compile

Browse Source
This commit is contained in:
Jobobby04 2023-07-15 18:47:57 -04:00
parent 4d346ee8d9
commit e7f48aa73f
2 changed files with 7 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/LibraryScreenModel.kt
View File

@ -839,7 +839,7 @@ class LibraryScreenModel(
} }
} }
suspend fun filterLibrary(unfiltered: List<LibraryItem>, query: String?, loggedInTrackServices: Map<Long, TriStateFilter>): List<LibraryItem> { suspend fun filterLibrary(unfiltered: List<LibraryItem>, query: String?, loggedInTrackServices: Map<Long, TriState>): List<LibraryItem> {
return if (unfiltered.isNotEmpty() && !query.isNullOrBlank()) { return if (unfiltered.isNotEmpty() && !query.isNullOrBlank()) {
// Prepare filter object // Prepare filter object
val parsedQuery = searchEngine.parseQuery(query) val parsedQuery = searchEngine.parseQuery(query)
@ -903,7 +903,7 @@ class LibraryScreenModel(
checkGenre: Boolean = true, checkGenre: Boolean = true,
searchTags: List<SearchTag>? = null, searchTags: List<SearchTag>? = null,
searchTitles: List<SearchTitle>? = null, searchTitles: List<SearchTitle>? = null,
loggedInTrackServices: Map<Long, TriStateFilter>, loggedInTrackServices: Map<Long, TriState>,
): Boolean { ): Boolean {
val manga = libraryManga.manga val manga = libraryManga.manga
val sourceIdString = manga.source.takeUnless { it == LocalSource.ID }?.toString() val sourceIdString = manga.source.takeUnless { it == LocalSource.ID }?.toString()

11
app/src/main/java/exh/EXHMigrations.kt
View File

@ -34,7 +34,6 @@ import exh.util.under
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject
@ -42,6 +41,7 @@ import kotlinx.serialization.json.contentOrNull
import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
import tachiyomi.core.preference.PreferenceStore import tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.preference.TriState
import tachiyomi.core.preference.getEnum import tachiyomi.core.preference.getEnum
import tachiyomi.core.util.system.logcat import tachiyomi.core.util.system.logcat
import tachiyomi.data.DatabaseHandler import tachiyomi.data.DatabaseHandler
@ -59,7 +59,6 @@ import tachiyomi.domain.manga.interactor.InsertMergedReference
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MangaUpdate import tachiyomi.domain.manga.model.MangaUpdate
import tachiyomi.domain.manga.model.MergedMangaReference import tachiyomi.domain.manga.model.MergedMangaReference
import tachiyomi.domain.manga.model.TriStateFilter
import tachiyomi.domain.source.interactor.InsertFeedSavedSearch import tachiyomi.domain.source.interactor.InsertFeedSavedSearch
import tachiyomi.domain.source.interactor.InsertSavedSearch import tachiyomi.domain.source.interactor.InsertSavedSearch
import tachiyomi.domain.source.model.FeedSavedSearch import tachiyomi.domain.source.model.FeedSavedSearch
@ -530,12 +529,12 @@ object EXHMigrations {
remove(key) remove(key)
val newValue = when (pref.get()) { val newValue = when (pref.get()) {
1 -> TriStateFilter.ENABLED_IS 1 -> TriState.ENABLED_IS
2 -> TriStateFilter.ENABLED_NOT 2 -> TriState.ENABLED_NOT
else -> TriStateFilter.DISABLED else -> TriState.DISABLED
} }
preferenceStore.getEnum("${key}_v2", TriStateFilter.DISABLED).set(newValue) preferenceStore.getEnum("${key}_v2", TriState.DISABLED).set(newValue)
} }
} }
} }