ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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 8fb4a5d106
commit de05c761ce
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt
+1
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"),
) )
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt
+2 -1
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,