diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt index 0a50bcda9f..6e25968692 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt @@ -159,7 +159,7 @@ interface Manga : SManga { currentTags.none { tag -> isComicTag(tag) } ) ) { - ReadingModeType.WEBTOON.flagValue + ReadingModeType.LONG_STRIP.flagValue } else if (currentTags.any { tag -> tag == "chinese" || tag == "manhua" || diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 6e9914186a..ad5a8c75a2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -1200,7 +1200,7 @@ class ReaderActivity : BaseActivity() { val newViewer = when (mangaViewer) { ReadingModeType.LEFT_TO_RIGHT.flagValue -> L2RPagerViewer(this) ReadingModeType.VERTICAL.flagValue -> VerticalPagerViewer(this) - ReadingModeType.WEBTOON.flagValue -> WebtoonViewer(this) + ReadingModeType.LONG_STRIP.flagValue -> WebtoonViewer(this) ReadingModeType.CONTINUOUS_VERTICAL.flagValue -> WebtoonViewer(this, hasMargins = true) else -> R2LPagerViewer(this) } @@ -1215,7 +1215,7 @@ class ReaderActivity : BaseActivity() { when (mangaViewer) { ReadingModeType.RIGHT_TO_LEFT.flagValue -> R.string.right_to_left_viewer ReadingModeType.VERTICAL.flagValue -> R.string.vertical_viewer - ReadingModeType.WEBTOON.flagValue -> R.string.long_strip + ReadingModeType.LONG_STRIP.flagValue -> R.string.long_strip else -> R.string.left_to_right_viewer }, ).lowercase(Locale.getDefault()), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt index feb5ba64c3..6eb6d82870 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt @@ -18,7 +18,7 @@ class ReaderGeneralView @JvmOverloads constructor(context: Context, attrs: Attri (context as ReaderActivity).viewModel.setMangaReadingMode(readingModeType.flagValue) val mangaViewer = activity.viewModel.getMangaReadingMode() - if (mangaViewer == ReadingModeType.WEBTOON.flagValue || mangaViewer == ReadingModeType.CONTINUOUS_VERTICAL.flagValue) { + if (mangaViewer == ReadingModeType.LONG_STRIP.flagValue || mangaViewer == ReadingModeType.CONTINUOUS_VERTICAL.flagValue) { initWebtoonPreferences() } else { initPagerPreferences() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReadingModeType.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReadingModeType.kt index 9fb53e9206..420adff5c2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReadingModeType.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReadingModeType.kt @@ -10,7 +10,7 @@ enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @D LEFT_TO_RIGHT(1, R.string.left_to_right_viewer, R.drawable.ic_reader_ltr_24dp), RIGHT_TO_LEFT(2, R.string.right_to_left_viewer, R.drawable.ic_reader_rtl_24dp), VERTICAL(3, R.string.vertical_viewer, R.drawable.ic_reader_vertical_24dp), - WEBTOON(4, R.string.long_strip, R.drawable.ic_reader_webtoon_24dp), + LONG_STRIP(4, R.string.long_strip, R.drawable.ic_reader_webtoon_24dp), CONTINUOUS_VERTICAL(5, R.string.continuous_vertical, R.drawable.ic_reader_continuous_vertical_24dp), ; @@ -34,7 +34,7 @@ enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @D fun isWebtoonType(preference: Int): Boolean { val mode = fromPreference(preference) - return mode == WEBTOON || mode == CONTINUOUS_VERTICAL + return mode == LONG_STRIP || mode == CONTINUOUS_VERTICAL } fun fromSpinner(position: Int?) = entries.find { value -> value.prefValue == position } ?: DEFAULT diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt index 9ac7933c4c..06bd203774 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt @@ -62,7 +62,7 @@ class TabbedReaderSettingsSheet( override fun getTabTitles(): List = listOf( R.string.general, - if (showWebtoonView) R.string.webcomic else R.string.paged, + if (showWebtoonView) R.string.long_strip else R.string.paged, R.string.filter, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt index b18bfc2ab2..89dfa16b21 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt @@ -291,7 +291,7 @@ class SettingsReaderController : SettingsController() { } } preferenceCategory { - titleRes = R.string.webcomic + titleRes = R.string.long_strip intListPreference(activity) { key = Keys.navigationModeWebtoon diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index f2f7f95df3..342a4d0fcf 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -6,7 +6,7 @@ @string/left_to_right_viewer @string/right_to_left_viewer @string/vertical_viewer - @string/webcomic + @string/long_strip @string/continuous_vertical