fix(previewer): cards' ord couldn't be changed

BrayanDSO · Apr 10, 2024 · 400b72e · 400b72e
1 parent e44266c
commit 400b72e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerViewModel.kt
@@ -58,7 +58,7 @@ class TemplatePreviewerViewModel(
     private val note: Deferred<Note>
     private val templateNames: Deferred<List<String>>
     private val clozeOrds: Deferred<List<Int>>?
-    override var currentCard: Deferred<Card>
+    override lateinit var currentCard: Deferred<Card>
 
     init {
         note = asyncIO {
@@ -73,17 +73,7 @@ class TemplatePreviewerViewModel(
                 tags = arguments.tags
             }
         }
-        currentCard = asyncIO {
-            val note = note.await()
-            withCol {
-                note.ephemeralCard(
-                    col = this,
-                    ord = ordFlow.value,
-                    customNoteType = notetype,
-                    fillEmpty = fillEmpty
-                )
-            }
-        }
+
         if (isCloze) {
             val clozeNumbers = asyncIO {
                 val note = note.await()
@@ -114,7 +104,18 @@ class TemplatePreviewerViewModel(
             return
         }
         launchCatchingIO {
-            ordFlow.collectLatest {
+            ordFlow.collectLatest { ord ->
+                currentCard = asyncIO {
+                    val note = note.await()
+                    withCol {
+                        note.ephemeralCard(
+                            col = this,
+                            ord = ord,
+                            customNoteType = notetype,
+                            fillEmpty = fillEmpty
+                        )
+                    }
+                }
                 showQuestion()
                 loadAndPlaySounds(CardSide.QUESTION)
             }

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TemplatePreviewerViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TemplatePreviewerViewModelTest.kt
@@ -25,6 +25,7 @@ import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.mockito.kotlin.mock
+import kotlin.test.assertNotEquals
 
 @RunWith(AndroidJUnit4::class)
 class TemplatePreviewerViewModelTest : JvmTest() {
@@ -46,6 +47,17 @@ class TemplatePreviewerViewModelTest : JvmTest() {
             assertThat(ordFlow.value, equalTo(3))
         }
 
+    @Test
+    fun `card ords are changed`() {
+        runClozeTest(fields = mutableListOf("{{c1::one}} {{c2::bar}}")) {
+            onPageFinished(false)
+            val ord1 = currentCard.await().ord
+            onTabSelected(1)
+            val ord2 = currentCard.await().ord
+            assertNotEquals(ord1, ord2)
+        }
+    }
+
     private fun runClozeTest(ord: Int = 0, fields: MutableList<String>? = null, block: suspend TemplatePreviewerViewModel.() -> Unit) = runTest {
         val notetype = col.notetypes.byName("Cloze")!!
         val arguments = TemplatePreviewerArguments(