diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 2bbcf1361..bf8985409 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -359,7 +359,7 @@ object PreferenceKeys { const val extensionRepos = "extension_repos" - const val cropBordersContinuesVertical = "crop_borders_continues_vertical" + const val cropBordersContinuousVertical = "crop_borders_continues_vertical" const val landscapeVerticalSeekbar = "pref_show_vert_seekbar_landscape" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index 02d8d667d..e2840e195 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -473,7 +473,7 @@ class PreferencesHelper(val context: Context) { fun extensionRepos() = flowPrefs.getStringSet(Keys.extensionRepos, emptySet()) - fun cropBordersContinuesVertical() = flowPrefs.getBoolean(Keys.cropBordersContinuesVertical, false) + fun cropBordersContinuousVertical() = flowPrefs.getBoolean(Keys.cropBordersContinuousVertical, false) fun forceHorizontalSeekbar() = flowPrefs.getBoolean(Keys.forceHorizontalSeekbar, false) 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 a82dc5d3c..e5429d8c9 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 @@ -498,7 +498,7 @@ class ReaderActivity : BaseRxActivity() } else { // SY --> if (ReadingModeType.fromPreference(mangaViewer) == ReadingModeType.CONTINUOUS_VERTICAL) { - preferences.cropBordersContinuesVertical().toggle() + preferences.cropBordersContinuousVertical().toggle() } else { preferences.cropBordersWebtoon().toggle() } @@ -507,7 +507,7 @@ class ReaderActivity : BaseRxActivity() } } updateCropBordersShortcut() - listOf(preferences.cropBorders(), preferences.cropBordersWebtoon() /* SY --> */, preferences.cropBordersContinuesVertical()/* SY <-- */) + listOf(preferences.cropBorders(), preferences.cropBordersWebtoon() /* SY --> */, preferences.cropBordersContinuousVertical()/* SY <-- */) .forEach { pref -> pref.asFlow() .onEach { updateCropBordersShortcut() } @@ -728,7 +728,7 @@ class ReaderActivity : BaseRxActivity() } else { // SY --> if (ReadingModeType.fromPreference(mangaViewer) == ReadingModeType.CONTINUOUS_VERTICAL) { - preferences.cropBordersContinuesVertical().get() + preferences.cropBordersContinuousVertical().get() } else { preferences.cropBordersWebtoon().get() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt index f7ca4cc8d..e1367b63f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt @@ -107,7 +107,7 @@ class ReaderReadingModeSettings @JvmOverloads constructor(context: Context, attr // SY --> binding.webtoonPrefsGroup.zoomOutWebtoon.bindToPreference(preferences.webtoonEnableZoomOut()) - binding.webtoonPrefsGroup.cropBordersContinuesVertical.bindToPreference(preferences.cropBordersContinuesVertical()) + binding.webtoonPrefsGroup.cropBordersContinuousVertical.bindToPreference(preferences.cropBordersContinuousVertical()) binding.webtoonPrefsGroup.pageTransitionsWebtoon.bindToPreference(preferences.pageTransitionsWebtoon()) // SY <-- } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt index 3ef8387ea..4ed25f9c1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt @@ -34,7 +34,7 @@ class WebtoonConfig( var enableZoomOut = false private set - var continuesCropBorders = false + var continuousCropBorders = false private set var zoomPropertyChangedListener: ((Boolean) -> Unit)? = null @@ -67,8 +67,8 @@ class WebtoonConfig( preferences.webtoonEnableZoomOut() .register({ enableZoomOut = it }, { zoomPropertyChangedListener?.invoke(it) }) - preferences.cropBordersContinuesVertical() - .register({ continuesCropBorders = it }, { imagePropertyChangedListener?.invoke() }) + preferences.cropBordersContinuousVertical() + .register({ continuousCropBorders = it }, { imagePropertyChangedListener?.invoke() }) preferences.pageTransitionsWebtoon() .register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() }) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index 28eed1cac..2ecb7bb42 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -364,7 +364,7 @@ class WebtoonPageHolder( val config = viewer.config // SY --> - val imageCropBorders = if (!viewer.isContinuous) config.continuesCropBorders else config.imageCropBorders + val imageCropBorders = if (!viewer.isContinuous) config.continuousCropBorders else config.imageCropBorders // SY <-- if (subsamplingImageView != null && /* SY --> */ imageCropBorders /* SY <-- */ == cropBorders) { return subsamplingImageView!! 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 65af234c7..ffc99a348 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 @@ -333,7 +333,7 @@ class SettingsReaderController : SettingsController() { defaultValue = false } switchPreference { - key = Keys.cropBordersContinuesVertical + key = Keys.cropBordersContinuousVertical titleRes = R.string.pref_crop_borders defaultValue = false } diff --git a/app/src/main/res/layout/reader_webtoon_settings.xml b/app/src/main/res/layout/reader_webtoon_settings.xml index 1fd123783..78c0497db 100644 --- a/app/src/main/res/layout/reader_webtoon_settings.xml +++ b/app/src/main/res/layout/reader_webtoon_settings.xml @@ -89,7 +89,7 @@ android:textAppearance="@style/TextAppearance.Medium.SubHeading" />