Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix color for composer.

Browse source
This commit is contained in:
Benoit Marty 2023-06-29 10:38:13 +02:00 • committed by Benoit Marty
parent a663f0e86c
commit 63bba7c2c2
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
View file

@ -60,7 +60,6 @@ import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
@ -115,12 +114,14 @@ fun TextComposer(
} }
val minHeight = 42.dp val minHeight = 42.dp
val bgColor = ElementTheme.colors.bgSubtleSecondary
val borderColor = ElementTheme.colors.borderDisabled
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clip(roundedCorners) .clip(roundedCorners)
.background(MaterialTheme.colorScheme.surfaceVariant) .background(color = bgColor)
.border(1.dp, MaterialTheme.colorScheme.outlineVariant, roundedCorners) .border(1.dp, borderColor, roundedCorners)
) { ) {
if (composerMode is MessageComposerMode.Special) { if (composerMode is MessageComposerMode.Special) {
ComposerModeView(composerMode = composerMode, onResetComposerMode = onResetComposerMode) ComposerModeView(composerMode = composerMode, onResetComposerMode = onResetComposerMode)
@ -162,10 +163,10 @@ fun TextComposer(
focusedIndicatorColor = Color.Transparent, focusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent, disabledIndicatorColor = Color.Transparent,
errorIndicatorColor = Color.Transparent, errorIndicatorColor = Color.Transparent,
unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant, unfocusedContainerColor = bgColor,
focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant, focusedContainerColor = bgColor,
errorContainerColor = MaterialTheme.colorScheme.surfaceVariant, errorContainerColor = bgColor,
disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant, disabledContainerColor = bgColor,
) )
) )
} }