From b5ee444f7855321a07359d69583849cb5722ec59 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Thu, 1 Jun 2023 10:15:27 +0100 Subject: [PATCH] Matrix user row: typography and alignment --- .../libraries/matrix/ui/components/MatrixUserRow.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt index 0ad787b79b..01f3b211d2 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt @@ -38,6 +38,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.designsystem.theme.noFontPadding import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.ui.model.getAvatarData import io.element.android.libraries.matrix.ui.model.getBestName @@ -76,20 +77,22 @@ fun UserRow( // Name Text( fontSize = 16.sp, - fontWeight = FontWeight.SemiBold, + fontWeight = FontWeight.Normal, text = name, maxLines = 1, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colorScheme.primary, + style = noFontPadding, ) // Id subtext?.let { Text( text = subtext, color = MaterialTheme.colorScheme.secondary, - fontSize = 14.sp, + fontSize = 12.sp, maxLines = 1, - overflow = TextOverflow.Ellipsis + overflow = TextOverflow.Ellipsis, + style = noFontPadding, ) } }