feat(controls): add "flip and answer" option

Author: BrayanDSO

AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt

@@ -18,6 +18,7 @@ package com.ichi2.anki.preferences
 import android.content.res.Configuration
 import androidx.annotation.StringRes
 import androidx.annotation.XmlRes
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.withResumed
 import androidx.lifecycle.withStarted
@@ -31,12 +32,15 @@ import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.preferences.reviewer.ViewerAction
 import com.ichi2.anki.previewer.PreviewerAction
+import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableAction
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.preferences.ControlPreference
+import com.ichi2.preferences.ReviewerControlPreference
+import com.ichi2.utils.show
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -64,6 +68,7 @@ class ControlsSettingsFragment :
         setControlPreferencesDefaultValues(initialScreen)
         setDynamicTitle()
         setupNewStudyScreenSettings()
+        setupAnswerCommands()
     }
 
     /**
@@ -198,6 +203,43 @@ class ControlsSettingsFragment :
         }
     }
 
+    private fun setupAnswerCommands() {
+        val showAnswerPref = (findPreference<ControlPreference>(R.string.show_answer_command_key) as? ReviewerControlPreference)
+
+        val answerCommandKeys =
+            listOf(
+                ViewerAction.ANSWER_AGAIN.preferenceKey,
+                ViewerAction.ANSWER_HARD.preferenceKey,
+                ViewerAction.ANSWER_GOOD.preferenceKey,
+                ViewerAction.ANSWER_EASY.preferenceKey,
+            )
+        for (key in answerCommandKeys) {
+            (findPreference<Preference>(key) as? ReviewerControlPreference)?.let { answerPref ->
+                val items =
+                    arrayOf(
+                        getString(R.string.only_answer),
+                        getString(R.string.flip_and_answer),
+                    )
+                answerPref.setOnBindingSelectedListener { binding ->
+                    AlertDialog.Builder(requireContext()).show {
+                        setTitle(answerPref.title)
+                        setIcon(answerPref.icon)
+                        setItems(items) { _, index ->
+                            when (index) {
+                                0 -> answerPref.addBinding(binding, CardSide.ANSWER)
+                                1 -> {
+                                    answerPref.addBinding(binding, CardSide.ANSWER)
+                                    showAnswerPref?.addBinding(binding, CardSide.QUESTION)
+                                }
+                            }
+                        }
+                    }
+                    true
+                }
+            }
+        }
+    }
+
     companion object {
         private val actionToScreenMap: Map<String, ControlPreferenceScreen> by lazy {
             ControlPreferenceScreen.entries

AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt

@@ -69,25 +69,38 @@ class ReviewerControlPreference : ControlPreference {
 
     override fun getMappableBindings(): List<ReviewerBinding> = ReviewerBinding.fromPreferenceString(value).toList()
 
-    override fun onKeySelected(binding: Binding) {
-        selectSide { side ->
-            addBinding(binding, side)
-        }
+    fun interface OnBindingSelectedListener {
+        /**
+         * Called when a binding is selected, before the side is set. This allows listeners
+         * to respond before the value is set, and potentially override it.
+         *
+         * @param binding The selected binding.
+         *
+         * @return True if the listener has consumed the event, false otherwise.
+         */
+        fun onBindingSelected(binding: Binding): Boolean
     }
 
-    override fun onGestureSelected(binding: Binding) {
-        selectSide { side ->
-            addBinding(binding, side)
-        }
+    private var onBindingSelectedListener: OnBindingSelectedListener? = null
+
+    fun setOnBindingSelectedListener(listener: OnBindingSelectedListener) {
+        onBindingSelectedListener = listener
     }
 
-    override fun onAxisSelected(binding: Binding) {
+    override fun onKeySelected(binding: Binding) = setBinding(binding)
+
+    override fun onGestureSelected(binding: Binding) = setBinding(binding)
+
+    override fun onAxisSelected(binding: Binding) = setBinding(binding)
+
+    fun setBinding(binding: Binding) {
+        if (onBindingSelectedListener?.onBindingSelected(binding) == true) return
         selectSide { side ->
             addBinding(binding, side)
         }
     }
 
-    private fun addBinding(
+    fun addBinding(
         binding: Binding,
         side: CardSide,
     ) {

AnkiDroid/src/main/res/values/10-preferences.xml

@@ -470,6 +470,10 @@ this formatter is used if the bind only applies to the answer">A: %s</string>
         ><![CDATA[Improved study screen that will succeed the current one. Some features of the old screen have been changed or removed. Please report any <a href="%1$s">feedback</a> or <a href="%2$s">bugs</a>.]]></string>
     <string name="show_answer_feedback" maxLength="41">Show answer feedback</string>
     <string name="screen" maxLength="41">Screen</string>
+    <string name="only_answer" maxLength="41" comment="Configuration of the 'Answer' commands to only answer the card"
+        >Only answer</string>
+    <string name="flip_and_answer" maxLength="41" comment="Configuration of the 'Answer' commands to answer the card if on the answer side, and flip it if on the question side"
+        >Flip and answer</string>
 
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>