更改部分 UI 下的状态栏表现
This commit is contained in:
@@ -30,11 +30,15 @@ import androidx.compose.ui.unit.sp
|
|||||||
@Preview
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
fun CommentsScreen() {
|
fun CommentsScreen() {
|
||||||
|
StatusBarMaskLayout(
|
||||||
|
darkIcons = true,
|
||||||
|
maskBoxBackgroundColor = Color(0xFFFFFFFF)
|
||||||
|
) {
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.background(color = Color(0xFFFFFFFF))
|
.background(color = Color(0xFFFFFFFF))
|
||||||
.padding(16.dp)
|
.padding(horizontal = 16.dp)
|
||||||
) {
|
) {
|
||||||
NoticeScreenHeader("COMMENTS")
|
NoticeScreenHeader("COMMENTS")
|
||||||
Spacer(modifier = Modifier.height(28.dp))
|
Spacer(modifier = Modifier.height(28.dp))
|
||||||
@@ -50,6 +54,8 @@ fun CommentsScreen() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun NoticeScreenHeader(
|
fun NoticeScreenHeader(
|
||||||
title:String
|
title:String
|
||||||
|
|||||||
@@ -27,11 +27,15 @@ import androidx.compose.ui.unit.sp
|
|||||||
@Preview
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
fun LikePage() {
|
fun LikePage() {
|
||||||
|
StatusBarMaskLayout(
|
||||||
|
darkIcons = true,
|
||||||
|
maskBoxBackgroundColor = Color(0xFFFFFFFF)
|
||||||
|
) {
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.background(color = Color(0xFFFFFFFF))
|
.background(color = Color(0xFFFFFFFF))
|
||||||
.padding(16.dp)
|
.padding(horizontal = 16.dp)
|
||||||
) {
|
) {
|
||||||
NoticeScreenHeader("LIKES")
|
NoticeScreenHeader("LIKES")
|
||||||
Spacer(modifier = Modifier.height(28.dp))
|
Spacer(modifier = Modifier.height(28.dp))
|
||||||
@@ -48,6 +52,8 @@ fun LikePage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LikeItem() {
|
fun LikeItem() {
|
||||||
|
|||||||
@@ -142,32 +142,19 @@ fun NavigationController(navController: NavHostController) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable(route = "Comments") {
|
composable(route = "Comments") {
|
||||||
Box(
|
|
||||||
modifier = Modifier.padding(navigationBarHeight)
|
|
||||||
) {
|
|
||||||
CommentsScreen()
|
CommentsScreen()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
composable(route = "Likes") {
|
composable(route = "Likes") {
|
||||||
Box(
|
|
||||||
modifier = Modifier.padding(navigationBarHeight)
|
|
||||||
) {
|
|
||||||
LikePage()
|
LikePage()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
composable(route = "Followers") {
|
composable(route = "Followers") {
|
||||||
Box(
|
|
||||||
modifier = Modifier.padding()
|
|
||||||
) {
|
|
||||||
FollowerPage()
|
FollowerPage()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
composable(route = "NewPost") {
|
composable(route = "NewPost") {
|
||||||
Box(
|
|
||||||
modifier = Modifier.padding(navigationBarHeight, top = 64.dp)
|
|
||||||
) {
|
|
||||||
NewPostScreen()
|
NewPostScreen()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
composable(route = "EditModification") {
|
composable(route = "EditModification") {
|
||||||
Box(
|
Box(
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ import androidx.compose.ui.unit.sp
|
|||||||
@Composable
|
@Composable
|
||||||
fun NotificationsScreen() {
|
fun NotificationsScreen() {
|
||||||
val navController = LocalNavController.current
|
val navController = LocalNavController.current
|
||||||
|
StatusBarMaskLayout(darkIcons = true) {
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier.fillMaxSize()
|
modifier = Modifier.fillMaxSize()
|
||||||
) {
|
) {
|
||||||
@@ -92,6 +93,8 @@ fun NotificationsScreen() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun NotificationIndicator(
|
fun NotificationIndicator(
|
||||||
notificationCount: Int,
|
notificationCount: Int,
|
||||||
|
|||||||
@@ -48,6 +48,9 @@ import coil.compose.AsyncImage
|
|||||||
@Composable
|
@Composable
|
||||||
fun NewPostScreen() {
|
fun NewPostScreen() {
|
||||||
val model = NewPostViewModel
|
val model = NewPostViewModel
|
||||||
|
StatusBarMaskLayout(
|
||||||
|
darkIcons = true,
|
||||||
|
) {
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
@@ -61,6 +64,8 @@ fun NewPostScreen() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun NewPostTopBar() {
|
fun NewPostTopBar() {
|
||||||
val navController = LocalNavController.current
|
val navController = LocalNavController.current
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
package com.aiosman.riderpro
|
package com.aiosman.riderpro
|
||||||
|
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.ColumnScope
|
import androidx.compose.foundation.layout.ColumnScope
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.WindowInsets
|
import androidx.compose.foundation.layout.WindowInsets
|
||||||
import androidx.compose.foundation.layout.asPaddingValues
|
import androidx.compose.foundation.layout.asPaddingValues
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.systemBars
|
import androidx.compose.foundation.layout.systemBars
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
@@ -29,6 +32,7 @@ fun StatusBarMask(darkIcons: Boolean = true) {
|
|||||||
fun StatusBarMaskLayout(
|
fun StatusBarMaskLayout(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
darkIcons: Boolean = true,
|
darkIcons: Boolean = true,
|
||||||
|
maskBoxBackgroundColor: Color = Color.Transparent,
|
||||||
content: @Composable ColumnScope.() -> Unit
|
content: @Composable ColumnScope.() -> Unit
|
||||||
) {
|
) {
|
||||||
val paddingValues = WindowInsets.systemBars.asPaddingValues()
|
val paddingValues = WindowInsets.systemBars.asPaddingValues()
|
||||||
@@ -39,7 +43,14 @@ fun StatusBarMaskLayout(
|
|||||||
Column(
|
Column(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
) {
|
) {
|
||||||
Spacer(modifier = Modifier.height(paddingValues.calculateTopPadding()))
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.height(paddingValues.calculateTopPadding())
|
||||||
|
.fillMaxWidth()
|
||||||
|
.background(maskBoxBackgroundColor)
|
||||||
|
) {
|
||||||
|
|
||||||
|
}
|
||||||
content()
|
content()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user