highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-26 17:52:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes replying information

Browse Source
This commit is contained in:
Vitor Pamplona 2023-01-27 13:41:54 -03:00
parent b5ee783107
commit 74df3333ef
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt
View File

@ -41,7 +41,9 @@ fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix:
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
)
mentions.toSet().forEachIndexed { idx, user ->
val mentionSet = mentions.toSet()
mentionSet.toSet().forEachIndexed { idx, user ->
val innerUserState by user.live.observeAsState()
val innerUser = innerUserState?.user
@ -52,13 +54,13 @@ fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix:
onClick = { onUserTagClick(myUser) }
)
if (idx < mentions.size - 2) {
if (idx < mentionSet.size - 2) {
Text(
", ",
fontSize = 13.sp,
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
)
} else if (idx < mentions.size - 1) {
} else if (idx < mentionSet.size - 1) {
Text(
" and ",
fontSize = 13.sp,
@ -115,7 +117,9 @@ fun ReplyInformationChannel(replyTo: MutableList<Note>?,
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
)
mentions.toSet().forEachIndexed { idx, user ->
val mentionSet = mentions.toSet()
mentionSet.forEachIndexed { idx, user ->
val innerUserState by user.live.observeAsState()
val innerUser = innerUserState?.user
@ -126,13 +130,13 @@ fun ReplyInformationChannel(replyTo: MutableList<Note>?,
onClick = { onUserTagClick(myUser) }
)
if (idx < mentions.size - 2) {
if (idx < mentionSet.size - 2) {
Text(
", ",
fontSize = 13.sp,
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
)
} else if (idx < mentions.size - 1) {
} else if (idx < mentionSet.size - 1) {
Text(
" and ",
fontSize = 13.sp,