diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/TextFields.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/TextFields.kt index 980d23b9..6463efe8 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/TextFields.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/TextFields.kt @@ -18,6 +18,7 @@ import androidx.compose.runtime.Stable import androidx.compose.runtime.State import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor @@ -48,13 +49,17 @@ fun BaseTextField( colors: TextFieldColors = TextFieldDefaults.textFieldColors(), decorationBox: @Composable (innerTextField: @Composable () -> Unit) -> Unit = { innerTextField -> - PlaceholderDecoration( - show = value.isEmpty(), - placeholderColor = colors.placeholderColor(enabled = enabled).value, - placeholder = placeholder - ) - innerTextField() - } + Box( + contentAlignment = Alignment.CenterStart + ) { + PlaceholderDecoration( + show = value.isEmpty(), + placeholderColor = colors.placeholderColor(enabled = enabled).value, + placeholder = placeholder + ) + innerTextField() + } + }, ) { val textColor = textStyle.color.takeOrElse { colors.textColor(enabled).value @@ -267,7 +272,7 @@ object TextFieldDefaults { disabledTextColor: Color = textColor.copy(alpha = ContentAlpha.disabled), backgroundColor: Color = Color.Transparent, cursorColor: Color = ExtendedTheme.colors.accent, - placeholderColor: Color = ExtendedTheme.colors.text.copy(alpha = ContentAlpha.medium), + placeholderColor: Color = ExtendedTheme.colors.textSecondary.copy(alpha = ContentAlpha.medium), disabledPlaceholderColor: Color = placeholderColor.copy(alpha = ContentAlpha.disabled), ): TextFieldColors = DefaultTextFieldColors( diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt index 8f78daba..b7c3b4dd 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt @@ -339,9 +339,10 @@ fun Toolbar( @Composable fun TopAppBarContainer( topBar: @Composable ColumnScope.() -> Unit, - content: @Composable (ColumnScope.() -> Unit)? = null + modifier: Modifier = Modifier, + content: @Composable (ColumnScope.() -> Unit)? = null, ) { - Column { + Column(modifier) { Spacer( modifier = Modifier .windowInsetsTopHeight(WindowInsets.statusBars)