Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref: UI 细节

This commit is contained in:
HuanCheng65 2023-09-21 16:12:04 +08:00
parent cbf1fe64c4
commit 4626f3e784
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/TextFields.kt
View File

@ -18,6 +18,7 @@ import androidx.compose.runtime.Stable
import androidx.compose.runtime.State import androidx.compose.runtime.State
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.SolidColor
@ -48,6 +49,9 @@ fun BaseTextField(
colors: TextFieldColors = TextFieldDefaults.textFieldColors(), colors: TextFieldColors = TextFieldDefaults.textFieldColors(),
decorationBox: @Composable (innerTextField: @Composable () -> Unit) -> Unit = decorationBox: @Composable (innerTextField: @Composable () -> Unit) -> Unit =
{ innerTextField -> { innerTextField ->
Box(
contentAlignment = Alignment.CenterStart
) {
PlaceholderDecoration( PlaceholderDecoration(
show = value.isEmpty(), show = value.isEmpty(),
placeholderColor = colors.placeholderColor(enabled = enabled).value, placeholderColor = colors.placeholderColor(enabled = enabled).value,
@ -55,6 +59,7 @@ fun BaseTextField(
) )
innerTextField() innerTextField()
} }
},
) { ) {
val textColor = textStyle.color.takeOrElse { val textColor = textStyle.color.takeOrElse {
colors.textColor(enabled).value colors.textColor(enabled).value
@ -267,7 +272,7 @@ object TextFieldDefaults {
disabledTextColor: Color = textColor.copy(alpha = ContentAlpha.disabled), disabledTextColor: Color = textColor.copy(alpha = ContentAlpha.disabled),
backgroundColor: Color = Color.Transparent, backgroundColor: Color = Color.Transparent,
cursorColor: Color = ExtendedTheme.colors.accent, 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), disabledPlaceholderColor: Color = placeholderColor.copy(alpha = ContentAlpha.disabled),
): TextFieldColors = ): TextFieldColors =
DefaultTextFieldColors( DefaultTextFieldColors(

5
app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt
View File

@ -339,9 +339,10 @@ fun Toolbar(
@Composable @Composable
fun TopAppBarContainer( fun TopAppBarContainer(
topBar: @Composable ColumnScope.() -> Unit, topBar: @Composable ColumnScope.() -> Unit,
content: @Composable (ColumnScope.() -> Unit)? = null modifier: Modifier = Modifier,
content: @Composable (ColumnScope.() -> Unit)? = null,
) { ) {
Column { Column(modifier) {
Spacer( Spacer(
modifier = Modifier modifier = Modifier
.windowInsetsTopHeight(WindowInsets.statusBars) .windowInsetsTopHeight(WindowInsets.statusBars)