From c4f4cd85c4d0c60b6a1b9946b46ce0bc389cf273 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sat, 7 May 2022 14:00:17 +0100
Subject: [PATCH] android: fix quotes with images and files (#611)

---
 .../app/views/chat/item/FramedItemView.kt     | 52 +++++++++++++------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt
index 19eabed563..e14e031538 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt
@@ -43,11 +43,9 @@ fun FramedItemView(
   val sent = ci.chatDir.sent
 
   @Composable
-  fun ciQuotedMsgView(qi: CIQuote, paddingEnd: Dp = 0.dp) {
+  fun ciQuotedMsgView(qi: CIQuote) {
     Box(
-      Modifier
-        .padding(vertical = 6.dp, horizontal = 12.dp)
-        .padding(end = paddingEnd),
+      Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
       contentAlignment = Alignment.TopStart
     ) {
       MarkdownText(
@@ -66,24 +64,21 @@ fun FramedItemView(
     ) {
       when (qi.content) {
         is MsgContent.MCImage -> {
-          ciQuotedMsgView(qi)
-          // TODO fix quotes containing long text and image / file
-          // ciQuotedMsgView(qi, paddingEnd = 60.dp)
-          Spacer(Modifier.weight(1f))
+          Box(Modifier.fillMaxWidth().weight(1f)) {
+            ciQuotedMsgView(qi)
+          }
           val imageBitmap = base64ToBitmap(qi.content.image).asImageBitmap()
           Image(
             imageBitmap,
             contentDescription = stringResource(R.string.image_descr),
             contentScale = ContentScale.Crop,
-            modifier = Modifier
-              .size(60.dp)
-              .clipToBounds()
+            modifier = Modifier.size(68.dp).clipToBounds()
           )
         }
         is MsgContent.MCFile -> {
-          ciQuotedMsgView(qi)
-          // ciQuotedMsgView(qi, paddingEnd = 26.dp)
-          Spacer(Modifier.weight(1f))
+          Box(Modifier.fillMaxWidth().weight(1f)) {
+            ciQuotedMsgView(qi)
+          }
           Icon(
             Icons.Filled.InsertDriveFile,
             stringResource(R.string.icon_descr_file),
@@ -93,7 +88,7 @@ fun FramedItemView(
             tint = if (isSystemInDarkTheme()) FileDark else FileLight
           )
         }
-        else -> ciQuotedMsgView(qi, 22.dp)
+        else -> ciQuotedMsgView(qi)
       }
     }
   }
@@ -317,3 +312,30 @@ fun PreviewQuoteWithLongTextAndImage(@PreviewParameter(EditedProvider::class) ed
     )
   }
 }
+
+@Preview
+@Composable
+fun PreviewQuoteWithLongTextAndFile(@PreviewParameter(EditedProvider::class) edited: Boolean) {
+  val ciQuote = CIQuote(
+    chatDir = CIDirection.DirectRcv(), itemId = 1, sentAt = Clock.System.now(),
+    content = MsgContent.MCFile(
+      text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+    )
+  )
+  val showMenu = remember { mutableStateOf(false) }
+  SimpleXTheme {
+    FramedItemView(
+      User.sampleData,
+      ChatItem.getSampleData(
+        1, CIDirection.DirectSnd(),
+        Clock.System.now(),
+        "Hello there",
+        CIStatus.SndSent(),
+        quotedItem = ciQuote,
+        itemEdited = edited
+      ),
+      showMenu = showMenu,
+      receiveFile = {}
+    )
+  }
+}