From 8cbf9fbcb6bf0db8a12f443970585270170b5d5d Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sun, 12 Jan 2025 14:28:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=85=E5=8A=9E=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E5=8F=AF=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/super12138/todo/ui/navigation/ToDoNavigation.kt    | 4 +++-
 .../kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt   | 2 +-
 .../cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt   | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/ToDoNavigation.kt b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/ToDoNavigation.kt
index 5fe2959..2c3ad76 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/ToDoNavigation.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/ToDoNavigation.kt
@@ -1,5 +1,6 @@
 package cn.super12138.todo.ui.navigation
 
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -22,7 +23,8 @@ fun ToDoNavigation(
     ) {
         composable(ToDoScreen.Main.name) {
             MainPage(
-                viewModel = viewModel()
+                viewModel = viewModel(),
+                modifier = Modifier.fillMaxSize()
             )
         }
     }
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 a69a564..0c0c8a5 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
@@ -92,7 +92,7 @@ fun MainPage(viewModel: MainViewModel, modifier: Modifier = Modifier) {
                 }
             }
         },
-        modifier = modifier.fillMaxSize()
+        modifier = modifier
     ) { innerPadding ->
         Column(modifier = Modifier.padding(innerPadding)) {
             ProgressFragment(
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt
index f8a824d..87a66f4 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt
@@ -8,6 +8,8 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.MaterialTheme
@@ -52,14 +54,16 @@ fun TodoBottomSheet(
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.padding(horizontal = 16.dp)
+            modifier = Modifier
+                .padding(horizontal = 16.dp)
+                .verticalScroll(rememberScrollState())
         ) {
             Text(
                 text = stringResource(if (toDo != null) R.string.title_edit_task else R.string.action_add_task),
                 style = MaterialTheme.typography.headlineMedium
             )
 
-            Spacer(Modifier.size(25.dp))
+            Spacer(Modifier.size(20.dp))
 
             var text by rememberSaveable { mutableStateOf(toDo?.content ?: "") }
             var isError by rememberSaveable { mutableStateOf(false) }