extract: repositionSelectedRows

BrayanDSO · Dec 8, 2023 · 1747ac9 · 1747ac9
1 parent d08d1b6
commit 1747ac9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -1154,7 +1154,7 @@ open class CardBrowser :
                         prompt = this@CardBrowser.getString(R.string.reposition_card_dialog_message),
                         digits = 5
                     )
-                    setCallbackRunnable { pos -> repositionCardsNoValidation(selectedCardIds, pos) }
+                    setCallbackRunnable(::repositionCardsNoValidation)
                 }
                 showDialogFragment(repositionDialog)
                 return true
@@ -1226,23 +1226,16 @@ open class CardBrowser :
     }
 
     @VisibleForTesting
-    fun repositionCardsNoValidation(cardIds: List<CardId>, position: Int) {
-        launchCatchingTask {
-            val changes = withProgress {
-                undoableOp {
-                    sched.sortCards(cardIds, position, 1, false, true)
-                }
-            }
-            val count = changes.count
-            showSnackbar(
-                resources.getQuantityString(
-                    R.plurals.reposition_card_dialog_acknowledge,
-                    count,
-                    count
-                ),
-                Snackbar.LENGTH_SHORT
-            )
-        }
+    fun repositionCardsNoValidation(position: Int) = launchCatchingTask {
+        val count = withProgress { viewModel.repositionSelectedRows(position) }
+        showSnackbar(
+            resources.getQuantityString(
+                R.plurals.reposition_card_dialog_acknowledge,
+                count,
+                count
+            ),
+            Snackbar.LENGTH_SHORT
+        )
     }
 
     protected fun onPreview() {

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -209,6 +209,14 @@ class CardBrowserViewModel(
         }
     }
 
+    /**
+     * @see [com.ichi2.libanki.sched.Scheduler.sortCards]
+     * @return the number of cards which were repositioned
+     */
+    suspend fun repositionSelectedRows(position: Int) = undoableOp {
+        sched.sortCards(selectedCardIds, position, 1, shuffle = false, shift = true)
+    }.count
+
     companion object {
         const val DISPLAY_COLUMN_1_KEY = "cardBrowserColumn1"
         const val DISPLAY_COLUMN_2_KEY = "cardBrowserColumn2"

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -519,7 +519,7 @@ class CardBrowserTest : RobolectricTest() {
             equalTo("1")
         )
 
-        b.repositionCardsNoValidation(listOf(card.id), 2)
+        b.viewModel.repositionSelectedRows(2)
 
         card.reload()
 
@@ -601,7 +601,7 @@ class CardBrowserTest : RobolectricTest() {
             equalTo("1")
         )
 
-        b.repositionCardsNoValidation(listOf(card.id), 2)
+        b.repositionCardsNoValidation(2)
 
         assertThat(
             "Position of checked card after reposition",