From ae64b1912573e2685cabcd5563edfab433e50ad7 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Tue, 5 Aug 2025 17:45:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20#183=20Noting=202a=20=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E4=B8=8B=E9=A1=B5=E9=9D=A2=E8=BE=B9=E8=B7=9D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todo/ui/pages/crash/CrashPage.kt          |  3 +--
 .../super12138/todo/ui/pages/main/MainPage.kt | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt
index 65b98de..547e84e 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContent
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
@@ -85,7 +84,7 @@ fun CrashPage(
                 expanded = isExpanded
             )
         },
-        contentWindowInsets = WindowInsets.safeContent
+        contentWindowInsets = WindowInsets(0, 0, 0, 0)
     ) { innerPadding ->
         val context = LocalContext.current
         val packageName = context.packageName
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 00ce89f..a2ec7c9 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
@@ -63,7 +63,8 @@ fun MainPage(
     val toDoList by remember { derivedStateOf { toDos.value } }
     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 }
+    val filteredTodoList =
+        if (showCompleted) toDoList else toDoList.filter { item -> !item.isCompleted }
 
     // 当按下返回键（或进行返回操作）时清空选择，仅在非选择模式下生效
     BackHandler(inSelectedMode) { viewModel.clearAllTodoSelection() }
@@ -103,11 +104,16 @@ fun MainPage(
                 }
             }
         },
-        contentWindowInsets = WindowInsets(0,0,0,0),
+        contentWindowInsets = WindowInsets(0, 0, 0, 0),
         modifier = modifier
     ) { innerPadding ->
         if (windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT) {
-            Column(modifier = Modifier.padding(innerPadding)) {
+            Column(
+                modifier = Modifier.padding(
+                    top = innerPadding.calculateTopPadding(),
+                    bottom = innerPadding.calculateBottomPadding()
+                )
+            ) {
                 ProgressFragment(
                     totalTasks = totalTasks,
                     completedTasks = completedTasks,
@@ -151,7 +157,12 @@ fun MainPage(
                 )
             }
         } else {
-            Row(modifier = Modifier.padding(innerPadding)) {
+            Row(
+                modifier = Modifier.padding(
+                    top = innerPadding.calculateTopPadding(),
+                    bottom = innerPadding.calculateBottomPadding()
+                )
+            ) {
                 ProgressFragment(
                     totalTasks = totalTasks,
                     completedTasks = completedTasks,