improvement(new-card-browser): deck selection chip

Adds a Chip control for selecting the current deck

For issue 18709: Material Search View

Author: david-allison

AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt

@@ -76,7 +76,6 @@ import com.ichi2.anki.dialogs.BrowserOptionsDialog
 import com.ichi2.anki.dialogs.CardBrowserOrderDialog
 import com.ichi2.anki.dialogs.CreateDeckDialog
 import com.ichi2.anki.dialogs.DeckSelectionDialog
-import com.ichi2.anki.dialogs.DeckSelectionDialog.Companion.newInstance
 import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckSelectionListener
 import com.ichi2.anki.dialogs.SimpleMessageDialog
 import com.ichi2.anki.dialogs.tags.TagsDialog
@@ -102,6 +101,7 @@ import com.ichi2.anki.utils.ext.ifNotZero
 import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.utils.ext.visibleItemPositions
+import com.ichi2.anki.utils.showDialogFragmentImpl
 import com.ichi2.anki.withProgress
 import com.ichi2.utils.HandlerUtils
 import com.ichi2.utils.TagsUtil.getUpdatedTags
@@ -219,7 +219,10 @@ class CardBrowserFragment :
 
         progressIndicator = view.findViewById(R.id.browser_progress)
 
-        deckChip = view.findViewById<Chip>(R.id.chip_decks)
+        deckChip =
+            view.findViewById<Chip>(R.id.chip_decks)?.apply {
+                setOnClickListener { viewModel.openDeckSelectionDialog() }
+            }
         searchBar =
             view.findViewById<SearchBar>(R.id.search_bar)?.apply {
                 setNavigationOnClickListener {
@@ -436,6 +439,21 @@ class CardBrowserFragment :
                 )
         }
 
+        fun onSearchForDecks(decks: List<SelectableDeck>) {
+            val dialog =
+                DeckSelectionDialog.newInstance(
+                    title = getString(R.string.search_deck),
+                    summaryMessage = null,
+                    keepRestoreDefaultButton = false,
+                    decks = decks,
+                )
+            showDialogFragmentImpl(childFragmentManager, dialog)
+        }
+
+        fun onDeckChanged(deck: SelectableDeck?) {
+            deckChip?.text = deck?.getDisplayName(requireContext())
+        }
+
         activityViewModel.flowOfIsTruncated.launchCollectionInLifecycleScope(::onIsTruncatedChanged)
         activityViewModel.flowOfSelectedRows.launchCollectionInLifecycleScope(::onSelectedRowsChanged)
         activityViewModel.flowOfActiveColumns.launchCollectionInLifecycleScope(::onColumnsChanged)
@@ -445,6 +463,8 @@ class CardBrowserFragment :
         activityViewModel.flowOfColumnHeadings.launchCollectionInLifecycleScope(::onColumnNamesChanged)
         activityViewModel.flowOfCardStateChanged.launchCollectionInLifecycleScope(::onCardsMarkedEvent)
         activityViewModel.flowOfToggleSelectionState.launchCollectionInLifecycleScope(::onToggleSelectionStateUpdated)
+        viewModel.flowOfSearchForDecks.launchCollectionInLifecycleScope(::onSearchForDecks)
+        activityViewModel.flowOfDeckSelection.launchCollectionInLifecycleScope(::onDeckChanged)
     }
 
     private fun setupFragmentResultListeners() {
@@ -847,7 +867,7 @@ class CardBrowserFragment :
     @VisibleForTesting
     internal fun getChangeDeckDialog(selectableDecks: List<SelectableDeck>?): DeckSelectionDialog {
         val dialog =
-            newInstance(
+            DeckSelectionDialog.newInstance(
                 getString(R.string.move_all_to_deck),
                 null,
                 false,

AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragmentViewModel.kt

@@ -17,5 +17,19 @@
 package com.ichi2.anki.browser
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ichi2.anki.common.annotations.NeedsTest
+import com.ichi2.anki.model.SelectableDeck
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
 
-class CardBrowserFragmentViewModel : ViewModel()
+class CardBrowserFragmentViewModel : ViewModel() {
+    val flowOfSearchForDecks = MutableSharedFlow<List<SelectableDeck>>()
+
+    @NeedsTest("default usage")
+    fun openDeckSelectionDialog() =
+        viewModelScope.launch {
+            val decks = listOf(SelectableDeck.AllDecks) + SelectableDeck.fromCollection(includeFiltered = true)
+            flowOfSearchForDecks.emit(decks)
+        }
+}

AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt

@@ -307,9 +307,19 @@ class CardBrowserViewModel(
         flowOfDeckId.update { deckId }
     }
 
+    // TODO: replace with flowOfDeckSelection
     val flowOfDeckId = MutableStateFlow(lastDeckId)
     val deckId get() = flowOfDeckId.value
 
+    val flowOfDeckSelection =
+        flowOfDeckId.map { did ->
+            when (did) {
+                ALL_DECKS_ID -> return@map SelectableDeck.AllDecks
+                null -> return@map null
+                else -> return@map SelectableDeck.Deck.fromId(did)
+            }
+        }
+
     suspend fun queryCardInfoDestination(): CardInfoDestination? {
         val firstSelectedCard = selectedRows.firstOrNull()?.toCardId(cardsOrNotes) ?: return null
         return CardInfoDestination(firstSelectedCard)

AnkiDroid/src/main/java/com/ichi2/anki/model/SelectableDeck.kt

@@ -19,6 +19,7 @@ package com.ichi2.anki.model
 import android.content.Context
 import android.os.Parcelable
 import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.R
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.DeckNameId
@@ -37,6 +38,10 @@ sealed class SelectableDeck : Parcelable {
         val name: String,
     ) : SelectableDeck() {
         constructor(d: DeckNameId) : this(d.id, d.name)
+
+        companion object {
+            suspend fun fromId(id: DeckId): Deck = Deck(deckId = id, name = withCol { decks.name(id) })
+        }
     }
 
     /**