refactor: use dialog instead of snackbar for warning

ankidroid · May 26, 2024 · 8e0db75 · 8e0db75
1 parent 626fb02
commit 8e0db75
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -318,25 +318,32 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
         SAME_NUMBER, INCREMENT_NUMBER
     }
 
+    @NeedsTest("Error message should be null after save")
     private var addNoteErrorMessage: String? = null
 
     private fun displayErrorSavingNote() {
         val errorMessage = snackbarErrorText
         // Anki allows to proceed in case we try to add non cloze text in cloze field with warning,
         // this snackbar helps replicate similar behaviour
         if (errorMessage == TR.addingYouHaveAClozeDeletionNote()) {
-            showSnackbar(errorMessage, Snackbar.LENGTH_INDEFINITE) {
-                setAction(R.string.dialog_ok) {
-                    lifecycleScope.launch {
-                        saveNoteWithProgress()
-                    }
-                }
-            }
+            noClozeDialog(errorMessage)
         } else {
             showSnackbar(errorMessage)
         }
     }
 
+    private fun noClozeDialog(errorMessage: String) {
+        AlertDialog.Builder(this).show {
+            message(text = errorMessage)
+            positiveButton(text = TR.actionsSave()) {
+                lifecycleScope.launch {
+                    saveNoteWithProgress()
+                }
+            }
+            negativeButton(R.string.dialog_cancel)
+        }
+    }
+
     @VisibleForTesting
     val snackbarErrorText: String
         get() = when {
@@ -964,7 +971,6 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
         sourceText = null
         refreshNoteData(FieldChangeType.refreshWithStickyFields(shouldReplaceNewlines()))
         showSnackbar(TR.addingAdded(), Snackbar.LENGTH_SHORT)
-        addNoteErrorMessage = null
 
         if (caller == CALLER_NOTEEDITOR || aedictIntent) {
             closeEditorAfterSave = true
@@ -1033,6 +1039,7 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
                     displayErrorSavingNote()
                     return@launch
                 }
+                addNoteErrorMessage = null
                 saveNoteWithProgress()
             }
         } else {