From d8e5697168b3c8cd81513774550eac654c705992 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 27 May 2020 15:12:38 +0200
Subject: [PATCH] Message bubble cleanup, visibility fix, alignment fix

---
 .../detail/timeline/item/AbsMessageItem.kt    |   1 +
 .../res/layout/item_timeline_event_base.xml   |  15 +-
 .../layout/item_timeline_event_base_bak.xml   | 189 ------------------
 3 files changed, 6 insertions(+), 199 deletions(-)
 delete mode 100644 vector/src/main/res/layout/item_timeline_event_base_bak.xml

diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 626047ddc4..5db26212ec 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -104,6 +104,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
             if (attributes.informationData.showInformation /* && contentInBubble && attributes.informationData.sentByMe */) {
                 holder.bubbleTimeView.visibility = View.VISIBLE
                 holder.bubbleTimeView.text = attributes.informationData.time
+                holder.bubbleMemberNameView.visibility = View.VISIBLE
                 holder.bubbleMemberNameView.setOnClickListener(_memberNameClickListener)
                 holder.bubbleMemberNameView.text = attributes.informationData.memberName
                 holder.bubbleMemberNameView.setOnLongClickListener(attributes.itemLongClickListener)
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 11cce87e86..f557f14e1f 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -24,14 +24,6 @@
         android:layout_marginTop="4dp"
         tools:src="@tools:sample/avatars" />
 
-    <!--  spacer so rtl-hack works better with messageMemberNameView  -->
-    <View
-        android:id="@+id/spacer_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/messageTimeView"
-        android:layout_toEndOf="@+id/messageMemberNameView" />
-
     <im.vector.riotx.core.platform.EllipsizingTextView
         android:id="@+id/messageMemberNameView"
         android:layout_width="wrap_content"
@@ -42,6 +34,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
         android:layout_marginRight="8dp"
+        android:layout_toStartOf="@+id/messageTimeView"
         android:layout_toEndOf="@+id/messageStartGuideline"
         android:ellipsize="end"
         android:maxLines="1"
@@ -95,14 +88,16 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/messageMemberNameView"
         android:layout_toEndOf="@id/messageStartGuideline"
-        android:layout_alignStart="@+id/messageMemberNameView">
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="0dp"
+        >
 
         <RelativeLayout
             android:id="@+id/bubbleView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="0dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="0dp"
             android:layout_marginVertical="4dp"
             tools:background="@drawable/msg_bubble_incoming">
 
diff --git a/vector/src/main/res/layout/item_timeline_event_base_bak.xml b/vector/src/main/res/layout/item_timeline_event_base_bak.xml
deleted file mode 100644
index e45874e840..0000000000
--- a/vector/src/main/res/layout/item_timeline_event_base_bak.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/eventBaseView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:addStatesFromChildren="true"
-    android:background="?attr/selectableItemBackground">
-
-    <im.vector.riotx.core.platform.CheckableView
-        android:id="@+id/messageSelectedBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/informationBottom"
-        android:layout_alignParentTop="true"
-        android:background="?riotx_highlighted_message_background" />
-
-    <ImageView
-        android:id="@+id/messageAvatarImageView"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="4dp"
-        tools:src="@tools:sample/avatars" />
-
-    <!--  spacer so rtl-hack works better with messageMemberNameView  -->
-    <View
-        android:id="@+id/spacer_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/messageTimeView"
-        android:layout_toEndOf="@+id/messageMemberNameView" />
-
-    <im.vector.riotx.core.platform.EllipsizingTextView
-        android:id="@+id/messageMemberNameView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="4dp"
-        android:layout_marginRight="8dp"
-        android:layout_toEndOf="@+id/messageStartGuideline"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?riotx_text_primary"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        tools:text="@sample/matrix.json/data/displayName" />
-
-    <TextView
-        android:id="@+id/messageTimeView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/messageMemberNameView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:textColor="?riotx_text_secondary"
-        android:textSize="12sp"
-        tools:text="@tools:sample/date/hhmm" />
-
-    <View
-        android:id="@+id/messageStartGuideline"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        tools:layout_marginStart="52dp" />
-
-    <Space
-        android:id="@+id/decorationSpace"
-        android:layout_width="4dp"
-        android:layout_height="8dp"
-        android:layout_toEndOf="@id/messageStartGuideline"
-        />
-
-    <ImageView
-        android:id="@+id/messageE2EDecoration"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_alignTop="@id/viewStubContainer"
-        android:layout_marginTop="7dp"
-        android:layout_alignEnd="@id/decorationSpace"
-        android:visibility="gone"
-        tools:src="@drawable/ic_shield_warning"
-        tools:visibility="visible" />
-
-    <FrameLayout
-        android:id="@+id/viewStubContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/messageMemberNameView"
-        android:layout_toEndOf="@id/messageStartGuideline"
-        android:addStatesFromChildren="true">
-
-        <ViewStub
-            android:id="@+id/messageContentTextStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:inflatedId="@id/messageTextView"
-            android:layout="@layout/item_timeline_event_text_message_stub"
-            tools:visibility="visible" />
-
-        <ViewStub
-            android:id="@+id/messageContentCodeBlockStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout="@layout/item_timeline_event_code_block_stub"
-            tools:visibility="visible" />
-
-        <ViewStub
-            android:id="@+id/messageContentMediaStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/messageContentMedia"
-            android:layout="@layout/item_timeline_event_media_message_stub" />
-
-        <ViewStub
-            android:id="@+id/messageContentFileStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout="@layout/item_timeline_event_file_stub" />
-
-        <ViewStub
-            android:id="@+id/messageContentRedactedStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="20dp"
-            android:layout_marginEnd="56dp"
-            android:layout="@layout/item_timeline_event_redacted_stub" />
-
-        <ViewStub
-            android:id="@+id/messagePollStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="56dp"
-            android:layout="@layout/item_timeline_event_poll_stub" />
-
-        <ViewStub
-            android:id="@+id/messageOptionsStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="56dp"
-            android:layout="@layout/item_timeline_event_option_buttons_stub" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/informationBottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/viewStubContainer"
-        android:layout_toEndOf="@+id/messageStartGuideline"
-        android:addStatesFromChildren="true"
-        android:orientation="vertical">
-
-        <com.google.android.flexbox.FlexboxLayout
-            android:id="@+id/reactionsContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginBottom="4dp"
-            app:dividerDrawable="@drawable/reaction_divider"
-            app:flexWrap="wrap"
-            app:showDivider="middle"
-            tools:background="#F0E0F0"
-            tools:layout_height="40dp">
-
-            <!-- ReactionButtons will be added here in the code -->
-            <!--im.vector.riotx.features.reactions.widget.ReactionButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" /-->
-
-        </com.google.android.flexbox.FlexboxLayout>
-
-        <im.vector.riotx.core.ui.views.ReadReceiptsView
-            android:id="@+id/readReceiptsView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="4dp" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file