refactor(card-browser): inline formatCardCount

* move properties from 'SearchResultMessage' to 'SearchState.Completed'
  * meaning we can format '0 cards shown'
  * so make it an extension method

Assisted-by: Claude Opus 4.7 - implementation

Author: david-allison

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

@@ -521,9 +521,7 @@ open class CardBrowser :
                     }
                 }
                 is SearchState.Completed -> {
-                    Timber.i("CardBrowser:: Completed searchCards() Successfully")
-                    // TODO: obtain these values from 'Completed'
-                    findViewById<TextView>(R.id.subtitle)?.text = formatCardCount(viewModel.rowCount, viewModel.cardsOrNotes)
+                    findViewById<TextView>(R.id.subtitle)?.text = searchState.formatCardCount(resources)
                     // HACK: required now we use MenuProvider for searches
                     // this causes a very brief flicker, as we call `setQuery` to restore the menu state
                     searchView?.post { searchView?.clearFocus() }
@@ -824,19 +822,6 @@ open class CardBrowser :
         }
     }
 
-    fun formatCardCount(
-        count: Int,
-        cardsOrNotes: CardsOrNotes,
-    ): String {
-        @androidx.annotation.StringRes val subtitleId =
-            if (cardsOrNotes == CARDS) {
-                R.plurals.card_browser_subtitle
-            } else {
-                R.plurals.card_browser_subtitle_notes_mode
-            }
-        return resources.getQuantityString(subtitleId, count, count)
-    }
-
     @RustCleanup("this isn't how Desktop Anki does it")
     override fun onSelectedTags(
         selectedTags: List<String>,
@@ -992,3 +977,11 @@ suspend fun searchForRows(
     }.let { ids ->
         BrowserRowCollection(cardsOrNotes, ids.map { CardOrNoteId(it) }.toMutableList())
     }
+
+/** Renders the row count for [this] event as a localized "X cards/notes" string. */
+fun SearchState.Completed.formatCardCount(resources: android.content.res.Resources): String =
+    resources.getQuantityString(
+        if (cardsOrNotes == CARDS) R.plurals.card_browser_subtitle else R.plurals.card_browser_subtitle_notes_mode,
+        rowCount,
+        rowCount,
+    )

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

@@ -114,6 +114,7 @@ import com.ichi2.anki.dialogs.tags.TagsDialogFactory
 import com.ichi2.anki.dialogs.tags.TagsDialogListener
 import com.ichi2.anki.export.ExportDialogFragment
 import com.ichi2.anki.filtered.FilteredDeckOptionsFragment
+import com.ichi2.anki.formatCardCount
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.undoAvailable
@@ -849,7 +850,7 @@ class CardBrowserFragment :
             }
         }
 
-        fun onSearchResultMessage(result: SearchResultMessage) {
+        fun onSearchCompleted(state: SearchState.Completed) {
             val activity = requireCardBrowserActivity()
 
             // #3592: show the number of cards found the number of cards is not visible in the menu
@@ -869,10 +870,10 @@ class CardBrowserFragment :
                 }
             }
 
-            when (result) {
+            when (val result = state.resultMessage) {
                 is SearchResultMessage.CardCount ->
                     showSnackbar(
-                        message = activity.formatCardCount(result.count, result.cardsOrNotes),
+                        message = state.formatCardCount(resources),
                         searchAllDecks = result.includeSearchAllDecksAction,
                     )
                 SearchResultMessage.NoCardsInSelectedDeck ->
@@ -887,7 +888,7 @@ class CardBrowserFragment :
             cardsAdapter.notifyDataSetChanged()
             progressIndicator.isVisible = searchState == Initializing || searchState == Searching
             if (searchState is SearchState.Completed) {
-                onSearchResultMessage(searchState.resultMessage)
+                onSearchCompleted(searchState)
                 invalidateMenu()
             }
         }

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

@@ -180,8 +180,6 @@ class CardBrowserViewModel(
     sealed interface SearchResultMessage {
         /** "X cards/notes shown | Search all decks" */
         data class CardCount(
-            val count: Int,
-            val cardsOrNotes: CardsOrNotes,
             val includeSearchAllDecksAction: Boolean,
         ) : SearchResultMessage
 
@@ -1511,12 +1509,14 @@ class CardBrowserViewModel(
     /** Builds a [SearchState.Completed] event reflecting the current ViewModel state. */
     private fun SearchState.Completed.Companion.fromCurrentState(): SearchState.Completed =
         SearchState.Completed(
+            rowCount = rowCount,
+            cardsOrNotes = cardsOrNotes,
             resultMessage =
                 when {
                     // TODO: better message if rowCount == 0 AND hasSelectedAllDecks
-                    hasSelectedAllDecks() -> SearchResultMessage.CardCount(rowCount, cardsOrNotes, includeSearchAllDecksAction = false)
+                    hasSelectedAllDecks() -> SearchResultMessage.CardCount(includeSearchAllDecksAction = false)
                     rowCount == 0 -> SearchResultMessage.NoCardsInSelectedDeck
-                    else -> SearchResultMessage.CardCount(rowCount, cardsOrNotes, includeSearchAllDecksAction = true)
+                    else -> SearchResultMessage.CardCount(includeSearchAllDecksAction = true)
                 },
         )
 
@@ -1637,6 +1637,8 @@ class CardBrowserViewModel(
 
         /** A search has been completed */
         data class Completed(
+            val rowCount: Int,
+            val cardsOrNotes: CardsOrNotes,
             val resultMessage: SearchResultMessage,
         ) : SearchState {
             companion object

AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt

@@ -1538,10 +1538,10 @@ class CardBrowserViewModelTest : JvmTest() {
             flowOfSearchState.test {
                 ignoreEventsDuringViewModelInit()
                 setSelectedDeck(SelectableDeck.AllDecks)
-                val message = awaitSearchCompleted().resultMessage
-                val card = message as CardBrowserViewModel.SearchResultMessage.CardCount
-                assertThat("count", card.count, equalTo(3))
-                assertThat("cardsOrNotes", card.cardsOrNotes, equalTo(CardsOrNotes.CARDS))
+                val completed = awaitSearchCompleted()
+                val card = completed.resultMessage as CardBrowserViewModel.SearchResultMessage.CardCount
+                assertThat("count", completed.rowCount, equalTo(3))
+                assertThat("cardsOrNotes", completed.cardsOrNotes, equalTo(CardsOrNotes.CARDS))
                 assertThat("no all-decks action when already on all decks", card.includeSearchAllDecksAction, equalTo(false))
             }
         }