forked from element-hq/element-x-android
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/develop' into develop
- Loading branch information
Showing
34 changed files
with
489 additions
and
77 deletions.
There are no files selected for viewing
127 changes: 127 additions & 0 deletions
127
...s/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/AvatarRow.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * Copyright 2024 New Vector Ltd. | ||
| * | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| * Please see LICENSE 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.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 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>, | ||
| 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, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @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(), | ||
| overlapRatio = overlapRatio, | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...main/kotlin/io/element/android/features/knockrequests/impl/banner/OverlapRatioProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * Copyright 2025 New Vector Ltd. | ||
| * | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| * Please see LICENSE 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 | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.