unimore/pm-2024-steffo-twom
unimore/pm-2024-steffo-twom
1
Fork 0
mirror of https://github.com/Steffo99/twom.git synced 2024-11-21 23:54:26 +00:00
Code Activity

Wrap MemberListItem in a Box to have the DropdownMenu display correctly

Browse source
This commit is contained in:
Steffo 2024-01-20 15:09:33 +01:00
parent 4a084519ce
commit fb45b3ea06
Signed by: steffo
GPG key ID: 5ADA3868646C3FC0
1 changed files with 72 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
app/src/main/java/eu/steffo/twom/composables/viewroom/MemberListItem.kt
View file

@ -84,78 +84,82 @@ fun MemberListItem(
val alpha = if (rsvp.answer == RSVPAnswer.PENDING) 0.4f else 1.0f val alpha = if (rsvp.answer == RSVPAnswer.PENDING) 0.4f else 1.0f
val color = rsvp.answer.staticColorRole.color().copy(alpha) val color = rsvp.answer.staticColorRole.color().copy(alpha)
ListItem( // A parent layout is needed for the Dropdown to display in the correct position
modifier = modifier Box {
.combinedClickable(
onClick = {}, ListItem(
onLongClick = { expanded = true }, modifier = modifier
), .combinedClickable(
headlineContent = { onClick = {},
Text( onLongClick = { expanded = true },
text = user?.displayName ?: stringResource(R.string.user_unresolved_name), ),
color = color, headlineContent = {
style = MaterialTheme.typography.titleMedium,
)
},
leadingContent = {
Box(
Modifier
.padding(end = 10.dp)
.size(40.dp)
.clip(MaterialTheme.shapes.extraLarge)
) {
AvatarUser(
user = user,
alpha = alpha,
)
}
},
trailingContent = {
Icon(
imageVector = rsvp.answer.icon,
contentDescription = rsvp.answer.toResponse(),
tint = color,
)
},
supportingContent = {
if (rsvp.comment != "") {
Text( Text(
text = rsvp.comment, text = user?.displayName ?: stringResource(R.string.user_unresolved_name),
color = color, color = color,
style = MaterialTheme.typography.titleMedium,
)
},
leadingContent = {
Box(
Modifier
.padding(end = 10.dp)
.size(40.dp)
.clip(MaterialTheme.shapes.extraLarge)
) {
AvatarUser(
user = user,
alpha = alpha,
)
}
},
trailingContent = {
Icon(
imageVector = rsvp.answer.icon,
contentDescription = rsvp.answer.toResponse(),
tint = color,
)
},
supportingContent = {
if (rsvp.comment != "") {
Text(
text = rsvp.comment,
color = color,
)
}
},
)
DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false }
) {
if (member.userId != session.myUserId) {
DropdownMenuItem(
text = {
Text(stringResource(R.string.room_uninvite_label))
},
onClick = {
expanded = false
scope.launch SendUninvite@{
val userId = member.userId
Log.d("Room", "Uninviting `$userId`...")
// FIXME: Errors for this aren't displayed as I don't have any idea of where to place the relevant text on the UI, but also are so unlikely to occour that it should be ok to disregard it
try {
room.membershipService().remove(userId)
} catch (e: Throwable) {
Log.e("Room", "Failed to uninvite `$userId`: $e")
return@SendUninvite
}
Log.d("Room", "Successfully uninvited `$userId`!")
}
},
) )
} }
},
)
DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false }
) {
if (member.userId != session.myUserId) {
DropdownMenuItem(
text = {
Text(stringResource(R.string.room_uninvite_label))
},
onClick = {
expanded = false
scope.launch SendUninvite@{
val userId = member.userId
Log.d("Room", "Uninviting `$userId`...")
// FIXME: Errors for this aren't displayed as I don't have any idea of where to place the relevant text on the UI, but also are so unlikely to occour that it should be ok to disregard it
try {
room.membershipService().remove(userId)
} catch (e: Throwable) {
Log.e("Room", "Failed to uninvite `$userId`: $e")
return@SendUninvite
}
Log.d("Room", "Successfully uninvited `$userId`!")
}
},
)
} }
} }
} }