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

Using nullable onClick to avoid passing a new parameter

Browse source
This commit is contained in:
Maxime NATUREL 2023-03-17 17:19:56 +01:00 • committed by Florian Renaud
parent 6b138313c9
commit 080f3dc266
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,6 @@ fun CheckableMatrixUserRow(
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
matrixUser = matrixUser, matrixUser = matrixUser,
avatarSize = avatarSize, avatarSize = avatarSize,
isClickEnabled = false,
) )
Checkbox( Checkbox(

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

@ -45,12 +45,11 @@ fun MatrixUserRow(
matrixUser: MatrixUser, matrixUser: MatrixUser,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
avatarSize: AvatarSize = matrixUser.avatarData.size, avatarSize: AvatarSize = matrixUser.avatarData.size,
isClickEnabled: Boolean = true, onClick: (() -> Unit)? = null,
onClick: () -> Unit = {},
) { ) {
Row( Row(
modifier = modifier 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) .padding(start = 16.dp, top = 8.dp, end = 16.dp, bottom = 8.dp)
.height(IntrinsicSize.Min), .height(IntrinsicSize.Min),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically