refactor(deck-picker): instantiating context menus

Extract the logic from the DeckPicker - the menus should be responsible
 for querying their required data

suspend factory methods are a better abstraction

`bundleOf()` will be deprecated, so remove a few instances

`withCol { decks.select(deckId) }` remains as this is a Deck Picker
concern - this shows the visual change of the deck when long-pressed

Assisted-by: Claude Opus 4.6

Author: david-allison

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

@@ -448,49 +448,25 @@ open class DeckPicker :
         }
     }
 
-    private fun showDeckPickerContextMenu(deckId: DeckId) {
+    private fun showDeckPickerContextMenu(deckId: DeckId) =
         launchCatchingTask {
-            val (deckName, isDynamic, hasBuriedInDeck) =
-                withCol {
-                    decks.select(deckId)
-                    Triple(
-                        decks.name(deckId),
-                        decks.isFiltered(deckId),
-                        sched.haveBuried(),
-                    )
-                }
+            withCol { decks.select(deckId) }
+            val menu = DeckPickerContextMenu.newInstance(deckId)
             CardBrowser.clearLastDeckId()
             updateDeckList()
-            showDialogFragment(
-                DeckPickerContextMenu.newInstance(
-                    id = deckId,
-                    name = deckName,
-                    isDynamic = isDynamic,
-                    hasBuriedInDeck = hasBuriedInDeck,
-                ),
-            )
+            showDialogFragment(menu)
         }
-    }
 
     private fun showDeckPickerRightClickContextMenu(
         deckId: DeckId,
         x: Float,
         y: Float,
-    ) {
-        launchCatchingTask {
-            val (isDynamic, hasBuriedInDeck) =
-                withCol {
-                    decks.select(deckId)
-                    Pair(
-                        decks.isFiltered(deckId),
-                        sched.haveBuried(),
-                    )
-                }
-            updateDeckList()
-            val menuContentProvider = DeckPickerMenuContentProvider(deckId, isDynamic, hasBuriedInDeck, this@DeckPicker)
-            mouseContextMenuHandler = MouseContextMenuHandler(deckPickerBinding.deckPickerContent, menuContentProvider)
-            mouseContextMenuHandler.showContextMenu(deckPickerBinding.decks, x, y)
-        }
+    ) = launchCatchingTask {
+        withCol { decks.select(deckId) }
+        val menuContentProvider = DeckPickerMenuContentProvider.newInstance(deckId, this@DeckPicker)
+        updateDeckList()
+        mouseContextMenuHandler = MouseContextMenuHandler(deckPickerBinding.deckPickerContent, menuContentProvider)
+        mouseContextMenuHandler.showContextMenu(deckPickerBinding.decks, x, y)
     }
 
     // ----------------------------------------------------------------------------

AnkiDroid/src/main/java/com/ichi2/anki/contextmenu/DeckPickerMenuContentProvider.kt

@@ -18,6 +18,7 @@ package com.ichi2.anki.contextmenu
 
 import android.view.Menu
 import android.view.MenuItem
+import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.DeckPicker
 import com.ichi2.anki.dialogs.DeckPickerContextMenu
 import com.ichi2.anki.dialogs.DeckPickerContextMenuResult
@@ -61,6 +62,23 @@ class DeckPickerMenuContentProvider(
     private fun createOptionsList(): List<DeckPickerContextMenu.DeckPickerContextMenuOption> = createOptionsList(isDynamic, hasBuriedInDeck)
 
     companion object {
+        /**
+         * Builds a [DeckPickerMenuContentProvider] for [deckId], reading the dynamic /
+         * has-buried flags from the collection.
+         */
+        suspend fun newInstance(
+            deckId: DeckId,
+            deckPicker: DeckPicker,
+        ): DeckPickerMenuContentProvider =
+            withCol {
+                DeckPickerMenuContentProvider(
+                    id = deckId,
+                    isDynamic = decks.isFiltered(deckId),
+                    hasBuriedInDeck = sched.haveBuried(),
+                    deckPicker = deckPicker,
+                )
+            }
+
         fun createOptionsList(
             isDynamic: Boolean,
             hasBuriedInDeck: Boolean,

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.kt

@@ -20,9 +20,9 @@ import android.os.Bundle
 import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
-import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
+import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.R
 import com.ichi2.anki.analytics.AnalyticsDialogFragment
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
@@ -81,6 +81,23 @@ class DeckPickerContextMenu : AnalyticsDialogFragment() {
     }
 
     companion object {
+        /**
+         * Builds a [DeckPickerContextMenu] for [deckId], reading the deck's name and
+         * the dynamic / has-buried flags from the collection.
+         */
+        suspend fun newInstance(deckId: DeckId): DeckPickerContextMenu =
+            withCol {
+                DeckPickerContextMenu().apply {
+                    arguments =
+                        Bundle().apply {
+                            putLong(ARG_DECK_ID, deckId)
+                            putString(ARG_DECK_NAME, decks.name(deckId))
+                            putBoolean(ARG_DECK_IS_DYN, decks.isFiltered(deckId))
+                            putBoolean(ARG_DECK_HAS_BURIED_IN_DECK, sched.haveBuried())
+                        }
+                }
+            }
+
         @VisibleForTesting
         const val ARG_DECK_ID = "arg_deck_id"
 
@@ -92,22 +109,6 @@ class DeckPickerContextMenu : AnalyticsDialogFragment() {
 
         @VisibleForTesting
         const val ARG_DECK_HAS_BURIED_IN_DECK = "arg_deck_has_buried_in_deck"
-
-        fun newInstance(
-            id: DeckId,
-            name: String,
-            isDynamic: Boolean,
-            hasBuriedInDeck: Boolean,
-        ): DeckPickerContextMenu =
-            DeckPickerContextMenu().apply {
-                arguments =
-                    bundleOf(
-                        ARG_DECK_ID to id,
-                        ARG_DECK_NAME to name,
-                        ARG_DECK_IS_DYN to isDynamic,
-                        ARG_DECK_HAS_BURIED_IN_DECK to hasBuriedInDeck,
-                    )
-            }
     }
 }