Browse Source

Merge pull request #3669 from element-hq/feature/bma/reduceIndentation

Ensure selectedRoomMember is not null to reduce code indentation.
pull/3673/head
Benoit Marty 2 days ago committed by GitHub
parent
commit
d7ca0c13c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationView.kt

6
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationView.kt

@ -62,7 +62,7 @@ fun RoomMembersModerationView( @@ -62,7 +62,7 @@ fun RoomMembersModerationView(
modifier: Modifier = Modifier,
) {
Box(modifier = modifier) {
if (state.actions.isNotEmpty()) {
if (state.selectedRoomMember != null && state.actions.isNotEmpty()) {
RoomMemberActionsBottomSheet(
roomMember = state.selectedRoomMember,
actions = state.actions,
@ -186,13 +186,12 @@ fun RoomMembersModerationView( @@ -186,13 +186,12 @@ fun RoomMembersModerationView(
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun RoomMemberActionsBottomSheet(
roomMember: RoomMember?,
roomMember: RoomMember,
actions: ImmutableList<ModerationAction>,
onSelectAction: (ModerationAction) -> Unit,
onDismiss: () -> Unit,
) {
val coroutineScope = rememberCoroutineScope()
if (roomMember != null && actions.isNotEmpty()) {
val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
ModalBottomSheet(
modifier = Modifier.systemBarsPadding(),
@ -281,7 +280,6 @@ private fun RoomMemberActionsBottomSheet( @@ -281,7 +280,6 @@ private fun RoomMemberActionsBottomSheet(
}
}
}
}
}
@PreviewsDayNight

Loading…
Cancel
Save