Skip to content

chore: replace generic OK buttons with explicit action labels in dialogs #20263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrayanDSO merged 3 commits into from
Jan 30, 2026
Merged

chore: replace generic OK buttons with explicit action labels in dialogs #20263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c56a908
Use explicit action labels instead of OK in dialogs
siddhesh-06 Jan 30, 2026
eb0aea9
Replace getPositiveButtonTextRes method with positiveButtonTextRes va…
siddhesh-06 Jan 30, 2026
c97995e
Changed the scope of positiveButtonTextRes variable
siddhesh-06 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AnkiDroid/src/main/java/com/ichi2/anki/NoteTypeFieldEditor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class NoteTypeFieldEditor : AnkiActivity() {
AlertDialog.Builder(this).show {
customView(view = fieldNameInput, paddingStart = 64, paddingEnd = 64, paddingTop = 32)
title(R.string.model_field_editor_add)
positiveButton(R.string.dialog_ok) {
positiveButton(R.string.menu_add) {
// Name is valid, now field is added
val fieldName = uniqueName(fieldNameInput)
try {
Expand Down
15 changes: 14 additions & 1 deletion AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,20 @@ class CreateDeckDialog(
.Builder(context)
.show {
title(title)
positiveButton(R.string.dialog_ok) { onPositiveButtonClicked() }
// Resource ID for the dialog's positive action button text.
// Uses "Rename" for rename deck dialogs and "Create" for all other deck-related dialogs.
val positiveButtonTextRes =
when (deckDialogType) {
DeckDialogType.RENAME_DECK -> R.string.rename

DeckDialogType.DECK,
DeckDialogType.SUB_DECK,
DeckDialogType.FILTERED_DECK,
-> R.string.dialog_positive_create
}
positiveButton(positiveButtonTextRes) {
onPositiveButtonClicked()
}
negativeButton(R.string.dialog_cancel)
setView(R.layout.dialog_generic_text_input)
}.input(prefill = initialDeckName, displayKeyboard = true, waitForPositiveButton = false) { dialog, text ->
Expand Down
2 changes: 1 addition & 1 deletion AnkiDroid/src/main/java/com/ichi2/anki/notetype/RenameCardTemplateDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class RenameCardTemplateDialog {
.Builder(context)
.show {
title(R.string.rename_card_type)
positiveButton(R.string.dialog_ok) { }
positiveButton(R.string.rename) { }
negativeButton(R.string.dialog_cancel)
setView(R.layout.dialog_generic_text_input)
}.input(
Expand Down
Loading