From f44e94f514699f1284806a7a6084d198d881d3d1 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 22 Apr 2023 16:31:01 -0400 Subject: [PATCH] Hide beta split tall images setting from reader setting sheet for release builds Closes #9358 (cherry picked from commit e23cc8f83ad00ad45b709a40b7c3ca90a86477f1) # Conflicts: # app/build.gradle.kts --- app/build.gradle.kts | 2 +- app/src/main/java/eu/kanade/tachiyomi/Migrations.kt | 8 ++++++++ .../ui/reader/setting/ReaderReadingModeSettings.kt | 3 +++ app/src/main/java/exh/EXHMigrations.kt | 8 ++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ffaf51b3..3ba29b4c6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,7 +26,7 @@ android { defaultConfig { applicationId = "eu.kanade.tachiyomi.sy" - versionCode = 52 + versionCode = 53 versionName = "1.9.3" buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index a177fc96b..c0ff0e6a8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences import eu.kanade.tachiyomi.util.preference.minusAssign import eu.kanade.tachiyomi.util.preference.plusAssign import eu.kanade.tachiyomi.util.system.DeviceUtil +import eu.kanade.tachiyomi.util.system.isReleaseBuildType import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.workManager import tachiyomi.core.preference.PreferenceStore @@ -366,6 +367,13 @@ object Migrations { if (oldVersion < 100) { BackupCreateJob.setupTask(context) } + if (oldVersion < 102) { + // This was accidentally visible from the reader settings sheet, but should always + // be disabled in release builds. + if (isReleaseBuildType) { + readerPreferences.longStripSplitWebtoon().set(false) + } + } return true } 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 4693fa9ab..c39cad038 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 @@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer import eu.kanade.tachiyomi.util.preference.bindToPreference +import eu.kanade.tachiyomi.util.system.isReleaseBuildType import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.injectLazy @@ -143,6 +144,8 @@ class ReaderReadingModeSettings @JvmOverloads constructor(context: Context, attr .onEach { binding.webtoonPrefsGroup.dualPageInvert.isVisible = it } .launchIn((context as ReaderActivity).lifecycleScope) binding.webtoonPrefsGroup.dualPageInvert.bindToPreference(readerPreferences.dualPageInvertWebtoon()) + + binding.webtoonPrefsGroup.longStripSplit.isVisible = !isReleaseBuildType binding.webtoonPrefsGroup.longStripSplit.bindToPreference(readerPreferences.longStripSplitWebtoon()) // SY --> diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index df85fbc4a..08d85da49 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences import eu.kanade.tachiyomi.util.preference.minusAssign import eu.kanade.tachiyomi.util.system.DeviceUtil +import eu.kanade.tachiyomi.util.system.isReleaseBuildType import eu.kanade.tachiyomi.util.system.workManager import exh.eh.EHentaiUpdateWorker import exh.log.xLogE @@ -541,6 +542,13 @@ object EXHMigrations { if (oldVersion under 52) { BackupCreateJob.setupTask(context) } + if (oldVersion under 53) { + // This was accidentally visible from the reader settings sheet, but should always + // be disabled in release builds. + if (isReleaseBuildType) { + readerPreferences.longStripSplitWebtoon().set(false) + } + } // if (oldVersion under 1) { } (1 is current release version) // do stuff here when releasing changed crap