Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Timeline: add avatar and displayname (not dynamic...)

Browse source
This commit is contained in:
ganfra 2022-11-08 16:09:24 +01:00
parent 560d2a3291
commit c8b8c08c99
14 changed files with 206 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt
View file

@ -12,7 +12,6 @@ import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import coil.compose.AsyncImage
import io.element.android.x.designsystem.AvatarGradientEnd
@ -27,7 +26,7 @@ fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) {
if (avatarData.model == null) {
InitialsAvatar(
modifier = commonModifier,
initials = avatarData.initials
initials = avatarData.name.first().uppercase()
)
} else {
ImageAvatar(

6
libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarData.kt
View file

@ -4,7 +4,7 @@ import androidx.compose.runtime.Stable
@Stable
data class AvatarData(
val initials: String = "",
val name: String = "",
val model: ByteArray? = null,
val size: AvatarSize = AvatarSize.MEDIUM
) {
@ -14,7 +14,7 @@ data class AvatarData(
other as AvatarData
if (initials != other.initials) return false
if (name != other.name) return false
if (model != null) {
if (other.model == null) return false
if (!model.contentEquals(other.model)) return false
@ -25,7 +25,7 @@ data class AvatarData(
}
override fun hashCode(): Int {
var result = initials.hashCode()
var result = name.hashCode()
result = 31 * result + (model?.contentHashCode() ?: 0)
result = 31 * result + size.value
return result