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

Fix color of reply body preview.

Browse source
This commit is contained in:
Benoit Marty 2023-06-26 15:28:07 +02:00 • committed by Benoit Marty
parent 5a6a984bc1
commit e2731c1d4c
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,13 +92,15 @@ fun TextComposer(
onSendMessage: (String) -> Unit = {}, onSendMessage: (String) -> Unit = {},
onResetComposerMode: () -> Unit = {}, onResetComposerMode: () -> Unit = {},
onComposerTextChange: (CharSequence) -> Unit = {}, onComposerTextChange: (CharSequence) -> Unit = {},
onAddAttachment:() -> Unit = {}, onAddAttachment: () -> Unit = {},
) { ) {
val text = composerText.orEmpty() val text = composerText.orEmpty()
Row(modifier.padding( Row(
horizontal = 12.dp, modifier.padding(
vertical = 8.dp horizontal = 12.dp,
), verticalAlignment = Alignment.Bottom) { vertical = 8.dp
), verticalAlignment = Alignment.Bottom
) {
AttachmentButton(onClick = onAddAttachment, modifier = Modifier.padding(vertical = 6.dp)) AttachmentButton(onClick = onAddAttachment, modifier = Modifier.padding(vertical = 6.dp))
Spacer(modifier = Modifier.width(12.dp)) Spacer(modifier = Modifier.width(12.dp))
var lineCount by remember { mutableStateOf(0) } var lineCount by remember { mutableStateOf(0) }
@ -206,10 +208,12 @@ private fun EditingModeView(
onResetComposerMode: () -> Unit, onResetComposerMode: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Row(horizontalArrangement = Arrangement.spacedBy(6.dp), Row(
horizontalArrangement = Arrangement.spacedBy(6.dp),
modifier = modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 8.dp)) { .padding(horizontal = 12.dp, vertical = 8.dp)
) {
Icon( Icon(
resourceId = VectorIcons.Edit, resourceId = VectorIcons.Edit,
contentDescription = stringResource(CommonStrings.common_editing), contentDescription = stringResource(CommonStrings.common_editing),
@ -301,7 +305,7 @@ private fun ReplyToModeView(
text = text.orEmpty(), text = text.orEmpty(),
style = ElementTextStyles.Regular.caption1, style = ElementTextStyles.Regular.caption1,
textAlign = TextAlign.Start, textAlign = TextAlign.Start,
color = LocalColors.current.placeholder, color = MaterialTheme.colorScheme.secondary,
maxLines = if (attachmentThumbnailInfo != null) 1 else 2, maxLines = if (attachmentThumbnailInfo != null) 1 else 2,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
) )