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

Do not use MutableState in Composable function parameter.

Browse source
This commit is contained in:
Benoit Marty 2024-05-15 18:05:08 +02:00
parent d19238fc60
commit d1a3daaa8e
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
View file

@ -134,7 +134,8 @@ fun ConfigureRoomView(
AvatarActionBottomSheet( AvatarActionBottomSheet(
actions = state.avatarActions, actions = state.avatarActions,
isVisible = isAvatarActionsSheetVisible, isVisible = isAvatarActionsSheetVisible.value,
onDismiss = { isAvatarActionsSheetVisible.value = false },
onActionSelected = { state.eventSink(ConfigureRoomEvents.HandleAvatarAction(it)) } onActionSelected = { state.eventSink(ConfigureRoomEvents.HandleAvatarAction(it)) }
) )

3
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
View file

@ -132,7 +132,8 @@ fun EditUserProfileView(
AvatarActionBottomSheet( AvatarActionBottomSheet(
actions = state.avatarActions, actions = state.avatarActions,
isVisible = isAvatarActionsSheetVisible, isVisible = isAvatarActionsSheetVisible.value,
onDismiss = { isAvatarActionsSheetVisible.value = false },
onActionSelected = { state.eventSink(EditUserProfileEvents.HandleAvatarAction(it)) } onActionSelected = { state.eventSink(EditUserProfileEvents.HandleAvatarAction(it)) }
) )

3
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
View file

@ -158,7 +158,8 @@ fun RoomDetailsEditView(
AvatarActionBottomSheet( AvatarActionBottomSheet(
actions = state.avatarActions, actions = state.avatarActions,
isVisible = isAvatarActionsSheetVisible, isVisible = isAvatarActionsSheetVisible.value,
onDismiss = { isAvatarActionsSheetVisible.value = false },
onActionSelected = { state.eventSink(RoomDetailsEditEvents.HandleAvatarAction(it)) } onActionSelected = { state.eventSink(RoomDetailsEditEvents.HandleAvatarAction(it)) }
) )

19
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
View file

@ -29,9 +29,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@ -53,8 +50,9 @@ import kotlinx.collections.immutable.persistentListOf
@Composable @Composable
fun AvatarActionBottomSheet( fun AvatarActionBottomSheet(
actions: ImmutableList<AvatarAction>, actions: ImmutableList<AvatarAction>,
isVisible: MutableState<Boolean>, isVisible: Boolean,
onActionSelected: (action: AvatarAction) -> Unit, onActionSelected: (action: AvatarAction) -> Unit,
onDismiss: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
@ -62,19 +60,19 @@ fun AvatarActionBottomSheet(
skipPartiallyExpanded = true skipPartiallyExpanded = true
) )
BackHandler(enabled = isVisible.value) { BackHandler(enabled = isVisible) {
sheetState.hide(coroutineScope, then = { isVisible.value = false }) sheetState.hide(coroutineScope, then = { onDismiss() })
} }
fun onItemActionClicked(itemAction: AvatarAction) { fun onItemActionClicked(itemAction: AvatarAction) {
onActionSelected(itemAction) onActionSelected(itemAction)
sheetState.hide(coroutineScope, then = { isVisible.value = false }) sheetState.hide(coroutineScope, then = { onDismiss() })
} }
if (isVisible.value) { if (isVisible) {
ModalBottomSheet( ModalBottomSheet(
onDismissRequest = { onDismissRequest = {
sheetState.hide(coroutineScope, then = { isVisible.value = false }) sheetState.hide(coroutineScope, then = { onDismiss() })
}, },
modifier = modifier, modifier = modifier,
sheetState = sheetState, sheetState = sheetState,
@ -126,7 +124,8 @@ private fun AvatarActionBottomSheetContent(
internal fun AvatarActionBottomSheetPreview() = ElementPreview { internal fun AvatarActionBottomSheetPreview() = ElementPreview {
AvatarActionBottomSheet( AvatarActionBottomSheet(
actions = persistentListOf(AvatarAction.TakePhoto, AvatarAction.ChoosePhoto, AvatarAction.Remove), actions = persistentListOf(AvatarAction.TakePhoto, AvatarAction.ChoosePhoto, AvatarAction.Remove),
isVisible = remember { mutableStateOf(true) }, isVisible = true,
onActionSelected = { }, onActionSelected = { },
onDismiss = { },
) )
} }