diff --git a/app/src/main/kotlin/top/yeij/cyrene/ui/chat/ChatScreen.kt b/app/src/main/kotlin/top/yeij/cyrene/ui/chat/ChatScreen.kt index cd7f516..ad68f3c 100644 --- a/app/src/main/kotlin/top/yeij/cyrene/ui/chat/ChatScreen.kt +++ b/app/src/main/kotlin/top/yeij/cyrene/ui/chat/ChatScreen.kt @@ -37,7 +37,6 @@ import top.yukonga.miuix.kmp.basic.IconButton import top.yukonga.miuix.kmp.basic.Scaffold import top.yukonga.miuix.kmp.basic.SmallTopAppBar import top.yukonga.miuix.kmp.basic.Text -import top.yukonga.miuix.kmp.basic.TextButton import top.yukonga.miuix.kmp.basic.TextField import top.yukonga.miuix.kmp.icon.MiuixIcons import top.yukonga.miuix.kmp.icon.basic.Sidebar @@ -103,9 +102,6 @@ fun ChatScreen( Icon(imageVector = MiuixIcons.Basic.Sidebar, contentDescription = "菜单") } }, - actions = { - TextButton("登出", onClick = onLogout) - }, ) }, bottomBar = { diff --git a/app/src/main/kotlin/top/yeij/cyrene/ui/common/MiuixDrawer.kt b/app/src/main/kotlin/top/yeij/cyrene/ui/common/MiuixDrawer.kt index 708f184..0aad6de 100644 --- a/app/src/main/kotlin/top/yeij/cyrene/ui/common/MiuixDrawer.kt +++ b/app/src/main/kotlin/top/yeij/cyrene/ui/common/MiuixDrawer.kt @@ -12,10 +12,13 @@ import androidx.compose.foundation.gestures.rememberDraggableState import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.derivedStateOf @@ -198,7 +201,9 @@ fun MiuixDrawer( y = 0, ) } - .background(MiuixTheme.colorScheme.surface), + .background(MiuixTheme.colorScheme.surface) + // 面板铺满全高(背景仍到底),内容再避开状态栏 / 导航栏 + .windowInsetsPadding(WindowInsets.systemBars), ) { drawerContent() }