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

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 c4249bc589
commit a02d876bd3
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
+7 -4
View File
@@ -383,6 +383,12 @@ private fun JoinRoomContent(
IsKnockedLoadedContent() IsKnockedLoadedContent()
} }
else -> { else -> {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
val inviteSender = (contentState.joinAuthorisationStatus as? JoinAuthorisationStatus.IsInvited)?.inviteSender
if (inviteSender != null) {
InviteSenderView(inviteSender = inviteSender)
Spacer(modifier = Modifier.height(32.dp))
}
DefaultLoadedContent( DefaultLoadedContent(
modifier = Modifier.verticalScroll(rememberScrollState()), modifier = Modifier.verticalScroll(rememberScrollState()),
contentState = contentState, contentState = contentState,
@@ -392,6 +398,7 @@ private fun JoinRoomContent(
} }
} }
} }
}
is ContentState.UnknownRoom -> UnknownRoomContent() is ContentState.UnknownRoom -> UnknownRoomContent()
is ContentState.Loading -> IncompleteContent(roomIdOrAlias, isLoading = true) is ContentState.Loading -> IncompleteContent(roomIdOrAlias, isLoading = true)
is ContentState.Dismissing -> IncompleteContent(roomIdOrAlias, isLoading = false) is ContentState.Dismissing -> IncompleteContent(roomIdOrAlias, isLoading = false)
@@ -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))