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

Add border to SpaceAvatar

Browse source
This commit is contained in:
ganfra 2026-02-06 11:38:34 +01:00
parent 9080400ff0
commit 2dbfa4811f
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt
View file

@ -8,6 +8,7 @@
package io.element.android.libraries.designsystem.components.avatar.internal package io.element.android.libraries.designsystem.components.avatar.internal
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -16,6 +17,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarType import io.element.android.libraries.designsystem.components.avatar.AvatarType
import io.element.android.libraries.designsystem.components.avatar.anAvatarData import io.element.android.libraries.designsystem.components.avatar.anAvatarData
@ -34,19 +36,26 @@ internal fun SpaceAvatar(
contentDescription: String? = null, contentDescription: String? = null,
) { ) {
val size = forcedAvatarSize ?: avatarData.size.dp val size = forcedAvatarSize ?: avatarData.size.dp
val avatarShape = avatarType.avatarShape(size)
val commonModifier = modifier
.border(
width = 1.dp,
color = ElementTheme.colors.iconQuaternaryAlpha,
shape = avatarShape,
)
when { when {
avatarType.isTombstoned -> TombstonedRoomAvatar( avatarType.isTombstoned -> TombstonedRoomAvatar(
size = size, size = size,
avatarShape = avatarType.avatarShape(size), avatarShape = avatarShape,
modifier = modifier, modifier = commonModifier,
contentDescription = contentDescription, contentDescription = contentDescription,
) )
else -> InitialOrImageAvatar( else -> InitialOrImageAvatar(
avatarData = avatarData, avatarData = avatarData,
hideAvatarImage = hideAvatarImage, hideAvatarImage = hideAvatarImage,
avatarShape = avatarType.avatarShape(size), avatarShape = avatarShape,
forcedAvatarSize = forcedAvatarSize, forcedAvatarSize = forcedAvatarSize,
modifier = modifier, modifier = commonModifier,
contentDescription = contentDescription, contentDescription = contentDescription,
) )
} }