From 080f3dc266a956db2eca05db4ae61eacbae78d05 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com> Date: Fri, 17 Mar 2023 17:19:56 +0100 Subject: [PATCH] Using nullable onClick to avoid passing a new parameter --- .../libraries/matrix/ui/components/CheckableMatrixUserRow.kt | 1 - .../android/libraries/matrix/ui/components/MatrixUserRow.kt | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableMatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableMatrixUserRow.kt index 67969f8e2e..f75f998d8f 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableMatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableMatrixUserRow.kt @@ -53,7 +53,6 @@ fun CheckableMatrixUserRow( modifier = Modifier.weight(1f), matrixUser = matrixUser, avatarSize = avatarSize, - isClickEnabled = false, ) Checkbox( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt index 768c803850..b92393af2f 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt @@ -45,12 +45,11 @@ fun MatrixUserRow( matrixUser: MatrixUser, modifier: Modifier = Modifier, avatarSize: AvatarSize = matrixUser.avatarData.size, - isClickEnabled: Boolean = true, - onClick: () -> Unit = {}, + onClick: (() -> Unit)? = null, ) { Row( modifier = modifier - .let { if (isClickEnabled) it.clickable(onClick = onClick) else it } + .let { if (onClick != null) it.clickable(onClick = onClick) else it } .padding(start = 16.dp, top = 8.dp, end = 16.dp, bottom = 8.dp) .height(IntrinsicSize.Min), verticalAlignment = Alignment.CenterVertically