Move AvatarRow to designsystem module, because it will be used by spaces.

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/AvatarRow.kt

@@ -1,132 +0,0 @@
-/*
- * Copyright 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.knockrequests.impl.banner
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.BlendMode
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.CompositingStrategy
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import io.element.android.libraries.designsystem.components.avatar.Avatar
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-import io.element.android.libraries.designsystem.components.avatar.AvatarType
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.text.toPx
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-
-/**
- * Draw a row of avatars (they must all have the same size), from start to end.
- * @param avatarDataList the avatars to render. Note: they will all be rendered, the caller may
- * want to limit the list size
- * @param avatarType the type of avatars to render
- * @param modifier Jetpack Compose modifier
- * @param overlapRatio the overlap ration. When 0f, avatars will render without overlap, when 1f
- * only the first avatar will be visible
- */
-@Composable
-fun AvatarRow(
-    avatarDataList: ImmutableList<AvatarData>,
-    avatarType: AvatarType,
-    modifier: Modifier = Modifier,
-    overlapRatio: Float = 0.5f,
-) {
-    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-    Box(
-        modifier = modifier,
-    ) {
-        val lastItemIndex = avatarDataList.size - 1
-        val avatarSize = avatarDataList.firstOrNull()?.size?.dp ?: return
-        val avatarSizePx = avatarSize.toPx()
-        avatarDataList
-            .reversed()
-            .forEachIndexed { index, avatarData ->
-                Avatar(
-                    modifier = Modifier
-                        .padding(start = avatarSize * (1 - overlapRatio) * (lastItemIndex - index))
-                        .graphicsLayer {
-                            compositingStrategy = CompositingStrategy.Offscreen
-                        }
-                        .drawWithContent {
-                            // Draw content and clear the pixels for the avatar on the left (right in RTL).
-                            drawContent()
-                            val xOffset = if (isRtl) {
-                                size.width - avatarSizePx * (overlapRatio - 0.5f)
-                            } else {
-                                0f + avatarSizePx * (overlapRatio - 0.5f)
-                            }
-                            if (index < lastItemIndex) {
-                                drawCircle(
-                                    color = Color.Black,
-                                    center = Offset(
-                                        x = xOffset,
-                                        y = size.height / 2,
-                                    ),
-                                    radius = avatarSizePx / 2,
-                                    blendMode = BlendMode.Clear,
-                                )
-                            }
-                        }
-                        .size(size = avatarSize)
-                        // Keep internal padding, it has the advantage to not reduce the size of the Avatar image,
-                        // which is already small in our use case.
-                        .padding(2.dp),
-                    avatarData = avatarData,
-                    avatarType = avatarType,
-                )
-            }
-    }
-}
-
-@Composable
-@PreviewsDayNight
-internal fun AvatarRowPreview(@PreviewParameter(OverlapRatioProvider::class) overlapRatio: Float) {
-    ElementPreview {
-        ContentToPreview(overlapRatio)
-    }
-}
-
-@Composable
-@PreviewsDayNight
-internal fun AvatarRowRtlPreview(@PreviewParameter(OverlapRatioProvider::class) overlapRatio: Float) {
-    CompositionLocalProvider(
-        LocalLayoutDirection provides LayoutDirection.Rtl,
-    ) {
-        ElementPreview {
-            ContentToPreview(overlapRatio)
-        }
-    }
-}
-
-@Composable
-private fun ContentToPreview(overlapRatio: Float) {
-    AvatarRow(
-        avatarDataList = listOf("A", "B", "C").map {
-            AvatarData(
-                id = it,
-                name = it,
-                size = AvatarSize.RoomListItem,
-            )
-        }.toImmutableList(),
-        avatarType = AvatarType.User,
-        overlapRatio = overlapRatio,
-    )
-}

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt

@@ -38,6 +38,7 @@ import io.element.android.libraries.designsystem.components.async.AsyncIndicator
 import io.element.android.libraries.designsystem.components.async.AsyncIndicatorHost
 import io.element.android.libraries.designsystem.components.async.rememberAsyncIndicatorState
 import io.element.android.libraries.designsystem.components.avatar.Avatar
+import io.element.android.libraries.designsystem.components.avatar.AvatarRow
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.preview.ElementPreview

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/OverlapRatioProvider.kt

@@ -1,20 +0,0 @@
-/*
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.knockrequests.impl.banner
-
-import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-
-class OverlapRatioProvider : PreviewParameterProvider<Float> {
-    override val values: Sequence<Float> = sequenceOf(
-        0f,
-        0.25f,
-        0.5f,
-        0.75f,
-        1f
-    )
-}