From 96e434bfcf8f1fbb2920123837113d71ccff3943 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Tue, 2 Apr 2024 09:52:52 -0400
Subject: [PATCH] Fixes the lack of following mark on chats

---
 .../ui/note/ChatroomMessageCompose.kt         | 20 +++++++++++++++++--
 .../vitorpamplona/amethyst/ui/theme/Shape.kt  |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
index 11c6472ac..1c09881e5 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
@@ -25,6 +25,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -83,6 +84,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size20dp
 import com.vitorpamplona.amethyst.ui.theme.Size5dp
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.chatAuthorBox
 import com.vitorpamplona.amethyst.ui.theme.chatAuthorImage
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -346,6 +348,7 @@ private fun MessageBubbleLines(
             baseNote,
             alignment,
             accountViewModel.settings.showProfilePictures.value,
+            accountViewModel,
             nav,
         )
     }
@@ -704,6 +707,7 @@ private fun DrawAuthorInfo(
     baseNote: Note,
     alignment: Arrangement.Horizontal,
     loadProfilePicture: Boolean,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
     baseNote.author?.let {
@@ -717,7 +721,7 @@ private fun DrawAuthorInfo(
                         nav("User/${baseNote.author?.pubkeyHex}")
                     },
         ) {
-            WatchAndDisplayUser(it, loadProfilePicture, nav)
+            WatchAndDisplayUser(it, loadProfilePicture, accountViewModel, nav)
         }
     }
 }
@@ -726,11 +730,23 @@ private fun DrawAuthorInfo(
 private fun WatchAndDisplayUser(
     author: User,
     loadProfilePicture: Boolean,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
     val userState by author.live().userMetadataInfo.observeAsState()
 
-    UserIcon(author.pubkeyHex, userState?.picture, loadProfilePicture)
+    Box(chatAuthorBox, contentAlignment = Alignment.TopEnd) {
+        InnerUserPicture(
+            userHex = author.pubkeyHex,
+            userPicture = userState?.picture,
+            userName = userState?.bestName(),
+            size = Size20dp,
+            modifier = Modifier,
+            accountViewModel = accountViewModel,
+        )
+
+        ObserveAndDisplayFollowingMark(author.pubkeyHex, Size5dp, accountViewModel)
+    }
 
     if (userState != null) {
         DisplayMessageUsername(userState?.bestName() ?: author.pubkeyDisplayHex(), userState?.tags ?: EmptyTagList)
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
index e1381f1d7..57c6d7d80 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
@@ -228,5 +228,6 @@ val liveStreamTag =
         .background(Color.Black)
         .padding(horizontal = Size5dp)
 
+val chatAuthorBox = Modifier.size(20.dp)
 val chatAuthorImage = Modifier.size(20.dp).clip(shape = CircleShape)
 val AuthorInfoVideoFeed = Modifier.width(75.dp).padding(end = 15.dp)