From 19993199db400e0276966dacba5511115e907170 Mon Sep 17 00:00:00 2001
From: John Leehey <j0hn133h3y@gmail.com>
Date: Sat, 30 Nov 2019 18:41:52 -0800
Subject: [PATCH] Remove no-longer-needed FloatListPreference

---
 .../tachiyomi/ui/setting/PreferenceDSL.kt     |  5 ----
 .../ui/setting/SettingsReaderController.kt    |  2 +-
 .../widget/preference/FloatListPreference.kt  | 26 -------------------
 3 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/widget/preference/FloatListPreference.kt

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt
index 138ebf76e6..6fc05d1af7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.setting
 import android.support.graphics.drawable.VectorDrawableCompat
 import android.support.v4.graphics.drawable.DrawableCompat
 import android.support.v7.preference.*
-import eu.kanade.tachiyomi.widget.preference.FloatListPreference
 import eu.kanade.tachiyomi.widget.preference.IntListPreference
 
 @DslMarker
@@ -38,10 +37,6 @@ inline fun PreferenceGroup.intListPreference(block: (@DSL IntListPreference).()
     return initThenAdd(IntListPreference(context), block).also(::initDialog)
 }
 
-inline fun PreferenceGroup.floatListPreference(block: (@DSL FloatListPreference).() -> Unit): FloatListPreference {
-    return initThenAdd(FloatListPreference(context), block).also(::initDialog)
-}
-
 inline fun PreferenceGroup.multiSelectListPreference(block: (@DSL MultiSelectListPreference).() -> Unit): MultiSelectListPreference {
     return initThenAdd(MultiSelectListPreference(context), block).also(::initDialog)
 }
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 e5958fdacf..901b6c3581 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
@@ -113,7 +113,7 @@ class SettingsReaderController : SettingsController() {
                 defaultValue = false
             }
 
-            floatListPreference {
+            intListPreference {
                 key = Keys.webtoonMarginRatio
                 titleRes = R.string.pref_reader_theme
                 entriesRes = arrayOf(R.string.webtoon_margin_ratio_0,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/FloatListPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/FloatListPreference.kt
deleted file mode 100644
index fb7d66e636..0000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/FloatListPreference.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.widget.preference
-
-import android.content.Context
-import android.support.v7.preference.ListPreference
-import android.util.AttributeSet
-
-class FloatListPreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
-        ListPreference(context, attrs) {
-
-    override fun persistString(value: String?): Boolean {
-        return value != null && persistFloat(value.toFloat())
-    }
-
-    override fun getPersistedString(defaultReturnValue: String?): String? {
-        // When the underlying preference is using a PreferenceDataStore, there's no way (for now)
-        // to check if a value is in the store, so we use a most likely unused value as workaround
-        val defaultIntValue = Float.NEGATIVE_INFINITY
-
-        val value = getPersistedFloat(defaultIntValue)
-        return if (value != defaultIntValue) {
-            value.toString()
-        } else {
-            defaultReturnValue
-        }
-    }
-}
\ No newline at end of file