Merge pull request #5900 from element-hq/feature/fga/update_invite_selection_design

Design : update user rows
This commit is contained in:
ganfra
2025-12-15 10:33:57 +01:00
committed by GitHub
64 changed files with 130 additions and 132 deletions

View File

@@ -11,8 +11,9 @@ package io.element.android.libraries.matrix.ui.components
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.ui.Alignment
@@ -20,10 +21,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import io.element.android.libraries.designsystem.atomic.atoms.SelectedIndicatorAtom
import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.preview.ElementThemedPreview
import io.element.android.libraries.designsystem.theme.components.Checkbox
import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
import io.element.android.libraries.matrix.ui.model.getAvatarData
@@ -63,11 +64,12 @@ fun CheckableUserRow(
)
}
}
SelectedIndicatorAtom(
modifier = Modifier.padding(end = 24.dp),
Checkbox(
onCheckedChange = onCheckedChange,
checked = checked,
enabled = enabled,
)
Spacer(modifier = Modifier.width(4.dp))
}
}

View File

@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.runtime.Composable
@@ -45,8 +44,7 @@ fun UnresolvedUserRow(
Row(
modifier = modifier
.fillMaxWidth()
.heightIn(min = 56.dp)
.padding(start = 16.dp, top = 8.dp, end = 16.dp, bottom = 8.dp),
.padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 12.dp),
verticalAlignment = Alignment.CenterVertically
) {
Avatar(

View File

@@ -11,7 +11,6 @@ package io.element.android.libraries.matrix.ui.components
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@@ -37,8 +36,7 @@ internal fun UserRow(
Row(
modifier = modifier
.fillMaxWidth()
.heightIn(min = 56.dp)
.padding(start = 16.dp, top = 4.dp, end = 16.dp, bottom = 4.dp),
.padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 12.dp),
verticalAlignment = Alignment.CenterVertically
) {
Avatar(