Continue refinement of RoomList (and remove avatar library)

This commit is contained in:
ganfra 2022-11-03 18:02:53 +01:00
parent 5984ffc960
commit f55bb16bfa
22 changed files with 305 additions and 322 deletions

View file

@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
@ -20,18 +21,17 @@ import io.element.android.x.designsystem.components.avatar.AvatarData
@Composable
fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) {
val commonModifier = modifier
.size(avatarData.size.dp)
.clip(CircleShape)
if (avatarData.model == null) {
InitialsAvatar(
modifier = modifier
.size(avatarData.size.dp)
.clip(CircleShape),
modifier = commonModifier,
initials = avatarData.initials
)
} else {
ImageAvatar(
modifier = modifier
.size(avatarData.size.dp)
.clip(CircleShape),
modifier = commonModifier,
avatarData = avatarData
)
}
@ -50,8 +50,6 @@ private fun ImageAvatar(
contentDescription = null,
contentScale = ContentScale.Crop,
modifier = modifier
.size(avatarData.size.dp)
.clip(CircleShape)
)
}
@ -65,15 +63,15 @@ private fun InitialsAvatar(
listOf(
AvatarGradientStart,
AvatarGradientEnd,
)
),
start = Offset(0.0f, 100f),
end = Offset(100f, 0f)
)
Box(
modifier
.background(brush = initialsGradient)
modifier.background(brush = initialsGradient)
) {
Text(
modifier = Modifier
.align(Alignment.Center),
modifier = Modifier.align(Alignment.Center),
text = initials,
fontSize = 24.sp,
color = Color.White,

View file

@ -6,7 +6,7 @@ import androidx.compose.runtime.Stable
data class AvatarData(
val initials: String = "",
val model: ByteArray? = null,
val size: Int = 0
val size: AvatarSize = AvatarSize.MEDIUM
) {
override fun equals(other: Any?): Boolean {
if (this === other) return true
@ -27,7 +27,7 @@ data class AvatarData(
override fun hashCode(): Int {
var result = initials.hashCode()
result = 31 * result + (model?.contentHashCode() ?: 0)
result = 31 * result + size
result = 31 * result + size.value
return result
}

View file

@ -0,0 +1,11 @@
package io.element.android.x.designsystem.components.avatar
import androidx.compose.ui.unit.dp
enum class AvatarSize(val value: Int) {
SMALL(32),
MEDIUM(40),
BIG(48);
val dp = value.dp
}