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

Take DisplayedStatus directly in DisplayNameWithStatus and always show emoji

Browse Source
This commit is contained in:
ganfra
2026-07-17 10:13:45 +02:00
parent 9c3fe5ad23
commit b9831734a0
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt
+4 -2
View File
@@ -21,6 +21,8 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.matrix.api.user.DisplayedStatus
import io.element.android.libraries.matrix.ui.model.toEmojiText
/**
* Component to display side by side a display name and an optional status.
@@ -28,7 +30,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
@Composable
fun DisplayNameWithStatus(
name: String,
status: String?,
status: DisplayedStatus?,
style: TextStyle,
modifier: Modifier = Modifier,
nameColor: Color = Color.Unspecified,
@@ -52,7 +54,7 @@ fun DisplayNameWithStatus(
if (status != null) {
Spacer(Modifier.width(4.dp))
Text(
text = status,
text = status.toEmojiText(),
style = style,
color = ElementTheme.colors.textSecondary,
)
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
+2 -3
View File
@@ -31,7 +31,6 @@ import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.matrix.api.user.MatrixUser
import io.element.android.libraries.matrix.ui.model.getAvatarData
import io.element.android.libraries.matrix.ui.model.getBestName
import io.element.android.libraries.matrix.ui.model.toEmojiText
@Composable
fun MatrixUserHeader(
@@ -60,9 +59,9 @@ fun MatrixUserHeader(
// Name
DisplayNameWithStatus(
name = matrixUser.getBestName(),
status = matrixUser.displayedStatus?.toEmojiText(),
status = matrixUser.displayedStatus,
nameColor = ElementTheme.colors.textPrimary,
style = ElementTheme.typography.fontHeadingMdRegular
style = ElementTheme.typography.fontHeadingMdRegular,
)
// Id
if (matrixUser.displayName.isNullOrEmpty().not()) {
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
+1 -2
View File
@@ -20,7 +20,6 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.matrix.api.user.MatrixUser
import io.element.android.libraries.matrix.ui.model.getAvatarData
import io.element.android.libraries.matrix.ui.model.getBestName
import io.element.android.libraries.matrix.ui.model.toEmojiText
@Composable
fun MatrixUserRow(
@@ -34,7 +33,7 @@ fun MatrixUserRow(
nameContent = {
DisplayNameWithStatus(
name = matrixUser.getBestName(),
status = matrixUser.displayedStatus?.toEmojiText(),
status = matrixUser.displayedStatus,
nameColor = ElementTheme.colors.textPrimary,
style = ElementTheme.typography.fontBodyLgRegular,
)