From dbf91f6dcfd79e2a9344d4109f8bad5a76dfc7ab Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 21 Aug 2025 09:19:33 +0200 Subject: [PATCH] Use Surface API for border and shape. --- .../libraries/matrix/ui/components/EditableOrgAvatar.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt index d7257a494f..433e036d97 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt @@ -7,7 +7,7 @@ package io.element.android.libraries.matrix.ui.components -import androidx.compose.foundation.border +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box @@ -108,10 +108,11 @@ fun EditableOrgAvatar( ) Surface( color = ElementTheme.colors.bgCanvasDefault, + shape = CircleShape, + border = BorderStroke(1.dp, color = ElementTheme.colors.borderInteractiveSecondary), modifier = Modifier .clip(CircleShape) .size(30.dp) - .border(1.dp, color = ElementTheme.colors.borderInteractiveSecondary, shape = CircleShape) .align(Alignment.BottomEnd) .clickable( indication = ripple(),