Support deleting/undoing deck from deck picker

+ Delete the cards inside the default deck if user tries to delete it Closes #11703
ankidroid · Jun 30, 2022 · 2e6d415 · 2e6d415
1 parent 7ba4ab1
commit 2e6d415
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -92,11 +92,8 @@ import com.ichi2.async.CollectionTask.*
 import com.ichi2.async.Connection.CancellableTaskListener
 import com.ichi2.async.Connection.ConflictResolution
 import com.ichi2.compat.CompatHelper.Companion.sdkVersion
-import com.ichi2.libanki.ChangeManager
+import com.ichi2.libanki.*
 import com.ichi2.libanki.Collection.CheckDatabaseResult
-import com.ichi2.libanki.Consts
-import com.ichi2.libanki.Decks
-import com.ichi2.libanki.Utils
 import com.ichi2.libanki.importer.AnkiPackageImporter
 import com.ichi2.libanki.sched.AbstractDeckTreeNode
 import com.ichi2.libanki.sched.TreeNode
@@ -2229,6 +2226,24 @@ open class DeckPicker :
     }
 
     fun confirmDeckDeletion(did: Long) {
+        if (!BackendFactory.defaultLegacySchema) {
+            dismissAllDialogFragments()
+            // No confirmation required, as undoable
+            launchCatchingCollectionTask { col ->
+                val changes = runInBackgroundWithProgress {
+                    undoableOp {
+                        col.newDecks.removeDecks(listOf(did))
+                    }
+                }
+                showSimpleSnackbar(
+                    this@DeckPicker,
+                    col.tr.browsingCardsDeleted(changes.count),
+                    false
+                )
+            }
+            return
+        }
+
         val res = resources
         if (!colIsOpen()) {
             return