From 26c50fab0ec93345006e18b103e9dd0a1caababe Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 28 Jun 2023 22:44:08 +0200 Subject: [PATCH] Text style for reply to in timeline and in composer. --- .../timeline/components/TimelineItemEventRow.kt | 13 +++++-------- .../android/libraries/textcomposer/TextComposer.kt | 9 ++++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt index c9505ee507..73770fcf71 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt @@ -41,7 +41,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview @@ -59,7 +58,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent -import io.element.android.libraries.designsystem.ElementTextStyles import io.element.android.libraries.designsystem.components.EqualWidthColumn import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData @@ -363,19 +361,18 @@ private fun ReplyToContent( } Column(verticalArrangement = Arrangement.SpaceBetween) { Text( - senderName, - style = ElementTextStyles.Regular.caption2.copy(fontWeight = FontWeight.Medium), + text = senderName, + style = ElementTheme.typography.fontBodySmMedium, textAlign = TextAlign.Start, - color = MaterialTheme.colorScheme.primary, + color = ElementTheme.materialColors.primary, maxLines = 1, overflow = TextOverflow.Ellipsis, ) - Text( text = text.orEmpty(), - style = ElementTextStyles.Regular.caption1, + style = ElementTheme.typography.fontBodyMdRegular, textAlign = TextAlign.Start, - color = ElementTheme.legacyColors.placeholder, + color = ElementTheme.materialColors.secondary, maxLines = 1, overflow = TextOverflow.Ellipsis, ) 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 40179fdb6b..a94929dfbf 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 @@ -279,17 +279,16 @@ private fun ReplyToModeView( Text( text = senderName, modifier = Modifier.fillMaxWidth(), - style = ElementTextStyles.Regular.caption2.copy(fontWeight = FontWeight.Medium), + style = ElementTheme.typography.fontBodySmMedium, textAlign = TextAlign.Start, - color = MaterialTheme.colorScheme.primary, + color = ElementTheme.materialColors.primary, ) - Text( modifier = Modifier.fillMaxWidth(), text = text.orEmpty(), - style = ElementTextStyles.Regular.caption1, + style = ElementTheme.typography.fontBodyMdRegular, textAlign = TextAlign.Start, - color = MaterialTheme.colorScheme.secondary, + color = ElementTheme.materialColors.secondary, maxLines = if (attachmentThumbnailInfo != null) 1 else 2, overflow = TextOverflow.Ellipsis, )