From 71470b9e02bc5e3e7607d7de57f90a882810bb49 Mon Sep 17 00:00:00 2001 From: NGB-Was-Taken <76197326+NGB-Was-Taken@users.noreply.github.com> Date: Sun, 25 May 2025 00:16:44 +0000 Subject: [PATCH] Remove the unused mark duplicate as read preference. (#1448) * Remove the unused mark duplicate as read preference. * Migrate the old preference to new preference --- .../settings/screen/SettingsReaderScreen.kt | 7 ----- .../ui/reader/setting/ReaderPreferences.kt | 2 -- .../core/migration/migrations/Migrations.kt | 1 + ...emoveDuplicateReaderPreferenceMigration.kt | 26 +++++++++++++++++++ 4 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/mihon/core/migration/migrations/RemoveDuplicateReaderPreferenceMigration.kt diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt index 99fef94cc..6269684b6 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt @@ -227,13 +227,6 @@ object SettingsReaderScreen : SearchableSettings { preference = readerPreferences.skipDupe(), title = stringResource(MR.strings.pref_skip_dupe_chapters), ), - // SY --> - Preference.PreferenceItem.SwitchPreference( - preference = readerPreferences.markReadDupe(), - title = stringResource(SYMR.strings.pref_mark_read_dupe_chapters), - subtitle = stringResource(SYMR.strings.pref_mark_read_dupe_chapters_summary), - ), - // SY <-- Preference.PreferenceItem.SwitchPreference( preference = readerPreferences.alwaysShowChapterTransition(), title = stringResource(MR.strings.pref_always_show_chapter_transition), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt index 5a526d42f..72f984913 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt @@ -184,8 +184,6 @@ class ReaderPreferences( fun centerMarginType() = preferenceStore.getInt("center_margin_type", PagerConfig.CenterMarginType.NONE) fun archiveReaderMode() = preferenceStore.getInt("archive_reader_mode", ArchiveReaderMode.LOAD_FROM_FILE) - - fun markReadDupe() = preferenceStore.getBoolean("mark_read_dupe", false) // SY <-- enum class FlashColor { diff --git a/app/src/main/java/mihon/core/migration/migrations/Migrations.kt b/app/src/main/java/mihon/core/migration/migrations/Migrations.kt index c6ef48cf5..fdb04bfbc 100644 --- a/app/src/main/java/mihon/core/migration/migrations/Migrations.kt +++ b/app/src/main/java/mihon/core/migration/migrations/Migrations.kt @@ -46,4 +46,5 @@ val migrations: List MoveEncryptionSettingsToAppStateMigration(), TrustExtensionRepositoryMigration(), CategoryPreferencesCleanupMigration(), + RemoveDuplicateReaderPreferenceMigration(), ) diff --git a/app/src/main/java/mihon/core/migration/migrations/RemoveDuplicateReaderPreferenceMigration.kt b/app/src/main/java/mihon/core/migration/migrations/RemoveDuplicateReaderPreferenceMigration.kt new file mode 100644 index 000000000..34e65ca5e --- /dev/null +++ b/app/src/main/java/mihon/core/migration/migrations/RemoveDuplicateReaderPreferenceMigration.kt @@ -0,0 +1,26 @@ +package mihon.core.migration.migrations + +import android.content.SharedPreferences +import androidx.core.content.edit +import mihon.core.migration.Migration +import mihon.core.migration.MigrationContext +import tachiyomi.core.common.util.lang.withIOContext + +class RemoveDuplicateReaderPreferenceMigration : Migration { + override val version: Float = 74f + + override suspend fun invoke(migrationContext: MigrationContext): Boolean = withIOContext { + val prefs = migrationContext.get() ?: return@withIOContext false + + if (prefs.getBoolean("mark_read_dupe", false)) { + val readPrefSet = prefs.getStringSet("mark_duplicate_read_chapter_read", emptySet())?.toMutableSet() + readPrefSet?.add("existing") + prefs.edit { + putStringSet("mark_duplicate_read_chapter_read", readPrefSet) + remove("mark_read_dupe") + } + } + + return@withIOContext true + } +}