Remove redundant preference keys

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt

@@ -61,7 +61,6 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.File
-import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 
 class SettingsAdvancedController(
     private val mangaRepository: MangaRepository = Injekt.get(),
@@ -157,9 +156,8 @@ class SettingsAdvancedController(
                 onClick { clearChapterCache() }
             }
             switchPreference {
-                key = Keys.autoClearChapterCache
+                bindTo(preferences.autoClearChapterCache())
                 titleRes = R.string.pref_auto_clear_chapter_cache
-                defaultValue = false
             }
             preference {
                 key = "pref_clear_database"

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt

@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.util.preference.bindTo
-import eu.kanade.tachiyomi.util.preference.defaultValue
 import eu.kanade.tachiyomi.util.preference.entriesRes
 import eu.kanade.tachiyomi.util.preference.infoPreference
 import eu.kanade.tachiyomi.util.preference.intListPreference
@@ -38,7 +37,6 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.File
-import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 
 class SettingsDownloadController : SettingsController() {
 
@@ -66,9 +64,8 @@ class SettingsDownloadController : SettingsController() {
                 .launchIn(viewScope)
         }
         switchPreference {
-            key = Keys.downloadOnlyOverWifi
+            bindTo(preferences.downloadOnlyOverWifi())
             titleRes = R.string.connected_to_wifi
-            defaultValue = true
         }
         switchPreference {
             bindTo(preferences.saveChaptersAsCBZ())
@@ -84,12 +81,11 @@ class SettingsDownloadController : SettingsController() {
             titleRes = R.string.pref_category_delete_chapters
 
             switchPreference {
-                key = Keys.removeAfterMarkedAsRead
+                bindTo(preferences.removeAfterMarkedAsRead())
                 titleRes = R.string.pref_remove_after_marked_as_read
-                defaultValue = false
             }
             intListPreference {
-                key = Keys.removeAfterReadSlots
+                bindTo(preferences.removeAfterReadSlots())
                 titleRes = R.string.pref_remove_after_read
                 entriesRes = arrayOf(
                     R.string.disabled,
@@ -100,13 +96,11 @@ class SettingsDownloadController : SettingsController() {
                     R.string.fifth_to_last,
                 )
                 entryValues = arrayOf("-1", "0", "1", "2", "3", "4")
-                defaultValue = "-1"
                 summary = "%s"
             }
             switchPreference {
-                key = Keys.removeBookmarkedChapters
+                bindTo(preferences.removeBookmarkedChapters())
                 titleRes = R.string.pref_remove_bookmarked_chapters
-                defaultValue = false
             }
             multiSelectListPreference {
                 bindTo(preferences.removeExcludeCategories())

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt

@@ -9,7 +9,6 @@ import androidx.preference.PreferenceScreen
 import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.preference.bindTo
-import eu.kanade.tachiyomi.util.preference.defaultValue
 import eu.kanade.tachiyomi.util.preference.listPreference
 import eu.kanade.tachiyomi.util.preference.onChange
 import eu.kanade.tachiyomi.util.preference.onClick
@@ -19,7 +18,6 @@ import eu.kanade.tachiyomi.util.preference.titleRes
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import org.xmlpull.v1.XmlPullParser
 import uy.kohesive.injekt.injectLazy
-import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 
 class SettingsGeneralController : SettingsController() {
 
@@ -33,9 +31,8 @@ class SettingsGeneralController : SettingsController() {
             titleRes = R.string.pref_library_update_show_tab_badge
         }
         switchPreference {
-            key = Keys.confirmExit
+            bindTo(preferences.confirmExit())
             titleRes = R.string.pref_confirm_exit
-            defaultValue = false
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             preference {

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt

@@ -47,7 +47,6 @@ import kotlinx.coroutines.runBlocking
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
-import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 
 class SettingsLibraryController : SettingsController() {
 
@@ -278,17 +277,15 @@ class SettingsLibraryController : SettingsController() {
                     .launchIn(viewScope)
             }
             switchPreference {
-                key = Keys.autoUpdateMetadata
+                bindTo(preferences.autoUpdateMetadata())
                 titleRes = R.string.pref_library_update_refresh_metadata
                 summaryRes = R.string.pref_library_update_refresh_metadata_summary
-                defaultValue = false
             }
             if (trackManager.hasLoggedServices()) {
                 switchPreference {
-                    key = Keys.autoUpdateTrackers
+                    bindTo(preferences.autoUpdateTrackers())
                     titleRes = R.string.pref_library_update_refresh_trackers
                     summaryRes = R.string.pref_library_update_refresh_trackers_summary
-                    defaultValue = false
                 }
             }
         }

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

@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.preference.PreferenceValues.TappingInvertMode
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import eu.kanade.tachiyomi.util.preference.bindTo
-import eu.kanade.tachiyomi.util.preference.defaultValue
 import eu.kanade.tachiyomi.util.preference.entriesRes
 import eu.kanade.tachiyomi.util.preference.intListPreference
 import eu.kanade.tachiyomi.util.preference.listPreference
@@ -17,7 +16,6 @@ import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
 import eu.kanade.tachiyomi.util.system.hasDisplayCutout
-import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 
 class SettingsReaderController : SettingsController() {
 
@@ -25,7 +23,7 @@ class SettingsReaderController : SettingsController() {
         titleRes = R.string.pref_category_reader
 
         intListPreference {
-            key = Keys.defaultReadingMode
+            bindTo(preferences.defaultReadingMode())
             titleRes = R.string.pref_viewer_type
             entriesRes = arrayOf(
                 R.string.left_to_right_viewer,
@@ -36,7 +34,6 @@ class SettingsReaderController : SettingsController() {
             )
             entryValues = ReadingModeType.values().drop(1)
                 .map { value -> "${value.flagValue}" }.toTypedArray()
-            defaultValue = "${ReadingModeType.RIGHT_TO_LEFT.flagValue}"
             summary = "%s"
         }
         intListPreference {
@@ -47,10 +44,9 @@ class SettingsReaderController : SettingsController() {
             summary = "%s"
         }
         switchPreference {
-            key = Keys.showReadingMode
+            bindTo(preferences.showReadingMode())
             titleRes = R.string.pref_show_reading_mode
             summaryRes = R.string.pref_show_reading_mode_summary
-            defaultValue = true
         }
         switchPreference {
             bindTo(preferences.showNavigationOverlayOnStart())
@@ -73,7 +69,7 @@ class SettingsReaderController : SettingsController() {
             titleRes = R.string.pref_category_display
 
             intListPreference {
-                key = Keys.defaultOrientationType
+                bindTo(preferences.defaultOrientationType())
                 titleRes = R.string.pref_rotation_type
                 entriesRes = arrayOf(
                     R.string.rotation_free,
@@ -85,7 +81,6 @@ class SettingsReaderController : SettingsController() {
                 )
                 entryValues = OrientationType.values().drop(1)
                     .map { value -> "${value.flagValue}" }.toTypedArray()
-                defaultValue = "${OrientationType.FREE.flagValue}"
                 summary = "%s"
             }
             intListPreference {
@@ -123,14 +118,12 @@ class SettingsReaderController : SettingsController() {
             titleRes = R.string.pref_category_reading
 
             switchPreference {
-                key = Keys.skipRead
+                bindTo(preferences.skipRead())
                 titleRes = R.string.pref_skip_read_chapters
-                defaultValue = false
             }
             switchPreference {
-                key = Keys.skipFiltered
+                bindTo(preferences.skipFiltered())
                 titleRes = R.string.pref_skip_filtered_chapters
-                defaultValue = true
             }
             switchPreference {
                 bindTo(preferences.alwaysShowChapterTransition())
@@ -318,10 +311,9 @@ class SettingsReaderController : SettingsController() {
                 titleRes = R.string.pref_read_with_long_tap
             }
             switchPreference {
-                key = Keys.folderPerManga
+                bindTo(preferences.folderPerManga())
                 titleRes = R.string.pref_create_folder_per_manga
                 summaryRes = R.string.pref_create_folder_per_manga_summary
-                defaultValue = false
             }
         }
     }

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt

@@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.ui.setting.track.TrackLoginDialog
 import eu.kanade.tachiyomi.ui.setting.track.TrackLogoutDialog
 import eu.kanade.tachiyomi.util.preference.add
-import eu.kanade.tachiyomi.util.preference.defaultValue
+import eu.kanade.tachiyomi.util.preference.bindTo
 import eu.kanade.tachiyomi.util.preference.iconRes
 import eu.kanade.tachiyomi.util.preference.infoPreference
 import eu.kanade.tachiyomi.util.preference.onClick
@@ -44,9 +44,8 @@ class SettingsTrackingController :
         titleRes = R.string.pref_category_tracking
 
         switchPreference {
-            key = Keys.autoUpdateTrack
+            bindTo(preferences.autoUpdateTrack())
             titleRes = R.string.pref_auto_update_manga_sync
-            defaultValue = true
         }
 
         preferenceCategory {