ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 01:19:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct typography

Browse Source
This commit is contained in:
Benoit Marty
2023-06-28 22:01:06 +02:00
committed by Benoit Marty
parent 8a416bf4d3
commit 60bdfe1658
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
+5 -8
View File
@@ -40,14 +40,12 @@ import androidx.compose.ui.graphics.Outline
import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import io.element.android.features.roomlist.impl.model.RoomListRoomSummary import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider
import io.element.android.libraries.core.extensions.orEmpty import io.element.android.libraries.core.extensions.orEmpty
@@ -60,6 +58,7 @@ import io.element.android.libraries.designsystem.theme.roomListRoomMessage
import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate
import io.element.android.libraries.designsystem.theme.roomListRoomName import io.element.android.libraries.designsystem.theme.roomListRoomName
import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator
import io.element.android.libraries.theme.ElementTheme
internal val minHeight = 84.dp internal val minHeight = 84.dp
@@ -136,9 +135,7 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) {
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(end = 16.dp), .padding(end = 16.dp),
fontSize = 16.sp, style = ElementTheme.typography.fontBodyLgMedium,
fontWeight = FontWeight.SemiBold,
style = MaterialTheme.typography.bodyMedium,
text = room.name, text = room.name,
color = MaterialTheme.roomListRoomName(), color = MaterialTheme.roomListRoomName(),
maxLines = 1, maxLines = 1,
@@ -146,8 +143,8 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) {
) )
// Timestamp // Timestamp
Text( Text(
fontSize = 12.sp,
text = room.timestamp ?: "", text = room.timestamp ?: "",
style = ElementTheme.typography.fontBodySmRegular,
color = MaterialTheme.roomListRoomMessageDate(), color = MaterialTheme.roomListRoomMessageDate(),
) )
} }
@@ -163,8 +160,8 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
.padding(end = 28.dp), .padding(end = 28.dp),
text = attributedLastMessage, text = attributedLastMessage,
color = MaterialTheme.roomListRoomMessage(), color = MaterialTheme.roomListRoomMessage(),
fontSize = 14.sp, style = ElementTheme.typography.fontBodyMdRegular,
style = MaterialTheme.typography.bodySmall, minLines = 2,
maxLines = 2, maxLines = 2,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )