admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle delegated source id lists better using a LisenterMutableMap

Browse Source 
Better source id comparisons
This commit is contained in:
Jobobby04
2021-01-26 00:40:57 -05:00
parent cf1ce9e069
commit 295af5306b
41 changed files with 272 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/util/LewdMangaChecker.kt
+3 -4
View File
@@ -2,9 +2,8 @@ package exh.util
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.source.SourceManager
import exh.EH_SOURCE_ID
import exh.EXH_SOURCE_ID
import exh.nHentaiSourceIds
import exh.source.isEhBasedManga
import exh.source.nHentaiSourceIds
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@@ -12,7 +11,7 @@ fun Manga.isLewd(): Boolean {
val sourceName = Injekt.get<SourceManager>().get(source)?.name
val currentTags = getGenres().orEmpty()
if (source == EH_SOURCE_ID || source == EXH_SOURCE_ID || source in nHentaiSourceIds) {
if (isEhBasedManga() || source in nHentaiSourceIds) {
return currentTags.none { tag -> isNonHentaiTag(tag) }
}
app/src/main/java/exh/util/SourceTagsUtil.kt
+6 -6
View File
@@ -2,13 +2,13 @@ package exh.util
import android.graphics.Color
import eu.kanade.tachiyomi.data.database.models.Manga
import exh.EH_SOURCE_ID
import exh.EXH_SOURCE_ID
import exh.PURURIN_SOURCE_ID
import exh.TSUMINO_SOURCE_ID
import exh.hitomiSourceIds
import exh.metadata.metadata.base.RaisedTag
import exh.nHentaiSourceIds
import exh.source.EH_SOURCE_ID
import exh.source.EXH_SOURCE_ID
import exh.source.PURURIN_SOURCE_ID
import exh.source.TSUMINO_SOURCE_ID
import exh.source.hitomiSourceIds
import exh.source.nHentaiSourceIds
import java.util.Locale
object SourceTagsUtil {
app/src/main/java/exh/util/ViewExtensions.kt
+2 -2
View File
@@ -3,9 +3,9 @@ package exh.util
import android.content.Context
import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipGroup
import exh.EH_SOURCE_ID
import exh.EXH_SOURCE_ID
import exh.metadata.metadata.EHentaiSearchMetadata
import exh.source.EH_SOURCE_ID
import exh.source.EXH_SOURCE_ID
/**
* Replaces chips in a ChipGroup.