diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/StatusBarMask.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/StatusBarMask.kt index d286bfe..0fa9773 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/composables/StatusBarMask.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/composables/StatusBarMask.kt @@ -25,7 +25,6 @@ fun StatusBarMask(darkIcons: Boolean = true) { val systemUiController = rememberSystemUiController() LaunchedEffect(Unit) { systemUiController.setStatusBarColor(Color.Transparent, darkIcons = darkIcons) - } Spacer(modifier = Modifier.height(paddingValues.calculateTopPadding())) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/StatusBarSpacer.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/StatusBarSpacer.kt new file mode 100644 index 0000000..74be7ef --- /dev/null +++ b/app/src/main/java/com/aiosman/riderpro/ui/composables/StatusBarSpacer.kt @@ -0,0 +1,15 @@ +package com.aiosman.riderpro.ui.composables + +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.systemBars +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + +@Composable +fun StatusBarSpacer() { + val paddingValues = WindowInsets.systemBars.asPaddingValues() + Spacer(modifier = Modifier.height(paddingValues.calculateTopPadding())) +} \ No newline at end of file diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt index 8ee8928..86742ad 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt @@ -68,14 +68,14 @@ fun NotificationsScreen() { ) { Spacer( modifier = Modifier.padding( - top = statusBarPaddingValues.calculateTopPadding(), +// top = statusBarPaddingValues.calculateTopPadding(), bottom = navigationBarPaddings ) ) Box( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 24.dp, vertical = 16.dp) + .padding(horizontal = 24.dp) ) { Image( painter = painterResource(id = R.drawable.rider_pro_message_title), diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt index d8e85ad..5597e2f 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt @@ -94,6 +94,7 @@ import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder import com.aiosman.riderpro.ui.composables.CustomAsyncImage import com.aiosman.riderpro.ui.composables.EditCommentBottomModal +import com.aiosman.riderpro.ui.composables.StatusBarSpacer import com.aiosman.riderpro.ui.imageviewer.ImageViewerViewModel import com.aiosman.riderpro.ui.index.tabs.moment.MomentViewModel import com.aiosman.riderpro.ui.modifiers.noRippleClickable @@ -261,10 +262,10 @@ fun PostScreen( val scrollState = rememberLazyListState() val uiController = rememberSystemUiController() LaunchedEffect(Unit) { - uiController.setNavigationBarColor(Color.Transparent) +// uiController.setNavigationBarColor(Color.Transparent) viewModel.initData() } - StatusBarMaskLayout { + Scaffold( modifier = Modifier.fillMaxSize(), bottomBar = { @@ -302,6 +303,7 @@ fun PostScreen( modifier = Modifier .fillMaxSize() ) { + StatusBarSpacer() Header( avatar = viewModel.avatar, nickname = viewModel.nickname, @@ -363,7 +365,7 @@ fun PostScreen( } } } - } + } @Composable