From a8cc935a82bcfd6b44f3fcfbe2cf1aa3a28936de Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2023 15:28:07 +0200 Subject: [PATCH] Fix color of reply body preview. --- .../libraries/textcomposer/TextComposer.kt | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt index dabbb6e933..16fc9d32eb 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt @@ -92,13 +92,15 @@ fun TextComposer( onSendMessage: (String) -> Unit = {}, onResetComposerMode: () -> Unit = {}, onComposerTextChange: (CharSequence) -> Unit = {}, - onAddAttachment:() -> Unit = {}, + onAddAttachment: () -> Unit = {}, ) { val text = composerText.orEmpty() - Row(modifier.padding( - horizontal = 12.dp, - vertical = 8.dp - ), verticalAlignment = Alignment.Bottom) { + Row( + modifier.padding( + horizontal = 12.dp, + vertical = 8.dp + ), verticalAlignment = Alignment.Bottom + ) { AttachmentButton(onClick = onAddAttachment, modifier = Modifier.padding(vertical = 6.dp)) Spacer(modifier = Modifier.width(12.dp)) var lineCount by remember { mutableStateOf(0) } @@ -206,10 +208,12 @@ private fun EditingModeView( onResetComposerMode: () -> Unit, modifier: Modifier = Modifier, ) { - Row(horizontalArrangement = Arrangement.spacedBy(6.dp), + Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier .fillMaxWidth() - .padding(horizontal = 12.dp, vertical = 8.dp)) { + .padding(horizontal = 12.dp, vertical = 8.dp) + ) { Icon( resourceId = VectorIcons.Edit, contentDescription = stringResource(CommonStrings.common_editing), @@ -301,7 +305,7 @@ private fun ReplyToModeView( text = text.orEmpty(), style = ElementTextStyles.Regular.caption1, textAlign = TextAlign.Start, - color = LocalColors.current.placeholder, + color = MaterialTheme.colorScheme.secondary, maxLines = if (attachmentThumbnailInfo != null) 1 else 2, overflow = TextOverflow.Ellipsis, )