fix: missing message content with bubble disabled [WPB-21763] (#4418)

(cherry picked from commit c179728)

Author: Garzas

app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageBubbleItem.kt

@@ -44,7 +44,6 @@ import androidx.compose.ui.unit.dp
 import com.wire.android.ui.common.applyIf
 import com.wire.android.ui.common.colorsScheme
 import com.wire.android.ui.common.dimensions
-import com.wire.android.ui.common.spacers.HorizontalSpace
 import com.wire.android.ui.home.conversations.model.MessageSource
 import com.wire.android.ui.home.conversations.model.MessageStatus
 import com.wire.android.ui.home.conversations.model.UIMessage
@@ -90,7 +89,7 @@ fun MessageBubbleItem(
         val leadingPadding = if (leading != null) {
             dimensions().spacing48x
         } else {
-            dimensions().spacing0x
+            dimensions().spacing12x
         }
         Row(
             modifier = Modifier.fillMaxWidth(),
@@ -101,12 +100,10 @@ fun MessageBubbleItem(
             },
             verticalAlignment = Alignment.Bottom
         ) {
-            if (leading != null) {
-                Box(Modifier.width(leadingPadding), contentAlignment = Alignment.BottomStart) {
+            Box(Modifier.width(leadingPadding), contentAlignment = Alignment.BottomStart) {
+                if (leading != null) {
                     leading()
                 }
-            } else {
-                HorizontalSpace.x12()
             }
             Column(
                 modifier = Modifier.applyIf(!message.decryptionFailed) {

app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageContentAndStatus.kt

@@ -1,6 +1,7 @@
 package com.wire.android.ui.home.conversations.messages.item
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -12,6 +13,7 @@ import androidx.compose.ui.res.stringResource
 import com.wire.android.R
 import com.wire.android.media.audiomessage.AudioMessageArgs
 import com.wire.android.model.Clickable
+import com.wire.android.ui.common.applyIf
 import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.spacers.HorizontalSpace
 import com.wire.android.ui.common.spacers.VerticalSpace
@@ -52,7 +54,6 @@ internal fun UIMessage.Regular.MessageContentAndStatus(
     onReplyClicked: (UIMessage.Regular) -> Unit,
     shouldDisplayMessageStatus: Boolean,
     conversationDetailsData: ConversationDetailsData,
-    modifier: Modifier = Modifier,
     accent: Accent = Accent.Unknown,
 ) {
     val onAssetClickable = remember(message) {
@@ -70,17 +71,16 @@ internal fun UIMessage.Regular.MessageContentAndStatus(
             onReplyClicked(message)
         }
     }
-    Column(
-        modifier
-    ) {
-        MessageContent(
-            message = message,
-            messageContent = messageContent,
-            searchQuery = searchQuery,
-            assetStatus = assetStatus,
-            onAssetClick = onAssetClickable,
-            onImageClick = onImageClickable,
-            onOpenProfile = onProfileClicked,
+    Row {
+        Column(Modifier.applyIf(!messageStyle.isBubble()) { weight(1F) }) {
+            MessageContent(
+                message = message,
+                messageContent = messageContent,
+                searchQuery = searchQuery,
+                assetStatus = assetStatus,
+                onAssetClick = onAssetClickable,
+                onImageClick = onImageClickable,
+                onOpenProfile = onProfileClicked,
             onLinkClick = onLinkClicked,
             onReplyClick = onReplyClickable,
             messageStyle = messageStyle,
@@ -110,7 +110,7 @@ internal fun UIMessage.Regular.MessageContentAndStatus(
         if (message.isTextContentWithoutQuote) {
             VerticalSpace.x2()
         } else {
-            VerticalSpace.x4()
+            VerticalSpace.x4()}
         }
     }
 }

app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageContentItem.kt

@@ -29,7 +29,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.wire.android.R
-import com.wire.android.ui.common.applyIf
 import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.spacers.HorizontalSpace
 import com.wire.android.ui.common.spacers.VerticalSpace
@@ -101,10 +100,6 @@ fun MessageContentItem(
                     shouldDisplayMessageStatus = shouldDisplayMessageStatus,
                     conversationDetailsData = conversationDetailsData,
                     onReplyClicked = clickActions.onReplyClicked,
-                    modifier = Modifier
-                        .applyIf(!messageStyle.isBubble()) {
-                            weight(1F)
-                        }
                 )
                 if (shouldDisplayFooter && !messageStyle.isBubble()) {
                     VerticalSpace.x4()