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

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

Browse source 
Ensure selectedRoomMember is not null to reduce code indentation.
This commit is contained in:
Benoit Marty 2024-10-16 11:16:21 +02:00 • committed by GitHub
commit 44b37587cc
1 changed files with 73 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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