chore: convert AxisPicker to ViewBinding

Issue 11116

Author: david-allison

AnkiDroid/src/main/java/com/ichi2/ui/AxisPicker.kt

@@ -20,10 +20,7 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.ichi2.anki.R
+import com.ichi2.anki.databinding.DialogAxisPickerBinding
 import com.ichi2.anki.reviewer.Axis
 import com.ichi2.anki.reviewer.Binding
 import timber.log.Timber
@@ -37,20 +34,9 @@ import timber.log.Timber
  * @see AxisSelector
  */
 class AxisPicker(
-    val rootLayout: ConstraintLayout,
+    private val binding: DialogAxisPickerBinding,
 ) {
-    // DDisplays a message asking a user to provide input to the screen
-    // We use a TextView to listen due to issues with handling AXIS_BRAKE and AXIS_GAS
-    // When listening to 'rootLayout', these axes are ONLY detected after another joystick is moved
-    private val textView: TextView = rootLayout.findViewById(R.id.axis_picker_selected_axis)
-
-    /** Contains [availableAxes], initially invisible */
-    private val availableAxesContainer: View = rootLayout.findViewById(R.id.axis_picker_scrollview)
-
-    /** Where [AxisSelector] are added dynamically if motion is detected*/
-    private val availableAxes: LinearLayout = rootLayout.findViewById(R.id.axis_picker_available_axes)
-
-    private val context: Context get() = rootLayout.context
+    val rootLayout = binding.root
 
     /** Maps from an [Axis] to the [AxisSelector] displaying + allowing selection of it */
     private val axisMap = mutableMapOf<Axis, AxisSelector>()
@@ -62,8 +48,10 @@ class AxisPicker(
     }
 
     init {
-        textView.requestFocus()
-        textView.setOnGenericMotionListener { _, event -> handleMotionEvent(event) }
+        // We use a TextView to listen due to issues with handling AXIS_BRAKE and AXIS_GAS
+        // When listening to 'rootLayout', these axes are ONLY detected after another joystick is moved
+        binding.selectedAxisTextView.requestFocus()
+        binding.selectedAxisTextView.setOnGenericMotionListener { _, event -> handleMotionEvent(event) }
     }
 
     @Suppress("SameReturnValue")
@@ -91,28 +79,28 @@ class AxisPicker(
 
         // when adding the first control, we want to make the
         // available axes visible, so the user can see their current values
-        availableAxesContainer.visibility = View.VISIBLE
+        binding.availableAxesContainer.visibility = View.VISIBLE
         // we also want to hide the TextView, but we can't make it invisible as it's
         // providing our input events. Blanking the text has the same effect
-        textView.text = ""
+        binding.selectedAxisTextView.text = ""
 
         // setup & return the control
-        return AxisSelector(context).also { view ->
+        return AxisSelector(binding.root.context).also { view ->
             view.axis = axis
             view.setOnExtremitySelectedListener { binding ->
                 Timber.d("selected binding %s", binding)
                 onBindingChangedListener?.invoke(binding)
             }
 
             axisMap[axis] = view
-            availableAxes.addView(view)
+            binding.availableAxes.addView(view)
         }
     }
 
     companion object {
         fun inflate(context: Context): AxisPicker {
-            val layout = LayoutInflater.from(context).inflate(R.layout.dialog_axis_picker, null)
-            return AxisPicker(layout as ConstraintLayout)
+            val binding = DialogAxisPickerBinding.inflate(LayoutInflater.from(context))
+            return AxisPicker(binding)
         }
     }
 }

AnkiDroid/src/main/res/layout/dialog_axis_picker.xml

@@ -21,7 +21,7 @@
 
 
     <com.ichi2.ui.FixedTextView
-        android:id="@+id/axis_picker_selected_axis"
+        android:id="@+id/selected_axis_text_view"
         app:layout_constraintDimensionRatio="1:1"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -37,14 +37,16 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
+    <!-- Contains `available_axes`, initially invisible -->
     <ScrollView
-        android:id="@+id/axis_picker_scrollview"
+        android:id="@+id/available_axes_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
         >
+        <!-- AxisSelector elements are added here dynamically if motion is detected -->
         <LinearLayout
-            android:id="@+id/axis_picker_available_axes"
+            android:id="@+id/available_axes"
             android:layout_width="match_parent"
             android:orientation="vertical"
             android:layout_height="0dp"/>