From 62ea9938479bf73d5f4363fb6fadc1c791178552 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 13 Dec 2023 17:43:15 +0100
Subject: [PATCH] No longer use conversation send area as a bottom sheet

---
 .../chat/fragment/ConversationFragment.kt     |  4 ----
 .../res/layout/chat_conversation_fragment.xml | 20 ++++++++++---------
 ...et.xml => chat_conversation_send_area.xml} |  3 +--
 3 files changed, 12 insertions(+), 15 deletions(-)
 rename app/src/main/res/layout/{chat_conversation_send_area_bottom_sheet.xml => chat_conversation_send_area.xml} (98%)

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 63e6d881e..94839825c 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
@@ -313,10 +313,6 @@ class ConversationFragment : SlidingPaneChildFragment() {
         val bottomSheetLayoutManager = LinearLayoutManager(requireContext())
         binding.messageBottomSheet.bottomSheetList.layoutManager = bottomSheetLayoutManager
 
-        val emojisBottomSheetBehavior = BottomSheetBehavior.from(binding.sendArea.root)
-        emojisBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
-        emojisBottomSheetBehavior.isDraggable = false // To allow scrolling through the emojis
-
         adapter.chatMessageLongPressEvent.observe(viewLifecycleOwner) {
             it.consume { model ->
                 showChatMessageLongPressMenu(model)
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 86ab97728..c03834aba 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -37,7 +37,6 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="80dp"
             android:background="?attr/color_main2_000">
 
             <androidx.constraintlayout.widget.Group
@@ -226,18 +225,21 @@
                 android:textSize="12sp"
                 android:textColor="?attr/color_main2_400"
                 android:visibility="@{viewModel.composingLabel.length() == 0 ? View.GONE : View.VISIBLE}"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/send_area"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            <include
+                android:id="@+id/send_area"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
+                layout="@layout/chat_conversation_send_area"
+                app:layout_constraintBottom_toBottomOf="parent"
+                bind:openFilePickerClickListener="@{openFilePickerClickListener}"
+                bind:viewModel="@{sendMessageViewModel}"/>
 
-        <include
-            android:id="@+id/send_area"
-            bind:openFilePickerClickListener="@{openFilePickerClickListener}"
-            bind:viewModel="@{sendMessageViewModel}"
-            android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
-            layout="@layout/chat_conversation_send_area_bottom_sheet"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
             android:id="@+id/message_bottom_sheet"
diff --git a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_send_area.xml
similarity index 98%
rename from app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml
rename to app/src/main/res/layout/chat_conversation_send_area.xml
index 5f19caeab..95c646e5b 100644
--- a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area.xml
@@ -16,8 +16,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/color_grey_100"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+        android:background="?attr/color_grey_100">
         <!-- Keep behavior to have it at the bottom -->
 
         <androidx.constraintlayout.widget.Group