From 0bc81392d7f578a35cec991d1016de4b97fddf03 Mon Sep 17 00:00:00 2001
From: Diogo <diogofncunha@gmail.com>
Date: Tue, 24 Sep 2024 15:20:18 +0100
Subject: [PATCH] align first chat bubble with image

---
 .../chat/simplex/common/views/chat/ChatView.kt   | 16 ++++++++++++----
 .../common/views/helpers/ChatInfoImage.kt        |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index fadfcb770c..621993c86a 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -12,8 +12,10 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.graphics.*
+import androidx.compose.ui.layout.layout
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.*
 import dev.icerock.moko.resources.compose.painterResource
@@ -1140,12 +1142,16 @@ fun BoxWithConstraintsScope.ChatItemsList(
                         androidx.compose.animation.AnimatedVisibility(selectionVisible, enter = fadeIn(), exit = fadeOut()) {
                           SelectedChatItem(Modifier, cItem.id, selectedChatItems)
                         }
-                        Row(Modifier.graphicsLayer { translationX = selectionOffset.toPx() },
-                          horizontalArrangement = Arrangement.spacedBy(4.dp)) {
+                        Row(
+                          Modifier.graphicsLayer { translationX = selectionOffset.toPx() },
+                          horizontalArrangement = Arrangement.spacedBy(4.dp)
+                        ) {
                           Box(Modifier.clickable { showMemberInfo(chatInfo.groupInfo, member) }) {
                             MemberImage(member)
                           }
-                          ChatItemViewShortHand(cItem, itemSeparation, range, false)
+                          Box(modifier = Modifier.padding(top = 2.dp)) {
+                            ChatItemViewShortHand(cItem, itemSeparation, range, false)
+                          }
                         }
                       }
                     }
@@ -1445,7 +1451,9 @@ val MEMBER_IMAGE_SIZE: Dp = 38.dp
 
 @Composable
 fun MemberImage(member: GroupMember) {
-  MemberProfileImage(MEMBER_IMAGE_SIZE * fontSizeSqrtMultiplier, member, backgroundColor = MaterialTheme.colors.background)
+  Box(Modifier.padding(horizontal = 3.dp)) {
+    ProfileImageForActiveCall((MEMBER_IMAGE_SIZE - 6.dp) * fontSizeSqrtMultiplier, member.image, backgroundColor = MaterialTheme.colors.background)
+  }
 }
 
 @Composable
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
index 1289687601..d338c57e61 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
@@ -137,9 +137,10 @@ fun ProfileImageForActiveCall(
   size: Dp,
   image: String? = null,
   color: Color = MaterialTheme.colors.secondaryVariant,
-) {
+  backgroundColor: Color? = null,
+  ) {
   if (image == null) {
-    Box(Modifier.requiredSize(size).clip(CircleShape)) {
+    Box(Modifier.requiredSize(size).clip(CircleShape).then(if (backgroundColor != null) Modifier.background(backgroundColor) else Modifier)) {
       Icon(
         AccountCircleFilled,
         contentDescription = stringResource(MR.strings.icon_descr_profile_image_placeholder),