fixes2

BrayanDSO · Dec 25, 2024 · de904a8 · de904a8
1 parent bf82bab
commit de904a8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
@@ -145,7 +145,7 @@ enum class ControlPreferenceScreen(
     @XmlRes val xmlRes: Int,
     @StringRes val titleRes: Int,
 ) {
-    REVIEWER(R.xml.preferences_reviewer_controls, R.string.pref_cat_reviewer),
+    REVIEWER(R.xml.preferences_reviewer_controls, R.string.review),
     PREVIEWER(R.xml.preferences_previewer_controls, R.string.card_editor_preview_card),
     ;
 

diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
@@ -31,7 +31,6 @@ import androidx.fragment.app.DialogFragment
 import androidx.preference.DialogPreference
 import androidx.preference.PreferenceFragmentCompat
 import com.ichi2.anki.R
-import com.ichi2.anki.cardviewer.GestureProcessor
 import com.ichi2.anki.dialogs.GestureSelectionDialogUtils
 import com.ichi2.anki.dialogs.GestureSelectionDialogUtils.onGestureChanged
 import com.ichi2.anki.dialogs.KeySelectionDialogUtils
@@ -41,7 +40,6 @@ import com.ichi2.anki.preferences.requirePreference
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.ui.AxisPicker
 import com.ichi2.ui.KeyPicker
 import com.ichi2.utils.create
@@ -205,7 +203,7 @@ class ControlPreferenceDialogFragment : DialogFragment() {
                 preference.showGesturePickerDialog()
                 dismiss()
             }
-            isVisible = sharedPrefs().getBoolean(GestureProcessor.PREF_KEY, false)
+            isVisible = preference.areGesturesEnabled
         }
 
         view.findViewById<View>(R.id.add_key).setOnClickListener {

diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -174,7 +174,7 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
-
+    <string name="review" maxLength="41">Review</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
@@ -250,7 +250,6 @@
 
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>

diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
@@ -139,7 +139,7 @@
     <string name="previewer_back_key">previewer_BACK</string>
     <string name="previewer_mark_key">previewer_MARK</string>
     <string name="previewer_edit_key">previewer_EDIT</string>
-    <string name="previewer_replay_audio_key">previewer_EDIT</string>
+    <string name="previewer_replay_audio_key">previewer_REPLAY_AUDIO</string>
     <string name="previewer_backside_only_action_key">previewer_BACKSIDE_ONLY</string>
     <string name="previewer_flag_red_key">previewer_TOGGLE_FLAG_RED</string>
     <string name="previewer_flag_orange_key">previewer_TOGGLE_FLAG_ORANGE</string>

diff --git a/AnkiDroid/src/main/res/xml/preferences_previewer_controls.xml b/AnkiDroid/src/main/res/xml/preferences_previewer_controls.xml
@@ -20,7 +20,7 @@
         android:icon="@drawable/ic_star_border_white"
         />
     <com.ichi2.preferences.PreviewerControlPreference
-        android:key="@string/previewer_replay_audio_key"
+        android:key="@string/previewer_edit_key"
         android:title="@string/cardeditor_title_edit_card"
         android:icon="@drawable/ic_popup_menu_item_editor"
         />