From 8858deb42fba3fd98be35c2d58faa3a7b85ab7ea Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 16 Oct 2023 10:20:53 +0200
Subject: [PATCH] Improved incoming bubble layout

---
 .../chat/adapter/ConversationEventAdapter.kt  |  8 +--
 .../main/res/layout/chat_bubble_incoming.xml  | 69 +++++++------------
 app/src/main/res/values/dimen.xml             |  2 +
 3 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
index 1032e5a7e..0e7d8b4c5 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
@@ -149,14 +149,12 @@ class ConversationEventAdapter(
 
     private class EventLogDiffCallback : DiffUtil.ItemCallback<EventLogModel>() {
         override fun areItemsTheSame(oldItem: EventLogModel, newItem: EventLogModel): Boolean {
-            return if (oldItem.isEvent && newItem.isEvent) {
-                oldItem.notifyId == newItem.notifyId
-            } else if (!oldItem.isEvent && !newItem.isEvent) {
+            return if (!oldItem.isEvent && !newItem.isEvent) {
                 val oldData = (oldItem.model as ChatMessageModel)
                 val newData = (newItem.model as ChatMessageModel)
-                oldData.id.isNotEmpty() && oldData.id == newData.id
+                oldData.time == newData.time && oldData.isOutgoing == newData.isOutgoing
             } else {
-                false
+                oldItem.notifyId == newItem.notifyId
             }
         }
 
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 4ea506cca..0ab7cac46 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -19,8 +19,9 @@
         android:onLongClick="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@{model.isGroupedWithPreviousOne ? @dimen/chat_bubble_grouped_top_margin : @dimen/chat_bubble_top_margin, default=@dimen/chat_bubble_top_margin}"
-        android:layout_marginStart="16dp">
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="@{model.isGroupedWithPreviousOne ? @dimen/chat_bubble_grouped_top_margin : @dimen/chat_bubble_top_margin, default=@dimen/chat_bubble_top_margin}">
 
         <com.google.android.material.imageview.ShapeableImageView
             style="@style/avatar_imageview"
@@ -39,69 +40,48 @@
             android:layout_marginEnd="1dp"
             android:background="@drawable/led_background"
             android:padding="1dp"
-            app:presenceIcon="@{model.avatarModel.presenceStatus}"
             android:visibility="@{model.isGroupedWithPreviousOne || !model.isFromGroup || model.avatarModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE}"
+            app:presenceIcon="@{model.avatarModel.presenceStatus}"
             app:layout_constraintEnd_toEndOf="@id/avatar"
             app:layout_constraintBottom_toBottomOf="@id/avatar"/>
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/background_end_barrier"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:barrierDirection="end"
+            app:barrierMargin="10dp"
+            app:constraint_referenced_ids="delivery_status, text_message" />
+
         <ImageView
             android:id="@+id/background"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginStart="10dp"
             android:src="@{model.isGroupedWithPreviousOne ? @drawable/shape_chat_bubble_incoming_full : @drawable/shape_chat_bubble_incoming_first, default=@drawable/shape_chat_bubble_incoming_first}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/bubble_bottom_barrier"
             app:layout_constraintStart_toEndOf="@id/avatar"
-            app:layout_constraintEnd_toEndOf="@id/bubble_end_barrier"/>
+            app:layout_constraintEnd_toEndOf="@id/background_end_barrier"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/bubble_end_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="end"
-            app:barrierMargin="18dp"
-            app:constraint_referenced_ids="text_message, delivery_status"/>
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/bubble_bottom_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="text_bottom_anchor, delivery_status"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
+        <org.linphone.ui.main.chat.view.ChatBubbleTextView
             style="@style/default_text_style"
             android:id="@+id/text_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
+            android:layout_marginStart="16dp"
             android:layout_marginTop="12dp"
-            android:layout_marginEnd="18dp"
+            android:layout_marginEnd="16dp"
+            android:paddingBottom="@{model.groupedWithNextOne ? @dimen/chat_bubble_text_padding_with_status : @dimen/chat_bubble_text_padding_with_bubble, default=@dimen/chat_bubble_text_padding_with_status}"
             android:text="@{model.text, default=`Lorem ipsum dolor sit amet`}"
             android:textSize="14sp"
             android:textColor="@color/gray_main2_700"
             android:gravity="center_vertical|start"
             app:layout_constrainedWidth="true"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintTop_toTopOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintEnd_toStartOf="@id/text_end_anchor"/>
-
-        <View
-            android:id="@+id/text_bottom_anchor"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="12dp"
-            app:layout_constraintTop_toBottomOf="@id/text_message"
-            app:layout_constraintStart_toStartOf="@id/text_message"/>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/text_end_anchor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_end="16dp" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toEndOf="@id/avatar"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
@@ -109,14 +89,13 @@
             android:onClick="@{() -> model.showDeliveryInfo()}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
+            android:paddingBottom="5dp"
             android:text="@{model.time, default=`13:40`}"
             android:textSize="12sp"
             android:visibility="@{model.isGroupedWithNextOne ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/text_message"
-            app:layout_constraintStart_toStartOf="@id/text_message"
-            app:layout_constraintBottom_toBottomOf="@id/background"/>
+            app:layout_constraintStart_toStartOf="@id/text_message"/>
 
         <ImageView
             style="@style/default_text_style_300"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 91f10942d..1703b643a 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -63,4 +63,6 @@
     <dimen name="chat_bubble_grouped_top_margin">4dp</dimen>
     <dimen name="chat_bubble_top_margin">16dp</dimen>
     <dimen name="chat_bubble_long_press_menu_bubble_offset">110dp</dimen>
+    <dimen name="chat_bubble_text_padding_with_bubble">12dp</dimen>
+    <dimen name="chat_bubble_text_padding_with_status">5dp</dimen>
 </resources>
\ No newline at end of file