From 147978b932497d4ac914dd95807159b7e023fe2c Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 22 May 2021 12:39:58 -0400 Subject: [PATCH] Disable swiping on switch in SwitchSettingsPreference --- .../widget/preference/SwitchSettingsPreference.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchSettingsPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchSettingsPreference.kt index b0b905f780..b5530ada59 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchSettingsPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchSettingsPreference.kt @@ -1,7 +1,9 @@ package eu.kanade.tachiyomi.widget.preference +import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet +import android.view.MotionEvent import android.view.View import androidx.preference.PreferenceViewHolder import androidx.preference.SwitchPreferenceCompat @@ -16,11 +18,17 @@ class SwitchSettingsPreference @JvmOverloads constructor(context: Context, attrs widgetLayoutResource = R.layout.pref_settings } + @SuppressLint("ClickableViewAccessibility") override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) holder.findViewById(R.id.button).setOnClickListener { onSettingsClick?.onClick(it) } + + // Disable swiping to align with SwitchPreferenceCompat + holder.findViewById(R.id.switchWidget).setOnTouchListener { _, event -> + event.actionMasked == MotionEvent.ACTION_MOVE + } } }