feat: use setCollapsed method from backend #18770

Author: criticalAY

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

@@ -2526,8 +2526,11 @@ open class DeckPicker :
         changes: OpChanges,
         handler: Any?,
     ) {
-        // undo state may have changed
-        invalidateOptionsMenu()
+        lifecycleScope.launch {
+            updateMenuState()
+            // undo state may have changed
+            invalidateOptionsMenu()
+        }
         if (changes.studyQueues && handler !== this && handler !== viewModel) {
             if (!activityPaused) {
                 // No need to update while the activity is paused, because `onResume` calls `refreshState` that calls `updateDeckList`.

AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckPickerViewModel.kt

@@ -22,6 +22,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import anki.card_rendering.EmptyCardsReport
 import anki.collection.OpChanges
+import anki.decks.SetDeckCollapsedRequest
 import anki.i18n.GeneratedTranslations
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.TR
@@ -353,11 +354,17 @@ class DeckPickerViewModel :
 
     fun toggleDeckExpand(deckId: DeckId) =
         viewModelScope.launch {
-            // update DB
-            withCol { decks.collapse(deckId) }
             // update stored state
             dueTree?.find(deckId)?.run {
                 collapsed = !collapsed
+                // Anki uses scope as Reviewer in deck browser
+                withCol {
+                    decks.setCollapsed(
+                        did,
+                        collapsed = collapsed,
+                        SetDeckCollapsedRequest.Scope.REVIEWER,
+                    )
+                }
             }
             flowOfRefreshDeckList.emit(Unit)
         }

libanki/src/main/java/com/ichi2/anki/libanki/Deck.kt

@@ -57,6 +57,12 @@ class Deck : JSONObject {
             put("collapsed", value)
         }
 
+    var browserCollapsed: Boolean
+        get() = optBoolean("browserCollapsed", false)
+        set(value) {
+            put("browserCollapsed", value)
+        }
+
     /**
      * Unique identifier of the deck
      *

libanki/src/main/java/com/ichi2/anki/libanki/Decks.kt

@@ -235,28 +235,27 @@ class Decks(
         TODO()
     }
 
-    @RustCleanup("implement and make public")
     @LibAnkiAlias("set_collapsed")
-    @Suppress("unused", "unused_parameter")
-    private fun setCollapsed(
+    fun setCollapsed(
         deckId: DeckId,
         collapsed: Boolean,
         scope: SetDeckCollapsedRequest.Scope,
-    ): OpChanges {
-        TODO()
-    }
+    ): OpChanges = col.backend.setDeckCollapsed(deckId, collapsed, scope)
 
+    @LibAnkiAlias("collapse")
     fun collapse(did: DeckId) {
         val deck = this.getLegacy(did) ?: return
         deck.collapsed = !deck.collapsed
         this.save(deck)
     }
 
-    @RustCleanup("implement and make public")
     @LibAnkiAlias("collapse_browser")
-    @Suppress("unused", "unused_parameter")
-    private fun collapseBrowser(deckId: DeckId) {
-        TODO()
+    @Suppress("unused")
+    fun collapseBrowser(deckId: DeckId) {
+        val deck = this.getLegacy(deckId) ?: return
+        val collapsed = deck.browserCollapsed
+        deck.browserCollapsed = !collapsed
+        this.save(deck)
     }
 
     fun count(): Int = len(this.allNamesAndIds())