From a2680028cec6feb3033b123cb81950955db64001 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 3 Apr 2025 11:36:50 +0200 Subject: [PATCH] Keep attach file icon when keyboard is opened in chat instead of emoji picker --- app/src/main/res/layout/chat_conversation_send_area.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/chat_conversation_send_area.xml b/app/src/main/res/layout/chat_conversation_send_area.xml index 0d961eb88..13339b0c4 100644 --- a/app/src/main/res/layout/chat_conversation_send_area.xml +++ b/app/src/main/res/layout/chat_conversation_send_area.xml @@ -93,6 +93,7 @@ android:padding="8dp" android:contentDescription="@string/content_description_chat_open_emoji_picker" android:src="@{viewModel.isEmojiPickerOpen ? @drawable/x : @drawable/smiley, default=@drawable/smiley}" + android:visibility="@{viewModel.isVoiceRecording ? View.INVISIBLE : (viewModel.isKeyboardOpen && viewModel.isFileTransferServerAvailable) ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toBottomOf="@id/message_area_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/message_area_background" @@ -108,7 +109,7 @@ android:padding="8dp" android:contentDescription="@string/content_description_chat_open_attach_file" android:src="@{viewModel.areFilePickersOpen ? @drawable/x : @drawable/paperclip, default=@drawable/paperclip}" - android:visibility="@{viewModel.isVoiceRecording ? View.INVISIBLE : (viewModel.isKeyboardOpen || !viewModel.isFileTransferServerAvailable) ? View.GONE : View.VISIBLE}" + android:visibility="@{viewModel.isVoiceRecording ? View.INVISIBLE : !viewModel.isFileTransferServerAvailable ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toBottomOf="@id/message_area_background" app:layout_constraintEnd_toStartOf="@id/message_area_background" app:layout_constraintStart_toEndOf="@id/emoji_picker_toggle"