From d133670cc53616eb73a507aa6fa21966c1622a1e Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:55:11 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  2 +-
 .../todo/logic/model/SortingMethod.kt         |  5 ----
 .../super12138/todo/ui/pages/main/MainPage.kt | 29 ++++---------------
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b7c1227..b543191 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -35,7 +35,7 @@ android {
         applicationId = "cn.super12138.todo"
         minSdk = 24
         targetSdk = 36
-        versionCode = 748
+        versionCode = 753
         versionName = "2.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt b/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt
index 2c73a4c..ab2c03e 100644
--- a/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt
@@ -6,19 +6,14 @@ import cn.super12138.todo.R
 enum class SortingMethod(val id: Int) {
     // 按添加先后顺序
     Sequential(1),
-
     // 按学科
     Category(2),
-
     // 按优先级
     Priority(3),
-
     // 按完成情况
     Completion(4),
-
     // 按字母升序
     AlphabeticalAscending(5),
-
     // 按字母降序
     AlphabeticalDescending(6);
 
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt
index 92fb5bd..e5f3659 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt
@@ -50,36 +50,19 @@ fun MainPage(
     modifier: Modifier = Modifier
 ) {
     val toDos = viewModel.sortedTodos.collectAsState(initial = emptyList())
-    val listState = rememberLazyListState()
-    /*val isExpanded by remember {
-        derivedStateOf {
-            listState.firstVisibleItemIndex == 0
-        }
-    }*/
-
     val selectedTodos = viewModel.selectedTodoIds.collectAsState()
-    var showDeleteConfirmDialog by rememberSaveable { mutableStateOf(false) }
-
+    val showCompleted by DataStoreManager.showCompletedFlow.collectAsState(initial = Constants.PREF_SHOW_COMPLETED_DEFAULT)
     val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
 
-    val selectedTodoIds by remember {
-        derivedStateOf { selectedTodos.value }
-    }
-    val isSelectedIdsEmpty by remember {
-        derivedStateOf {
-            selectedTodoIds.isEmpty()
-        }
-    }
+    val listState = rememberLazyListState()
+    var showDeleteConfirmDialog by rememberSaveable { mutableStateOf(false) }
 
+    val selectedTodoIds by remember { derivedStateOf { selectedTodos.value } }
+    val isSelectedIdsEmpty by remember { derivedStateOf { selectedTodoIds.isEmpty() } }
     val toDoList by remember { derivedStateOf { toDos.value } }
-
-    // Theme
-    val showCompleted by DataStoreManager.showCompletedFlow.collectAsState(initial = Constants.PREF_SHOW_COMPLETED_DEFAULT)
-    val filteredTodoList =
-        if (showCompleted) toDoList else toDoList.filter { item -> !item.isCompleted }
-
     val totalTasks by remember { derivedStateOf { toDoList.size } }
     val completedTasks by remember { derivedStateOf { toDoList.count { it.isCompleted } } }
+    val filteredTodoList =  if (showCompleted) toDoList else toDoList.filter { item -> !item.isCompleted }
 
     BackHandler(enabled = !isSelectedIdsEmpty) {
         // 当按下返回键（或进行返回操作）时清空选择