From ad44140ce99ff32eb2efd0c0975750747140a569 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:27:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=9C=A8=E8=BE=93=E5=85=A5=E6=B3=95=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=97=B6=E8=A2=AB=E9=A1=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/super12138/todo/ui/activities/CrashActivity.kt      | 5 ++++-
 .../cn/super12138/todo/ui/activities/MainActivity.kt       | 7 ++++++-
 .../kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt    | 5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt b/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt
index dc439fc..e69a0b5 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt
@@ -6,6 +6,8 @@ import android.view.HapticFeedbackConstants
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import cn.super12138.todo.R
@@ -58,7 +60,8 @@ class CrashActivity : ComponentActivity() {
                     exitApp = {
                         view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                         finishAffinity()
-                    }
+                    },
+                    modifier = Modifier.fillMaxSize()
                 )
             }
         }
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt b/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt
index 5fa890e..aaf60fc 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt
@@ -4,8 +4,10 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
 import cn.super12138.todo.ui.components.Konfetti
 import cn.super12138.todo.ui.navigation.TodoNavigation
@@ -21,7 +23,10 @@ class MainActivity : ComponentActivity() {
                 Surface(color = MaterialTheme.colorScheme.background) {
                     val mainViewModel: MainViewModel = viewModel()
                     val showConfetti = mainViewModel.showConfetti
-                    TodoNavigation(viewModel = mainViewModel)
+                    TodoNavigation(
+                        viewModel = mainViewModel,
+                        modifier = Modifier.fillMaxSize()
+                    )
                     Konfetti(state = showConfetti)
                 }
             }
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 13eaf3d..ffa30f9 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
@@ -9,10 +9,11 @@ import androidx.compose.animation.shrinkOut
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.exclude
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeContent
-import androidx.compose.foundation.layout.safeContentPadding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
@@ -98,7 +99,7 @@ fun MainPage(
                 )
             }
         },
-        contentWindowInsets = WindowInsets.safeContent,
+        contentWindowInsets = WindowInsets.safeContent.exclude(WindowInsets.ime),
         modifier = modifier
     ) { innerPadding ->
         if (windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT) {