fix: Prevent deck creation on 'Enter' key when deck name already exists

ankidroid · Oct 2, 2024 · 23aa29b · 23aa29b
1 parent da1db08
commit 23aa29b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt
@@ -97,7 +97,17 @@ class CreateDeckDialog(
             val inputField = dialog.getInputField()
             inputField.setOnEditorActionListener { _, actionId, event ->
                 if (actionId == EditorInfo.IME_ACTION_DONE || event?.keyCode == KeyEvent.KEYCODE_ENTER) {
-                    onPositiveButtonClicked()
+                    when {
+                        dialog.positiveButton.isEnabled -> {
+                            onPositiveButtonClicked()
+                        }
+                        text.isBlank() -> {
+                            dialog.getInputTextLayout().showSnackbar(context.getString(R.string.empty_deck_name), Snackbar.LENGTH_SHORT)
+                        }
+                        else -> {
+                            dialog.getInputTextLayout().showSnackbar(context.getString(R.string.deck_already_exists), Snackbar.LENGTH_SHORT)
+                        }
+                    }
                     true
                 } else {
                     false

diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -247,6 +247,7 @@
     </string>
 
     <string name="deck_already_exists">Deck already exists</string>
+    <string name="empty_deck_name">Deck name cannot be empty</string>
 
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>