Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-14 17:25:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Forcing webtoon mode on manhwa and long strip

Browse Source
This commit is contained in:
Jay 2020-04-17 23:23:57 -04:00
parent f0cb967f6a
commit 7ef5e59421
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,16 +103,14 @@ interface Manga : SManga {
val currentTags = genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } val currentTags = genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) }
return if (currentTags?.any return if (currentTags?.any
{ tag -> { tag ->
tag == "long strip" || tag == "manhwa" || tag == "long strip" || tag == "manhwa" || tag.contains("webtoon")
tag.contains("webtoon") } == true || isWebtoonSource(sourceName))
} == true || isWebtoonSource(sourceName) ||
sourceName.contains("tapastic", true))
ReaderActivity.WEBTOON ReaderActivity.WEBTOON
else if (currentTags?.any else if (currentTags?.any
{ tag -> { tag ->
tag == "chinese" || tag == "manhua" || tag == "chinese" || tag == "manhua" ||
tag.startsWith("english") || tag == "comic" tag.startsWith("english") || tag == "comic"
} == true || isComicSource(sourceName) || } == true || (isComicSource(sourceName) && !sourceName.contains("tapastic", true)) ||
sourceName.contains("manhua", true)) sourceName.contains("manhua", true))
ReaderActivity.LEFT_TO_RIGHT ReaderActivity.LEFT_TO_RIGHT
else 0 else 0
@ -126,7 +124,6 @@ interface Manga : SManga {
fun isComicSource(sourceName: String): Boolean { fun isComicSource(sourceName: String): Boolean {
return sourceName.contains("gunnerkrigg", true) || return sourceName.contains("gunnerkrigg", true) ||
sourceName.contains("gunnerkrigg", true) ||
sourceName.contains("dilbert", true) || sourceName.contains("dilbert", true) ||
sourceName.contains("cyanide", true) || sourceName.contains("cyanide", true) ||
sourceName.contains("xkcd", true) || sourceName.contains("xkcd", true) ||

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -420,7 +420,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>(),
).toLowerCase(Locale.getDefault()) ).toLowerCase(Locale.getDefault())
), 8000 ), 8000
) { ) {
setAction(R.string.use_default) { if (mangaViewer != WEBTOON) setAction(R.string.use_default) {
presenter.setMangaViewer(0) presenter.setMangaViewer(0)
} }
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View File

@ -419,8 +419,10 @@ class ReaderPresenter(
*/ */
fun getMangaViewer(): Int { fun getMangaViewer(): Int {
val manga = manga ?: return preferences.defaultViewer() val manga = manga ?: return preferences.defaultViewer()
if (manga.viewer == -1) { val readerType = manga.defaultReaderType()
manga.viewer = manga.defaultReaderType() if (manga.viewer == -1 ||
(readerType == ReaderActivity.WEBTOON && readerType != manga.viewer)) {
manga.viewer = readerType
db.updateMangaViewer(manga).asRxObservable().subscribe() db.updateMangaViewer(manga).asRxObservable().subscribe()
} }
return if (manga.viewer == 0) preferences.defaultViewer() else manga.viewer return if (manga.viewer == 0) preferences.defaultViewer() else manga.viewer