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

Remove default onClick from MatrixUserRow

Browse source
This commit is contained in:
Florian Renaud 2023-03-23 11:46:56 +01:00
parent 4f6acc12a2
commit ac8a6f90fd
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/selectusers/api/src/main/kotlin/io/element/android/features/selectusers/api/SelectUsersView.kt
View file

@ -17,6 +17,7 @@
package io.element.android.features.selectusers.api
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@ -232,10 +233,9 @@ fun SearchSingleUserResultItem(
onClick: () -> Unit = {},
) {
MatrixUserRow(
modifier = modifier,
modifier = modifier.clickable(onClick = onClick),
matrixUser = matrixUser,
avatarSize = AvatarSize.Custom(36.dp),
onClick = onClick,
)
}

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

@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@ -44,9 +45,7 @@ fun CheckableMatrixUserRow(
Row(
modifier = modifier
.fillMaxWidth()
.clickable {
onCheckedChange(!checked)
},
.clickable(role = Role.Checkbox) { onCheckedChange(!checked) },
verticalAlignment = Alignment.CenterVertically,
) {
MatrixUserRow(

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

@ -16,7 +16,6 @@
package io.element.android.libraries.matrix.ui.components
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
@ -46,11 +45,9 @@ fun MatrixUserRow(
matrixUser: MatrixUser,
modifier: Modifier = Modifier,
avatarSize: AvatarSize = matrixUser.avatarData.size,
onClick: (() -> Unit)? = null,
) {
Row(
modifier = modifier
.let { if (onClick != null) it.clickable(onClick = onClick) else it }
.fillMaxWidth()
.padding(start = 16.dp, top = 8.dp, end = 16.dp, bottom = 8.dp)
.height(IntrinsicSize.Min),