Skip to content

Commit b436552

Browse files
committed
refactor(card-browser): move Edit Note to Fragment
Assisted-by: Claude Opus 4.7 - all
1 parent bff183f commit b436552

2 files changed

Lines changed: 17 additions & 15 deletions

File tree

AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -595,21 +595,6 @@ open class CardBrowser :
595595
Timber.i("Ctrl+E: Add Note")
596596
launchCatchingTask { addNoteFromCardBrowser() }
597597
return true
598-
} else if (searchView?.isIconified == true) {
599-
Timber.i("E: Edit note")
600-
// search box is not available so treat the event as a shortcut
601-
// Disable 'E' edit shortcut in split mode as the integrated NoteEditor
602-
// is already available in the split view, making the shortcut redundant
603-
if (fragmented) {
604-
Timber.i("E: Ignored in split mode")
605-
return true
606-
}
607-
openNoteEditorForCurrentlySelectedNote()
608-
return true
609-
} else {
610-
Timber.i("E: Character added")
611-
// search box might be available and receiving input so treat this as usual text
612-
return false
613598
}
614599
}
615600
KeyEvent.KEYCODE_F -> {

AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,10 +1110,27 @@ class CardBrowserFragment :
11101110
}
11111111
}
11121112
KeyEvent.KEYCODE_E -> {
1113+
// NOTE: Ctrl+E is 'Add Note', set in the Activity
11131114
if (event.isCtrlPressed && event.isShiftPressed) {
11141115
Timber.i("Ctrl+Shift+E: Export selected cards")
11151116
exportSelected()
11161117
return true
1118+
} else if (!event.isCtrlPressed) {
1119+
if (legacySearchView?.isIconified == true) {
1120+
// search box is not available so treat the event as a shortcut
1121+
// Disable 'E' edit shortcut in split mode as the integrated NoteEditor
1122+
// is already available in the split view, making the shortcut redundant
1123+
if (activityViewModel.isFragmented) {
1124+
Timber.i("E: Ignored in split mode")
1125+
return true
1126+
}
1127+
Timber.i("E: Edit note")
1128+
requireCardBrowserActivity().openNoteEditorForCurrentlySelectedNote()
1129+
return true
1130+
}
1131+
Timber.i("E: Character added")
1132+
// search box might be available and receiving input so treat this as usual text
1133+
return false
11171134
}
11181135
}
11191136
KeyEvent.KEYCODE_D -> {

0 commit comments

Comments
 (0)