fixup: improve ControlPreference style

I forgot to push the requested changes in 17927 before it got merged
ankidroid · Feb 14, 2025 · a72258a · a72258a
1 parent 8614558
commit a72258a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
@@ -19,7 +19,6 @@ package com.ichi2.preferences
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
-import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ArrayAdapter
@@ -45,6 +44,7 @@ import com.ichi2.ui.AxisPicker
 import com.ichi2.ui.KeyPicker
 import com.ichi2.utils.create
 import com.ichi2.utils.customView
+import com.ichi2.utils.dp
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
@@ -89,8 +89,8 @@ open class ControlPreference :
         binding: Binding,
         warningDisplay: WarningDisplay?,
     ): Boolean {
-        val bindingPreference = getPreferenceAssignedTo(binding)
-        if (bindingPreference == null || bindingPreference == this) return false
+        val bindingPreference = getPreferenceAssignedTo(binding) ?: return false
+        if (bindingPreference == this) return false
         val actionTitle = bindingPreference.title ?: ""
         val warning = context.getString(R.string.bindings_already_bound, actionTitle)
         if (warningDisplay != null) {
@@ -104,7 +104,7 @@ open class ControlPreference :
     var value: String?
         get() = getPersistedString(null)
         set(value) {
-            if (!TextUtils.equals(getPersistedString(null), value)) {
+            if (value != getPersistedString(null)) {
                 persistString(value)
                 notifyChanged()
             }
@@ -232,7 +232,7 @@ class ControlPreferenceDialogFragment : DialogFragment() {
         return AlertDialog.Builder(requireContext()).create {
             setTitle(preference.title)
             setIcon(preference.icon)
-            customView(view, paddingTop = 24)
+            customView(view, paddingTop = 16.dp.toPx(context))
             negativeButton(R.string.dialog_cancel)
         }
     }

diff --git a/AnkiDroid/src/main/res/layout/control_preference.xml b/AnkiDroid/src/main/res/layout/control_preference.xml
@@ -15,8 +15,7 @@
         android:text="@string/binding_add_gesture"
         android:gravity="center_vertical"
         android:drawableStart="@drawable/ic_touch"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingHorizontal="24dp"
         android:drawablePadding="16dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
@@ -31,8 +30,7 @@
         android:text="@string/binding_add_key"
         android:drawableStart="@drawable/ic_keyboard"
         android:gravity="center_vertical"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingHorizontal="24dp"
         android:drawablePadding="16dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
@@ -47,8 +45,7 @@
         android:text="@string/binding_add_axis"
         android:drawableStart="@drawable/ic_videogame"
         android:gravity="center_vertical"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingHorizontal="24dp"
         android:drawablePadding="16dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"

diff --git a/AnkiDroid/src/main/res/layout/control_preference_list_item.xml b/AnkiDroid/src/main/res/layout/control_preference_list_item.xml
@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingHorizontal="24dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:textAppearance="?attr/textAppearanceBodyLarge"
     tools:text="Remove ‘\u2328 Space’"