From f80174160843a1b83350f4193de690e1365b5de1 Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:59:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=A2=AB=E7=B3=BB=E7=BB=9F=E7=8A=B6=E6=80=81=E6=A0=8F=E9=81=AE?= =?UTF-8?q?=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt | 3 ++- .../main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt b/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt index e0866fd..f14c366 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt @@ -58,7 +58,8 @@ fun LargeTopAppBarScaffold( ) } }, - scrollBehavior = scrollBehavior + scrollBehavior = scrollBehavior, + contentWindowInsets = contentWindowInsets ) { innerPadding -> Box { content(innerPadding) } } 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 3599c1b..13eaf3d 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 @@ -8,8 +8,10 @@ import androidx.compose.animation.fadeOut 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.fillMaxSize 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 @@ -96,6 +98,7 @@ fun MainPage( ) } }, + contentWindowInsets = WindowInsets.safeContent, modifier = modifier ) { innerPadding -> if (windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT) { @@ -180,7 +183,6 @@ fun MainPage( selectedTodoIds = selectedTodoIds.value, modifier = Modifier .weight(3f) - .safeContentPadding() .fillMaxSize() ) }