Skip to content

chore: convert ControlPreferenceDialogFragment to ViewBinding #20148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-allison merged 2 commits into from
Jan 21, 2026
Merged

chore: convert ControlPreferenceDialogFragment to ViewBinding #20148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddf2f04
chore: convert ControlPreferenceDialogFragment to ViewBinding
david-allison Sep 12, 2025
87d4c3f
chore: improve 'control preference' designer
david-allison Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@ import android.app.Dialog
import android.content.Context
import android.os.Bundle
import android.util.AttributeSet
import android.view.View
import android.widget.ArrayAdapter
import android.widget.ListView
import androidx.appcompat.app.AlertDialog
import androidx.core.view.isVisible
import androidx.fragment.app.DialogFragment
import androidx.preference.DialogPreference
import androidx.preference.PreferenceFragmentCompat
import com.ichi2.anki.R
import com.ichi2.anki.databinding.ControlPreferenceBinding
import com.ichi2.anki.dialogs.GestureSelectionDialogUtils
import com.ichi2.anki.dialogs.GestureSelectionDialogUtils.onGestureChanged
import com.ichi2.anki.dialogs.KeySelectionDialogUtils
Expand Down Expand Up @@ -232,51 +231,50 @@ class ControlPreferenceDialogFragment : DialogFragment() {
}

override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val view = requireActivity().layoutInflater.inflate(R.layout.control_preference, null)
val binding = ControlPreferenceBinding.inflate(requireActivity().layoutInflater)

setupAddBindingDialogs(view)
setupRemoveControlEntries(view)
setupAddBindingDialogs(binding)
setupRemoveControlEntries(binding)

return AlertDialog.Builder(requireContext()).create {
setTitle(preference.title)
setIcon(preference.icon)
customView(view, paddingTop = 16.dp.toPx(context))
customView(binding.root, paddingTop = 16.dp.toPx(context))
negativeButton(R.string.dialog_cancel)
}
}

private fun setupAddBindingDialogs(view: View) {
view.findViewById<View>(R.id.add_gesture).apply {
private fun setupAddBindingDialogs(binding: ControlPreferenceBinding) {
binding.addGesture.apply {
setOnClickListener {
preference.showGesturePickerDialog()
dismiss()
}
isVisible = preference.areGesturesEnabled
}

view.findViewById<View>(R.id.add_key).setOnClickListener {
binding.addKey.setOnClickListener {
preference.showKeyPickerDialog()
dismiss()
}

view.findViewById<View>(R.id.add_axis).setOnClickListener {
binding.addAxis.setOnClickListener {
preference.showAddAxisDialog()
dismiss()
}
}

private fun setupRemoveControlEntries(view: View) {
private fun setupRemoveControlEntries(binding: ControlPreferenceBinding) {
val bindings = preference.getMappableBindings().toMutableList()
val listView = view.findViewById<ListView>(R.id.list_view)
if (bindings.isEmpty()) {
listView.isVisible = false
binding.listView.isVisible = false
return
}
val titles =
bindings.map {
getString(R.string.binding_remove_binding, it.toDisplayString(requireContext()))
}
listView.apply {
binding.listView.apply {
adapter = ArrayAdapter(requireContext(), R.layout.control_preference_list_item, titles)
setOnItemClickListener { _, _, index, _ ->
bindings.removeAt(index)
Expand Down
1 change: 1 addition & 0 deletions AnkiDroid/src/main/res/layout/control_preference.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@null"
tools:listitem="@layout/control_preference_list_item"
/>
</LinearLayout>