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

Continues -> Continuous

Browse Source
This commit is contained in:
Jobobby04 2021-03-30 20:00:55 -04:00
parent b2cf1266ba
commit d294db3e4e
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
View File

@ -359,7 +359,7 @@ object PreferenceKeys {
const val extensionRepos = "extension_repos" 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" const val landscapeVerticalSeekbar = "pref_show_vert_seekbar_landscape"

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View File

@ -473,7 +473,7 @@ class PreferencesHelper(val context: Context) {
fun extensionRepos() = flowPrefs.getStringSet(Keys.extensionRepos, emptySet()) 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) fun forceHorizontalSeekbar() = flowPrefs.getBoolean(Keys.forceHorizontalSeekbar, false)

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

@ -498,7 +498,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
} else { } else {
// SY --> // SY -->
if (ReadingModeType.fromPreference(mangaViewer) == ReadingModeType.CONTINUOUS_VERTICAL) { if (ReadingModeType.fromPreference(mangaViewer) == ReadingModeType.CONTINUOUS_VERTICAL) {
preferences.cropBordersContinuesVertical().toggle() preferences.cropBordersContinuousVertical().toggle()
} else { } else {
preferences.cropBordersWebtoon().toggle() preferences.cropBordersWebtoon().toggle()
} }
@ -507,7 +507,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
} }
} }
updateCropBordersShortcut() updateCropBordersShortcut()
listOf(preferences.cropBorders(), preferences.cropBordersWebtoon() /* SY --> */, preferences.cropBordersContinuesVertical()/* SY <-- */) listOf(preferences.cropBorders(), preferences.cropBordersWebtoon() /* SY --> */, preferences.cropBordersContinuousVertical()/* SY <-- */)
.forEach { pref -> .forEach { pref ->
pref.asFlow() pref.asFlow()
.onEach { updateCropBordersShortcut() } .onEach { updateCropBordersShortcut() }
@ -728,7 +728,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
} else { } else {
// SY --> // SY -->
if (ReadingModeType.fromPreference(mangaViewer) == ReadingModeType.CONTINUOUS_VERTICAL) { if (ReadingModeType.fromPreference(mangaViewer) == ReadingModeType.CONTINUOUS_VERTICAL) {
preferences.cropBordersContinuesVertical().get() preferences.cropBordersContinuousVertical().get()
} else { } else {
preferences.cropBordersWebtoon().get() preferences.cropBordersWebtoon().get()
} }

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

@ -107,7 +107,7 @@ class ReaderReadingModeSettings @JvmOverloads constructor(context: Context, attr
// SY --> // SY -->
binding.webtoonPrefsGroup.zoomOutWebtoon.bindToPreference(preferences.webtoonEnableZoomOut()) binding.webtoonPrefsGroup.zoomOutWebtoon.bindToPreference(preferences.webtoonEnableZoomOut())
binding.webtoonPrefsGroup.cropBordersContinuesVertical.bindToPreference(preferences.cropBordersContinuesVertical()) binding.webtoonPrefsGroup.cropBordersContinuousVertical.bindToPreference(preferences.cropBordersContinuousVertical())
binding.webtoonPrefsGroup.pageTransitionsWebtoon.bindToPreference(preferences.pageTransitionsWebtoon()) binding.webtoonPrefsGroup.pageTransitionsWebtoon.bindToPreference(preferences.pageTransitionsWebtoon())
// SY <-- // SY <--
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
View File

@ -34,7 +34,7 @@ class WebtoonConfig(
var enableZoomOut = false var enableZoomOut = false
private set private set
var continuesCropBorders = false var continuousCropBorders = false
private set private set
var zoomPropertyChangedListener: ((Boolean) -> Unit)? = null var zoomPropertyChangedListener: ((Boolean) -> Unit)? = null
@ -67,8 +67,8 @@ class WebtoonConfig(
preferences.webtoonEnableZoomOut() preferences.webtoonEnableZoomOut()
.register({ enableZoomOut = it }, { zoomPropertyChangedListener?.invoke(it) }) .register({ enableZoomOut = it }, { zoomPropertyChangedListener?.invoke(it) })
preferences.cropBordersContinuesVertical() preferences.cropBordersContinuousVertical()
.register({ continuesCropBorders = it }, { imagePropertyChangedListener?.invoke() }) .register({ continuousCropBorders = it }, { imagePropertyChangedListener?.invoke() })
preferences.pageTransitionsWebtoon() preferences.pageTransitionsWebtoon()
.register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() }) .register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() })

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
View File

@ -364,7 +364,7 @@ class WebtoonPageHolder(
val config = viewer.config val config = viewer.config
// SY --> // SY -->
val imageCropBorders = if (!viewer.isContinuous) config.continuesCropBorders else config.imageCropBorders val imageCropBorders = if (!viewer.isContinuous) config.continuousCropBorders else config.imageCropBorders
// SY <-- // SY <--
if (subsamplingImageView != null && /* SY --> */ imageCropBorders /* SY <-- */ == cropBorders) { if (subsamplingImageView != null && /* SY --> */ imageCropBorders /* SY <-- */ == cropBorders) {
return subsamplingImageView!! return subsamplingImageView!!

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

@ -333,7 +333,7 @@ class SettingsReaderController : SettingsController() {
defaultValue = false defaultValue = false
} }
switchPreference { switchPreference {
key = Keys.cropBordersContinuesVertical key = Keys.cropBordersContinuousVertical
titleRes = R.string.pref_crop_borders titleRes = R.string.pref_crop_borders
defaultValue = false defaultValue = false
} }

2
app/src/main/res/layout/reader_webtoon_settings.xml
View File

@ -89,7 +89,7 @@
android:textAppearance="@style/TextAppearance.Medium.SubHeading" /> android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/crop_borders_continues_vertical" android:id="@+id/crop_borders_continuous_vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"