From e03dcf3f88c44d1f147e4161eb08e9fa068470ed Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 4 Sep 2024 15:58:26 +0200
Subject: [PATCH] Increased touch area for IMDN notifications + hide keyboard
 when showing IMDN/Emoji bottom sheet

---
 .../linphone/ui/main/chat/fragment/ConversationFragment.kt  | 4 +++-
 app/src/main/res/layout/chat_bubble_incoming.xml            | 6 +++---
 app/src/main/res/layout/chat_bubble_outgoing.xml            | 6 +++---
 app/src/main/res/layout/help_debug_fragment.xml             | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
index 206885acd..01dc7bd63 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
@@ -1120,9 +1120,11 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         showDelivery: Boolean = false,
         showReactions: Boolean = false
     ) {
-        val bottomSheetBehavior = BottomSheetBehavior.from(binding.messageBottomSheet.root)
+        binding.sendArea.messageToSend.hideKeyboard()
 
+        val bottomSheetBehavior = BottomSheetBehavior.from(binding.messageBottomSheet.root)
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
+
         binding.messageBottomSheet.setHandleClickedListener {
             bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
         }
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index ab336107d..ed766cc42 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -228,7 +228,6 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
                 android:gravity="center_vertical|start"
                 android:orientation="horizontal">
 
@@ -239,6 +238,7 @@
                     android:onLongClick="@{onLongClickListener}"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:paddingTop="5dp"
                     android:text="@{model.time, default=`13:40`}"
                     android:textSize="12sp" />
 
@@ -248,9 +248,9 @@
                     android:onClick="@{showDeliveryInfoClickListener}"
                     android:onLongClick="@{onLongClickListener}"
                     android:layout_width="@dimen/small_icon_size"
-                    android:layout_height="@dimen/small_icon_size"
+                    android:layout_height="match_parent"
                     android:layout_marginStart="5dp"
-                    android:layout_marginTop="2dp"
+                    android:paddingTop="7dp"
                     android:contentDescription="@string/content_description_chat_bubble_delivery_status"
                     android:src="@{model.statusIcon, default=@drawable/checks}"
                     android:visibility="@{model.isFromGroup ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index c32720884..44e8a6e11 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -200,7 +200,6 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -234,6 +233,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
+                    android:paddingTop="5dp"
                     android:text="@{model.time, default=`13:40`}"
                     android:textSize="12sp" />
 
@@ -243,9 +243,9 @@
                     android:onClick="@{showDeliveryInfoClickListener}"
                     android:onLongClick="@{onLongClickListener}"
                     android:layout_width="@dimen/small_icon_size"
-                    android:layout_height="@dimen/small_icon_size"
+                    android:layout_height="match_parent"
                     android:layout_marginStart="5dp"
-                    android:layout_marginTop="2dp"
+                    android:paddingTop="7dp"
                     android:src="@{model.statusIcon, default=@drawable/checks}"
                     android:contentDescription="@string/content_description_chat_bubble_delivery_status"
                     app:tint="?attr/color_main1_500" />
diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml
index f557d4c44..5d47844af 100644
--- a/app/src/main/res/layout/help_debug_fragment.xml
+++ b/app/src/main/res/layout/help_debug_fragment.xml
@@ -213,7 +213,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/settings_title_style"
-                android:id="@+id/change_ringtone"
+                android:id="@+id/clear_friends_db"
                 android:onClick="@{() -> viewModel.clearNativeFriendsDatabase()}"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"