highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-27 15:27:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changes to show the user name before the text on public messages.

Browse Source
This commit is contained in:
Vitor Pamplona
2025-08-06 18:26:11 -04:00
parent d22fc2874b
commit d0f3630abb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PublicMessage.kt
View File

@@ -59,10 +59,11 @@ fun RenderPublicMessage(
nav: INav, nav: INav,
) { ) {
val noteEvent = note.event as? PublicMessageEvent ?: return val noteEvent = note.event as? PublicMessageEvent ?: return
val content = remember(noteEvent) { noteEvent.peopleAndContent() }
if (makeItShort && accountViewModel.isLoggedUser(note.author)) { if (makeItShort && accountViewModel.isLoggedUser(note.author)) {
Text( Text(
text = noteEvent.content, text = content,
color = MaterialTheme.colorScheme.placeholderText, color = MaterialTheme.colorScheme.placeholderText,
maxLines = 2, maxLines = 2,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
@@ -75,7 +76,7 @@ fun RenderPublicMessage(
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
) { ) {
TranslatableRichTextViewer( TranslatableRichTextViewer(
content = noteEvent.content, content = content,
canPreview = canPreview && !makeItShort, canPreview = canPreview && !makeItShort,
quotesLeft = quotesLeft, quotesLeft = quotesLeft,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -91,8 +92,6 @@ fun RenderPublicMessage(
if (noteEvent.hasHashtags()) { if (noteEvent.hasHashtags()) {
DisplayUncitedHashtags(noteEvent, noteEvent.content, callbackUri, accountViewModel, nav) DisplayUncitedHashtags(noteEvent, noteEvent.content, callbackUri, accountViewModel, nav)
} }
DisplayUncitedUsers(noteEvent, accountViewModel, nav)
} }
} }