Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 18:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix binding of intarray preferences (maybe fixes #4728)

Browse Source
This commit is contained in:
arkon 2021-03-28 17:06:56 -04:00
parent 71aa592111
commit 0437703cbf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/SpinnerPreference.kt
View File

@ -16,7 +16,6 @@ class SpinnerPreference @JvmOverloads constructor(context: Context, attrs: Attri
FrameLayout(context, attrs) { FrameLayout(context, attrs) {
private var entries = emptyList<String>() private var entries = emptyList<String>()
private var prefOffset = 0
private var popup: PopupMenu? = null private var popup: PopupMenu? = null
var onItemSelectedListener: ((Int) -> Unit)? = null var onItemSelectedListener: ((Int) -> Unit)? = null
@ -54,9 +53,8 @@ class SpinnerPreference @JvmOverloads constructor(context: Context, attrs: Attri
fun bindToPreference(pref: Preference<Int>, offset: Int = 0, block: ((Int) -> Unit)? = null) { fun bindToPreference(pref: Preference<Int>, offset: Int = 0, block: ((Int) -> Unit)? = null) {
setSelection(pref.get() - offset) setSelection(pref.get() - offset)
prefOffset = offset
popup = makeSettingsPopup(pref, prefOffset, block) popup = makeSettingsPopup(pref, offset, block)
setOnTouchListener(popup?.dragToOpenListener) setOnTouchListener(popup?.dragToOpenListener)
setOnClickListener { setOnClickListener {
popup?.show() popup?.show()
@ -75,9 +73,8 @@ class SpinnerPreference @JvmOverloads constructor(context: Context, attrs: Attri
} }
fun bindToIntPreference(pref: Preference<Int>, @ArrayRes intValuesResource: Int, block: ((Int) -> Unit)? = null) { fun bindToIntPreference(pref: Preference<Int>, @ArrayRes intValuesResource: Int, block: ((Int) -> Unit)? = null) {
setSelection(pref.get())
prefOffset = 0
val intValues = resources.getStringArray(intValuesResource).map { it.toIntOrNull() } val intValues = resources.getStringArray(intValuesResource).map { it.toIntOrNull() }
setSelection(intValues.indexOf(pref.get()))
popup = makeSettingsPopup(pref, intValues, block) popup = makeSettingsPopup(pref, intValues, block)
setOnTouchListener(popup?.dragToOpenListener) setOnTouchListener(popup?.dragToOpenListener)