null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: More debranding

Browse source
This commit is contained in:
ziro 2024-01-10 19:11:08 +07:00
parent cec3bc8557
commit b5192304c8
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
View file

@ -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" ||

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -1200,7 +1200,7 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
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<ReaderActivityBinding>() {
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()),

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt
View file

@ -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()

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReadingModeType.kt
View file

@ -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

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt
View file

@ -62,7 +62,7 @@ class TabbedReaderSettingsSheet(
override fun getTabTitles(): List<Int> = 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,
)

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
View file

@ -291,7 +291,7 @@ class SettingsReaderController : SettingsController() {
}
}
preferenceCategory {
titleRes = R.string.webcomic
titleRes = R.string.long_strip
intListPreference(activity) {
key = Keys.navigationModeWebtoon

2
app/src/main/res/values/arrays.xml
View file

@ -6,7 +6,7 @@
<item>@string/left_to_right_viewer</item>
<item>@string/right_to_left_viewer</item>
<item>@string/vertical_viewer</item>
<item>@string/webcomic</item>
<item>@string/long_strip</item>
<item>@string/continuous_vertical</item>
</string-array>