Skip to content

providing the selected kind to launch custom study to provide user's intent #21017

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 1 commit into from
May 17, 2026
+19 −2
Merged

providing the selected kind to launch custom study to provide user's intent #21017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
val option = selectedSubDialog ?: return@setFragmentResultListener
val selectedCardStateIndex = viewModel.selectedCardStateIndex
if (selectedCardStateIndex == AdapterView.INVALID_POSITION) return@setFragmentResultListener
val kind = CustomStudyCardState.entries[selectedCardStateIndex].kind
val kind = viewModel.selectedKind
val cardsAmount = userInputValue ?: 100 // the default value
launchCustomStudy(option, cardsAmount, kind, tagsToInclude, emptyList())
}
Expand Down Expand Up @@ -404,7 +404,7 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
}
// skip tag selection if there's no tags to select
if (nids.isEmpty()) {
launchCustomStudy(contextMenuOption, n)
launchCustomStudy(contextMenuOption, n, viewModel.selectedKind)
return@launchCatchingTask
}
if (isAdded) {
Expand Down
17 changes: 17 additions & 0 deletions AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ package com.ichi2.anki.dialogs.customstudy
import android.widget.AdapterView
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import anki.scheduler.CustomStudyRequest.Cram.CramKind
import com.ichi2.anki.common.annotations.NeedsTest
import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyCardState
import com.ichi2.anki.libanki.Deck
import com.ichi2.anki.libanki.DeckId

Expand All @@ -42,6 +45,20 @@ class CustomStudyViewModel(
val deckId: DeckId
get() = savedStateHandle.get<DeckId>(KEY_DID) ?: error("Deck id was not provided!")

/*
* Translates the user's selection into a specific study type.
* This prevents the app from "forgetting" user's choice (e.g., Due Cards)
* even if the tag selection screen is skipped.
*/
@NeedsTest("Verify that selectedCardStateIndex correctly maps to the corresponding CramKind")
val selectedKind: CramKind
get() =
if (selectedCardStateIndex != AdapterView.INVALID_POSITION) {
CustomStudyCardState.entries[selectedCardStateIndex].kind
} else {
CramKind.CRAM_KIND_NEW
}

companion object {
/**
* Required key for a [DeckId] which [CustomStudyDialog] expects to receive as an argument.
Expand Down
Loading