mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No longer use conversation send area as a bottom sheet

Browse source
This commit is contained in:
Sylvain Berfini 2023-12-13 17:43:15 +01:00
parent 73fda1fb25
commit 62ea993847
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -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)

20
app/src/main/res/layout/chat_conversation_fragment.xml
View file

@ -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"

3
app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml → app/src/main/res/layout/chat_conversation_send_area.xml
View file

@ -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