ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit usage of nullable callback.

Browse Source
This commit is contained in:
Benoit Marty
2026-08-28 11:01:54 +02:00
parent 3ec30d7c94
commit cca60ebc3a
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/DefaultRoomMemberModerationRenderer.kt
+7 -2
View File
@@ -25,11 +25,16 @@ class DefaultRoomMemberModerationRenderer : RoomMemberModerationRenderer {
override fun Render(
state: RoomMemberModerationState,
onSelectAction: (ModerationAction, MatrixUser) -> Unit,
onAvatarClick: ((MatrixUser) -> Unit)?,
onAvatarClick: (MatrixUser) -> Unit,
modifier: Modifier
) {
if (state is InternalRoomMemberModerationState) {
RoomMemberModerationView(modifier = modifier, state = state, onSelectAction = onSelectAction, onAvatarClick = onAvatarClick)
RoomMemberModerationView(
modifier = modifier,
state = state,
onSelectAction = onSelectAction,
onAvatarClick = onAvatarClick,
)
} else {
SideEffect {
Timber.d("RoomMemberModerationRenderer: Render called with unsupported state: $state")
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
+4 -4
View File
@@ -66,7 +66,7 @@ import timber.log.Timber
fun RoomMemberModerationView(
state: InternalRoomMemberModerationState,
onSelectAction: (ModerationAction, MatrixUser) -> Unit,
onAvatarClick: ((MatrixUser) -> Unit)?,
onAvatarClick: (MatrixUser) -> Unit,
modifier: Modifier = Modifier,
) {
Box(modifier = modifier) {
@@ -218,7 +218,7 @@ private fun RoomMemberActionsBottomSheet(
user: MatrixUser,
actions: ImmutableList<ModerationActionState>,
onSelectAction: (ModerationAction, MatrixUser) -> Unit,
onAvatarClick: ((MatrixUser) -> Unit)? = null,
onAvatarClick: (MatrixUser) -> Unit,
onDismiss: () -> Unit,
) {
val coroutineScope = rememberCoroutineScope()
@@ -248,10 +248,10 @@ private fun RoomMemberActionsBottomSheet(
modifier = Modifier
.padding(bottom = 24.dp)
.align(Alignment.CenterHorizontally)
.clickable(enabled = user.avatarUrl != null && onAvatarClick != null) {
.clickable(enabled = user.avatarUrl != null) {
coroutineScope.launch {
bottomSheetState.hide()
onAvatarClick?.invoke(user)
onAvatarClick(user)
onDismiss()
}
}