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

change (room avatar) : replace modifier.requiredSize by modifier.size

Browse source
This commit is contained in:
ganfra 2025-06-18 13:39:46 +02:00
parent 68e7406ba6
commit 2a865e6f4b
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
View file

@ -9,7 +9,7 @@ package io.element.android.libraries.designsystem.components.avatar
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.SideEffect
@ -73,7 +73,7 @@ private fun ImageAvatar(
contentDescription = contentDescription,
contentScale = ContentScale.Crop,
modifier = modifier
.requiredSize(size)
.size(size)
.clip(CircleShape)
) {
val collectedState by painter.state.collectAsState()

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/TextAvatar.kt
View file

@ -9,7 +9,7 @@ package io.element.android.libraries.designsystem.components.avatar
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@ -38,7 +38,7 @@ internal fun TextAvatar(
) {
Box(
modifier
.requiredSize(size)
.size(size)
.clip(CircleShape)
.background(color = colors.background)
) {

8
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/TombstonedRoomAvatar.kt
View file

@ -7,13 +7,9 @@
package io.element.android.libraries.designsystem.components.avatar
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.AvatarColors
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.designsystem.preview.ElementPreview
@ -32,9 +28,7 @@ fun TombstonedRoomAvatar(
background = ElementTheme.colors.bgSubtlePrimary,
foreground = ElementTheme.colors.iconTertiary
),
modifier = modifier
.size(size.dp)
.clip(CircleShape),
modifier = modifier,
contentDescription = contentDescription
)
}