From ca8d940c0ef9bd90a15652fc846977c2c9efc827 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 23 Dec 2021 16:02:35 +0100
Subject: [PATCH] [merge] Fix some bubble layout
Change-Id: I472d12d111de2352544c136a17288e54328a3c5d
---
.../home/room/detail/timeline/item/AbsMessageItem.kt | 2 +-
vector/src/main/res/layout/item_timeline_event_base.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 17a9ddd45f..70fdb19f01 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -212,7 +212,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
// Render send state indicator
if (contentInBubble) {
// Bubbles have their own decoration in the anonymous read receipt (in the message footer)
- holder.sendStateImageView.render(SendStateDecoration.NONE)
+ holder.sendStateImageView.isVisible = false
holder.eventSendingIndicator.isVisible = false
} else {
holder.sendStateImageView.render(attributes.informationData.sendStateDecoration)
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index f19bba23e7..ad5556514e 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -83,7 +83,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/messageMemberNameView"
- android:layout_marginEnd="8dp"
android:layout_toStartOf="@id/messageSendStateImageView"
android:layout_toEndOf="@id/messageStartGuideline"
android:layout_marginHorizontal="8dp"
@@ -99,7 +98,8 @@
android:layout_marginVertical="4dp"
android:clipChildren="false"
android:clipToPadding="false"
- tools:background="@drawable/msg_bubble_incoming">
+ tools:background="@drawable/msg_bubble_text_incoming"
+ tools:ignore="UselessParent">
<!--
<im.vector.app.core.platform.EllipsizingTextView
@@ -254,7 +254,7 @@
android:layout_marginBottom="4dp"
android:contentDescription="@string/event_status_a11y_sending"
android:src="@drawable/ic_sending_message"
- android:visibility="invisible"
+ android:visibility="gone"
tools:tint="?vctr_content_tertiary"
tools:visibility="visible" />