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

Use getBestName() for a matrix user name

Browse source
This commit is contained in:
Maxime NATUREL 2023-03-14 15:27:53 +01:00 • committed by Florian Renaud
parent fa81690e0e
commit 4f00592023
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt
View file

@ -28,6 +28,7 @@ open class SelectUsersStateProvider : PreviewParameterProvider<SelectUsersState>
aSelectUsersState(), aSelectUsersState(),
aSelectUsersState().copy( aSelectUsersState().copy(
selectedUsers = persistentListOf( selectedUsers = persistentListOf(
aMatrixUser(userName = ""),
aMatrixUser(userName = "User"), aMatrixUser(userName = "User"),
aMatrixUser(userName = "User with long name"), aMatrixUser(userName = "User with long name"),
) )

3
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt
View file

@ -54,6 +54,7 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TextButton import io.element.android.libraries.designsystem.theme.components.TextButton
import io.element.android.libraries.matrix.ui.model.MatrixUser import io.element.android.libraries.matrix.ui.model.MatrixUser
import io.element.android.libraries.matrix.ui.model.getBestName
import io.element.android.libraries.ui.strings.R as StringR import io.element.android.libraries.ui.strings.R as StringR
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@ -154,7 +155,7 @@ fun SelectedUser(
) { ) {
Avatar(matrixUser.avatarData.copy(size = AvatarSize.Custom(56))) Avatar(matrixUser.avatarData.copy(size = AvatarSize.Custom(56)))
Text( Text(
text = matrixUser.username.orEmpty(), text = matrixUser.getBestName(),
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
maxLines = 1, maxLines = 1,
style = MaterialTheme.typography.bodyLarge, style = MaterialTheme.typography.bodyLarge,