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

Give the id to AvatarData to be able to compute initial properly.

Browse source
This commit is contained in:
Benoit Marty 2023-02-13 10:06:30 +01:00 • committed by Benoit Marty
parent b439109d05
commit 443076f636
19 changed files with 76 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt
View file

@ -38,7 +38,8 @@ class MatrixItemHelper @Inject constructor(
val userDisplayName = client.loadUserDisplayName().getOrNull()
val avatarData =
AvatarData(
userDisplayName ?: client.userId().value,
client.userId().value,
userDisplayName,
userAvatarUrl,
avatarSize
)

18
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserPreviewParameterProvider.kt
View file

@ -17,22 +17,24 @@
package io.element.android.libraries.matrix.ui.components
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.anAvatarData
import io.element.android.libraries.matrix.core.UserId
import io.element.android.libraries.matrix.ui.model.MatrixUser
open class MatrixUserPreviewParameterProvider : PreviewParameterProvider<MatrixUser> {
override val values: Sequence<MatrixUser>
get() = sequenceOf(
aMatrixUser(),
MatrixUser(
id = UserId("@alice:server.org"),
username = "Alice",
avatarData = AvatarData("Alice")
),
MatrixUser(
id = UserId("@alice:server.org"),
id = UserId("@id_of_alice:server.org"),
username = null,
avatarData = AvatarData("Alice")
avatarData = anAvatarData().copy(name = null)
),
)
}
fun aMatrixUser() = MatrixUser(
id = UserId("@id_of_alice:server.org"),
username = "Alice",
avatarData = anAvatarData()
)

2
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt
View file

@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.core.UserId
data class MatrixUser(
val id: UserId,
val username: String? = null,
val avatarData: AvatarData = AvatarData(),
val avatarData: AvatarData = AvatarData(id.value, username),
)
fun MatrixUser.getBestName(): String {