From 7dbc06d1027455dd4882b928d9a2c2449b3ccd35 Mon Sep 17 00:00:00 2001
From: inventory69 <admin@sad.run>
Date: Wed, 11 Feb 2026 09:35:25 +0100
Subject: [PATCH] fix(editor): IMPL_03-FIX - Fix sort option not applied when
 reopening checklist

Changes:
- NoteEditorViewModel.sortChecklistItems(): Use _lastChecklistSortOption.value instead of always sorting unchecked-first
- Supports all sort modes: MANUAL, UNCHECKED_FIRST, CHECKED_FIRST, ALPHABETICAL_ASC/DESC
- reloadFromStorage() also benefits from fix (uses same sortChecklistItems method)
- Root cause: loadNote() correctly restored _lastChecklistSortOption but sortChecklistItems() ignored it
---
 .../ui/editor/NoteEditorViewModel.kt          | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/dev/dettmer/simplenotes/ui/editor/NoteEditorViewModel.kt b/android/app/src/main/java/dev/dettmer/simplenotes/ui/editor/NoteEditorViewModel.kt
index 610a571..1e84236 100644
--- a/android/app/src/main/java/dev/dettmer/simplenotes/ui/editor/NoteEditorViewModel.kt
+++ b/android/app/src/main/java/dev/dettmer/simplenotes/ui/editor/NoteEditorViewModel.kt
@@ -183,11 +183,28 @@ class NoteEditorViewModel(
      * 🆕 v1.8.0 (IMPL_017): Sortiert Checklist-Items mit Unchecked oben, Checked unten.
      * Stabile Sortierung: Relative Reihenfolge innerhalb jeder Gruppe bleibt erhalten.
      */
+    /**
+     * Sortiert Checklist-Items basierend auf der aktuellen Sortier-Option.
+     * 🆕 v1.8.1 (IMPL_03-FIX): Berücksichtigt jetzt _lastChecklistSortOption
+     * anstatt immer unchecked-first zu sortieren.
+     */
     private fun sortChecklistItems(items: List<ChecklistItemState>): List<ChecklistItemState> {
-        val unchecked = items.filter { !it.isChecked }
-        val checked = items.filter { it.isChecked }
+        val sorted = when (_lastChecklistSortOption.value) {
+            ChecklistSortOption.MANUAL,
+            ChecklistSortOption.UNCHECKED_FIRST -> {
+                val unchecked = items.filter { !it.isChecked }
+                val checked = items.filter { it.isChecked }
+                unchecked + checked
+            }
+            ChecklistSortOption.CHECKED_FIRST ->
+                items.sortedByDescending { it.isChecked }
+            ChecklistSortOption.ALPHABETICAL_ASC ->
+                items.sortedBy { it.text.lowercase() }
+            ChecklistSortOption.ALPHABETICAL_DESC ->
+                items.sortedByDescending { it.text.lowercase() }
+        }
 
-        return (unchecked + checked).mapIndexed { index, item ->
+        return sorted.mapIndexed { index, item ->
             item.copy(order = index)
         }
     }