From 03d8cb54f94677b5f435c416f2cf18384fb59eb2 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 21 Aug 2020 13:18:41 +0200
Subject: [PATCH] Chat bubbles improvements (grouping/selection in edit mode)

---
 .../activities/main/chat/adapters/ChatMessagesListAdapter.kt  | 2 +-
 app/src/main/res/layout/chat_message_list_cell.xml            | 4 +++-
 app/src/main/res/values/dimen.xml                             | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
index a0791a0a3..389b13387 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
@@ -46,7 +46,7 @@ import org.linphone.utils.LifecycleViewHolder
 
 class ChatMessagesListAdapter(val selectionViewModel: ListTopBarViewModel) : LifecycleListAdapter<EventLog, LifecycleViewHolder>(ChatMessageDiffCallback()) {
     companion object {
-        const val MAX_TIME_TO_GROUP_MESSAGES = 300 // 5 minutes
+        const val MAX_TIME_TO_GROUP_MESSAGES = 60 // 1 minute
     }
 
     val resendMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {
diff --git a/app/src/main/res/layout/chat_message_list_cell.xml b/app/src/main/res/layout/chat_message_list_cell.xml
index f698f0024..4cb6dfcba 100644
--- a/app/src/main/res/layout/chat_message_list_cell.xml
+++ b/app/src/main/res/layout/chat_message_list_cell.xml
@@ -70,6 +70,7 @@
 
         <LinearLayout
             android:id="@+id/background"
+            android:onClick="@{clickListener}"
             android:onLongClick="@{contextMenuClickListener}"
             android:background="@{viewModel.backgroundRes, default=@drawable/chat_bubble_outgoing_full}"
             android:descendantFocusability="blocksDescendants"
@@ -81,7 +82,7 @@
             android:layout_below="@id/time"
             android:layout_marginBottom="1dp"
             android:layout_marginRight="3dp"
-            android:layout_marginLeft="@{!viewModel.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? @dimen/incoming_chat_message_bubble_left_margin : @dimen/outgoing_chat_message_bubble_left_margin}"
+            android:layout_marginLeft="@{selectionListViewModel.isEditionEnabled ? @dimen/edit_chat_message_bubble_left_margin : !viewModel.chatMessage.outgoing ? @dimen/incoming_chat_message_bubble_left_margin : @dimen/outgoing_chat_message_bubble_left_margin}"
             android:paddingTop="5dp"
             android:paddingBottom="5dp">
 
@@ -128,6 +129,7 @@
                 app:justifyContent="center"/>
 
             <org.linphone.activities.main.chat.views.MultiLineWrapContentWidthTextView
+                android:onClick="@{clickListener}"
                 android:onLongClick="@{contextMenuClickListener}"
                 android:text="@{viewModel.text}"
                 android:visibility="@{viewModel.text.length > 0 ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 16a5c8125..bf47fda4b 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="edit_chat_message_bubble_left_margin">10dp</dimen>
     <dimen name="incoming_chat_message_bubble_left_margin">0dp</dimen>
     <dimen name="outgoing_chat_message_bubble_left_margin">45dp</dimen>
     <dimen name="chat_message_bubble_image_height_big">200dp</dimen>