Skip to content

Commit 5d54567

Browse files
sanjaysargamdavid-allison
authored andcommitted
fix: add note in split browser
launch note editor activity on add note even if fragmented
1 parent 60a611d commit 5d54567

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ open class CardBrowser :
122122
*/
123123
@get:VisibleForTesting
124124
val addNoteLauncher: NoteEditorLauncher
125-
get() = createAddNoteLauncher(viewModel, fragmented)
125+
get() = createAddNoteLauncher(viewModel)
126126

127127
/**
128128
* Provides an instance of NoteEditorLauncher for editing a note
@@ -1118,11 +1118,7 @@ open class CardBrowser :
11181118
): Intent = PreviewerDestination(index, idsFile).toIntent(this)
11191119

11201120
private fun addNoteFromCardBrowser() {
1121-
if (fragmented) {
1122-
loadNoteEditorFragmentIfFragmented()
1123-
} else {
1124-
onAddNoteActivityResult.launch(addNoteLauncher.toIntent(this))
1125-
}
1121+
onAddNoteActivityResult.launch(addNoteLauncher.toIntent(this))
11261122
}
11271123

11281124
private val reviewerCardId: CardId
@@ -1361,10 +1357,8 @@ open class CardBrowser :
13611357
fun clearLastDeckId() = SharedPreferencesLastDeckIdRepository.clearLastDeckId()
13621358

13631359
@VisibleForTesting
1364-
fun createAddNoteLauncher(
1365-
viewModel: CardBrowserViewModel,
1366-
inCardBrowserActivity: Boolean = false,
1367-
): NoteEditorLauncher = NoteEditorLauncher.AddNoteFromCardBrowser(viewModel, inCardBrowserActivity)
1360+
fun createAddNoteLauncher(viewModel: CardBrowserViewModel): NoteEditorLauncher =
1361+
NoteEditorLauncher.AddNoteFromCardBrowser(viewModel)
13681362
}
13691363
}
13701364

AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorLauncher.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,13 @@ sealed interface NoteEditorLauncher : Destination {
105105
*/
106106
data class AddNoteFromCardBrowser(
107107
val viewModel: CardBrowserViewModel,
108-
val inCardBrowserActivity: Boolean = false,
109108
) : NoteEditorLauncher {
110109
override fun toBundle(): Bundle {
111110
val fragmentArgs =
112111
bundleOf(
113112
NoteEditorFragment.EXTRA_CALLER to NoteEditorCaller.CARDBROWSER_ADD.value,
114113
NoteEditorFragment.EXTRA_TEXT_FROM_SEARCH_VIEW to viewModel.searchTerms,
115-
NoteEditorFragment.IN_CARD_BROWSER_ACTIVITY to inCardBrowserActivity,
114+
NoteEditorFragment.IN_CARD_BROWSER_ACTIVITY to false,
116115
)
117116
if (viewModel.lastDeckId?.let { id -> id > 0 } == true) {
118117
fragmentArgs.putLong(NoteEditorFragment.EXTRA_DID, viewModel.lastDeckId!!)

0 commit comments

Comments
 (0)