shortcut E: edit note

ankidroid · Aug 4, 2024 · c8d6434 · c8d6434
1 parent ce1b778
commit c8d6434
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -650,6 +650,9 @@ open class CardBrowser :
                     Timber.i("Ctrl+E: Add Note")
                     launchCatchingTask { addNoteFromCardBrowser() }
                     return true
+                } else {
+                    Timber.i("E: Edit note")
+                    openNoteEditorForCurrentlySelectedNote()
                 }
             }
             KeyEvent.KEYCODE_D -> {
@@ -718,14 +721,26 @@ open class CardBrowser :
         viewModel.endMultiSelectMode()
     }
 
+    /**
+     * In case of selection, the first card that was selected, otherwise the first card of the list.
+     */
+    private suspend fun getCardIdForNoteEditor(): CardId {
+        // Just select the first one if there's a multiselect occurring.
+        return if (viewModel.isInMultiSelectMode) {
+            viewModel.querySelectedCardIdAtPosition(0)
+        } else {
+            viewModel.getRowAtPosition(0).id
+        }
+    }
+
     private fun openNoteEditorForCurrentlySelectedNote() = launchCatchingTask {
         try {
-            // Just select the first one. It doesn't particularly matter if there's a multiselect occurring.
-            openNoteEditorForCard(viewModel.querySelectedCardIdAtPosition(0))
+            val cardId = getCardIdForNoteEditor()
+            openNoteEditorForCard(cardId)
         } catch (e: Exception) {
             Timber.w(e, "Error Opening Note Editor")
             showSnackbar(
-                R.string.multimedia_editor_something_wrong,
+                R.string.no_note_to_edit,
                 Snackbar.LENGTH_LONG
             )
         }

diff --git a/AnkiDroid/src/main/res/values/07-cardbrowser.xml b/AnkiDroid/src/main/res/values/07-cardbrowser.xml
@@ -50,6 +50,7 @@
     <string name="card_browser_list_my_searches_new_name">Name for the current search</string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">You can’t save a search without a name</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">Name exists</string>
+    <string name="no_note_to_edit">No note to edit</string>
     <string name="card_browser_list_my_searches_remove_content">Delete “%1$s”?</string>
     <string name="card_browser_change_display_order">Change display order</string>
     <string name="card_browser_change_display_order_title">Choose display order</string>