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

Cleanup some code

Browse Source
This commit is contained in:
Jobobby04 2020-08-05 22:46:04 -04:00
parent fbe4f6ad62
commit 61094edeed
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
View File

@ -32,6 +32,12 @@ interface Manga : SManga {
return genre?.split(", ")?.map { it.trim() } return genre?.split(", ")?.map { it.trim() }
} }
// SY -->
fun getOriginalGenres(): List<String>? {
return originalGenre?.split(", ")?.map { it.trim() }
}
// SY <--
private fun setFlags(flag: Int, mask: Int) { private fun setFlags(flag: Int, mask: Int) {
chapter_flags = chapter_flags and mask.inv() or (flag and mask) chapter_flags = chapter_flags and mask.inv() or (flag and mask)
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
View File

@ -100,7 +100,7 @@ class EditMangaDialog : DialogController {
view.manga_author.append(manga.author ?: "") view.manga_author.append(manga.author ?: "")
view.manga_artist.append(manga.artist ?: "") view.manga_artist.append(manga.artist ?: "")
view.manga_description.append(manga.description ?: "") view.manga_description.append(manga.description ?: "")
view.manga_genres_tags.setChips(manga.genre?.split(",")?.map { it.trim() } ?: emptyList()) view.manga_genres_tags.setChips(manga.getGenres())
} else { } else {
if (manga.title != manga.originalTitle) { if (manga.title != manga.originalTitle) {
view.title.append(manga.title) view.title.append(manga.title)
@ -114,7 +114,7 @@ class EditMangaDialog : DialogController {
if (manga.description != manga.originalDescription) { if (manga.description != manga.originalDescription) {
view.manga_description.append(manga.description ?: "") view.manga_description.append(manga.description ?: "")
} }
view.manga_genres_tags.setChips(manga.genre?.split(",")?.map { it.trim() } ?: emptyList()) view.manga_genres_tags.setChips(manga.getGenres())
view.title.hint = "${resources?.getString(R.string.title)}: ${manga.originalTitle}" view.title.hint = "${resources?.getString(R.string.title)}: ${manga.originalTitle}"
if (manga.originalAuthor != null) { if (manga.originalAuthor != null) {
@ -147,7 +147,7 @@ class EditMangaDialog : DialogController {
if (manga.genre.isNullOrBlank() || manga.source == LocalSource.ID) dialogView?.manga_genres_tags?.setChips( if (manga.genre.isNullOrBlank() || manga.source == LocalSource.ID) dialogView?.manga_genres_tags?.setChips(
emptyList() emptyList()
) )
else dialogView?.manga_genres_tags?.setChips(manga.originalGenre?.split(", ")) else dialogView?.manga_genres_tags?.setChips(manga.getOriginalGenres())
} }
fun updateCover(uri: Uri) { fun updateCover(uri: Uri) {

3
app/src/main/java/exh/util/LewdMangaChecker.kt
View File

@ -11,8 +11,7 @@ import uy.kohesive.injekt.api.get
fun Manga.isLewd(): Boolean { fun Manga.isLewd(): Boolean {
val sourceName = Injekt.get<SourceManager>().getOrStub(source).name val sourceName = Injekt.get<SourceManager>().getOrStub(source).name
val currentTags = val currentTags = getGenres() ?: emptyList()
genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList()
if (source == EH_SOURCE_ID || source == EXH_SOURCE_ID || source == NHENTAI_SOURCE_ID) { if (source == EH_SOURCE_ID || source == EXH_SOURCE_ID || source == NHENTAI_SOURCE_ID) {
return !currentTags.any { tag -> isNonHentaiTag(tag) } return !currentTags.any { tag -> isNonHentaiTag(tag) }