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

change(invites) : move inviter view to the top

Browse source
This commit is contained in:
ganfra 2025-03-04 10:51:11 +01:00
parent abb0460bbb
commit 28ec54a122
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
View file

@ -383,12 +383,19 @@ private fun JoinRoomContent(
IsKnockedLoadedContent() IsKnockedLoadedContent()
} }
else -> { else -> {
DefaultLoadedContent( Column(horizontalAlignment = Alignment.CenterHorizontally) {
modifier = Modifier.verticalScroll(rememberScrollState()), val inviteSender = (contentState.joinAuthorisationStatus as? JoinAuthorisationStatus.IsInvited)?.inviteSender
contentState = contentState, if (inviteSender != null) {
knockMessage = knockMessage, InviteSenderView(inviteSender = inviteSender)
onKnockMessageUpdate = onKnockMessageUpdate Spacer(modifier = Modifier.height(32.dp))
) }
DefaultLoadedContent(
modifier = Modifier.verticalScroll(rememberScrollState()),
contentState = contentState,
knockMessage = knockMessage,
onKnockMessageUpdate = onKnockMessageUpdate
)
}
} }
} }
} }
@ -498,10 +505,6 @@ private fun DefaultLoadedContent(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
val inviteSender = (contentState.joinAuthorisationStatus as? JoinAuthorisationStatus.IsInvited)?.inviteSender
if (inviteSender != null) {
InviteSenderView(inviteSender = inviteSender)
}
RoomPreviewDescriptionAtom(contentState.topic ?: "") RoomPreviewDescriptionAtom(contentState.topic ?: "")
if (contentState.joinAuthorisationStatus is JoinAuthorisationStatus.CanKnock) { if (contentState.joinAuthorisationStatus is JoinAuthorisationStatus.CanKnock) {
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(24.dp))