Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 08:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix about sheet member label emoji not respecting 'use system emoji' preference.

Browse Source
This commit is contained in:
jeffrey-signal
2026-03-12 17:37:27 -04:00
parent 55e029e81d
commit d19c536000
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
View File

@@ -53,6 +53,7 @@ import org.thoughtcrime.securesms.AvatarPreviewActivity
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.avatar.AvatarImage
import org.thoughtcrime.securesms.components.emoji.EmojiTextView
import org.thoughtcrime.securesms.components.emoji.Emojifier
import org.thoughtcrime.securesms.conversation.v2.UnverifiedProfileNameBottomSheet
import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.groups.memberlabel.MemberLabel
@@ -373,20 +374,26 @@ private fun MemberLabelRow(
text = {
if (memberLabel != null) {
if (!memberLabel.emoji.isNullOrEmpty()) {
Text(
text = memberLabel.emoji,
style = MaterialTheme.typography.bodyLarge
)
Emojifier(text = memberLabel.emoji) { annotatedText, inlineContent ->
Text(
text = annotatedText,
inlineContent = inlineContent,
style = MaterialTheme.typography.bodyLarge
)
}
Spacer(modifier = Modifier.size(4.dp))
}
Text(
text = memberLabel.displayText,
style = MaterialTheme.typography.bodyLarge,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f, false)
)
Emojifier(text = memberLabel.displayText) { annotatedText, inlineContent ->
Text(
text = annotatedText,
inlineContent = inlineContent,
style = MaterialTheme.typography.bodyLarge,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f, false)
)
}
} else {
Text(
text = stringResource(id = R.string.AboutSheet__add_group_member_label),