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

knock requests : add formatted date

Browse source
This commit is contained in:
ganfra 2024-12-04 13:48:15 +01:00
parent c79962f58c
commit affd0570dc
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/KnockRequest.kt
View file

@ -17,6 +17,7 @@ data class KnockRequest(
val displayName: String?, val displayName: String?,
val avatarUrl: String?, val avatarUrl: String?,
val reason: String?, val reason: String?,
val formattedDate: String?,
) )
fun KnockRequest.getAvatarData(size: AvatarSize) = AvatarData( fun KnockRequest.getAvatarData(size: AvatarSize) = AvatarData(

2
features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt
View file

@ -106,11 +106,13 @@ fun aKnockRequest(
displayName: String? = "Jacob Ross", displayName: String? = "Jacob Ross",
avatarUrl: String? = null, avatarUrl: String? = null,
reason: String? = "Hi, I would like to get access to this room please.", reason: String? = "Hi, I would like to get access to this room please.",
formattedDate: String = "20 Nov 2024",
) = KnockRequest( ) = KnockRequest(
userId = userId, userId = userId,
displayName = displayName, displayName = displayName,
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
reason = reason, reason = reason,
formattedDate = formattedDate,
) )
fun aKnockRequestsListState( fun aKnockRequestsListState(

30
features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt
View file

@ -222,15 +222,27 @@ private fun KnockRequestItem(
Avatar(knockRequest.getAvatarData(AvatarSize.KnockRequestItem)) Avatar(knockRequest.getAvatarData(AvatarSize.KnockRequestItem))
Spacer(modifier = Modifier.width(16.dp)) Spacer(modifier = Modifier.width(16.dp))
Column { Column {
// Name // Name and date
Text( Row {
modifier = Modifier.clipToBounds(), Text(
text = knockRequest.getBestName(), modifier = Modifier
maxLines = 1, .clipToBounds()
overflow = TextOverflow.Ellipsis, .weight(1f),
color = MaterialTheme.colorScheme.primary, text = knockRequest.getBestName(),
style = ElementTheme.typography.fontBodyLgMedium, maxLines = 1,
) overflow = TextOverflow.Ellipsis,
color = MaterialTheme.colorScheme.primary,
style = ElementTheme.typography.fontBodyLgMedium,
)
if (!knockRequest.formattedDate.isNullOrEmpty()) {
Spacer(modifier = Modifier.width(8.dp))
Text(
text = knockRequest.formattedDate,
color = MaterialTheme.colorScheme.secondary,
style = ElementTheme.typography.fontBodySmRegular,
)
}
}
// UserId // UserId
if (!knockRequest.displayName.isNullOrEmpty()) { if (!knockRequest.displayName.isNullOrEmpty()) {
Text( Text(