From 47eb9da90fda8d8a514dcadc4113d05823a86953 Mon Sep 17 00:00:00 2001 From: Galal-20 Date: Sun, 15 Mar 2026 17:55:07 +0200 Subject: [PATCH 1/2] feat(dialog): add hintRes and replace Snackbar bug - Added Name hint text (hintRes) for different deck dialog types (DECK, SUB_DECK, RENAME_DECK, FILTERED_DECK) - Replaced Snackbar calls in showDialog() with displayFeedback() for consistent user feedback - Cleaned up commented-out Snackbar code --- .../ichi2/anki/dialogs/CreateDeckDialog.kt | 22 ++++++++++++------- AnkiDroid/src/main/res/values/02-strings.xml | 5 +++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt index a2af14572811..b9c09e9dd292 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt @@ -112,6 +112,18 @@ class CreateDeckDialog( setView(R.layout.dialog_generic_text_input) }.input(prefill = initialDeckName, displayKeyboard = true, waitForPositiveButton = false) { dialog, text -> + val textInputLayout = dialog.getInputTextLayout() + + val hintRes = + when (deckDialogType) { + DeckDialogType.DECK -> R.string.create_new_deck + DeckDialogType.SUB_DECK -> R.string.create_new_sub_deck + DeckDialogType.RENAME_DECK -> R.string.rename_deck + DeckDialogType.FILTERED_DECK -> R.string.filter_deck + } + + textInputLayout.hint = context.getString(hintRes) + // defining the action of done button in ImeKeyBoard and enter button in physical keyBoard val inputField = dialog.getInputField() inputField.setOnEditorActionListener { _, actionId, event -> @@ -121,16 +133,10 @@ class CreateDeckDialog( onPositiveButtonClicked() } text.isBlank() -> { - dialog.getInputTextLayout().showSnackbar( - context.getString(R.string.empty_deck_name), - Snackbar.LENGTH_SHORT, - ) + displayFeedback(context.getString(R.string.empty_deck_name)) } else -> { - dialog.getInputTextLayout().showSnackbar( - context.getString(R.string.deck_already_exists), - Snackbar.LENGTH_SHORT, - ) + displayFeedback(context.getString(R.string.deck_already_exists)) } } true diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml index 9e3e22d3657f..a6d0cfd1c420 100644 --- a/AnkiDroid/src/main/res/values/02-strings.xml +++ b/AnkiDroid/src/main/res/values/02-strings.xml @@ -34,6 +34,11 @@ Edit Occlusions Paste from clipboard + New deck + New sub deck + New deck name + + Tag name Add/filter tags Add tag From b3ba9a8b2bb1eb83a59dfe84bfbe23316f055402 Mon Sep 17 00:00:00 2001 From: Galal-20 Date: Sun, 15 Mar 2026 19:36:13 +0200 Subject: [PATCH 2/2] fix ktlint formatting --- AnkiDroid/src/main/res/values/02-strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml index a6d0cfd1c420..fd970d289c06 100644 --- a/AnkiDroid/src/main/res/values/02-strings.xml +++ b/AnkiDroid/src/main/res/values/02-strings.xml @@ -36,8 +36,7 @@ New deck New sub deck - New deck name - + Filter deck Tag name Add/filter tags