diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/KnockRequest.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/KnockRequest.kt index 3a293dc565..81ba322abe 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/KnockRequest.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/KnockRequest.kt @@ -17,6 +17,7 @@ data class KnockRequest( val displayName: String?, val avatarUrl: String?, val reason: String?, + val formattedDate: String?, ) fun KnockRequest.getAvatarData(size: AvatarSize) = AvatarData( diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt index 7b7b1e4f5e..551f6b89b0 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt @@ -106,11 +106,13 @@ fun aKnockRequest( displayName: String? = "Jacob Ross", avatarUrl: String? = null, reason: String? = "Hi, I would like to get access to this room please.", + formattedDate: String = "20 Nov 2024", ) = KnockRequest( userId = userId, displayName = displayName, avatarUrl = avatarUrl, reason = reason, + formattedDate = formattedDate, ) fun aKnockRequestsListState( diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt index 2d9480a02e..abc0a09970 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt @@ -222,15 +222,27 @@ private fun KnockRequestItem( Avatar(knockRequest.getAvatarData(AvatarSize.KnockRequestItem)) Spacer(modifier = Modifier.width(16.dp)) Column { - // Name - Text( - modifier = Modifier.clipToBounds(), - text = knockRequest.getBestName(), - maxLines = 1, - overflow = TextOverflow.Ellipsis, - color = MaterialTheme.colorScheme.primary, - style = ElementTheme.typography.fontBodyLgMedium, - ) + // Name and date + Row { + Text( + modifier = Modifier + .clipToBounds() + .weight(1f), + text = knockRequest.getBestName(), + 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 if (!knockRequest.displayName.isNullOrEmpty()) { Text(