From 8cd42efa8e2a3cbcfd103501039fcfc9069a0e32 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 6 Apr 2023 17:23:32 +0200
Subject: [PATCH] Improved chat room landscape UI when not much height is
 available (such as phones)

---
 .../viewmodels/ChatMessageSendingViewModel.kt |  2 +-
 .../compatibility/Api23Compatibility.kt       |  2 +-
 .../compatibility/Api26Compatibility.kt       |  2 +-
 .../res/layout/chat_room_detail_fragment.xml  | 26 +++++++++----------
 app/src/main/res/values-land/dimen.xml        |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
index 4ac8c484b..f99428278 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
@@ -100,7 +100,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
         // IME_FLAG_NO_PERSONALIZED_LEARNING is only available on Android 8 and newer
         Compatibility.getImeFlagsForSecureChatRoom()
     } else {
-        EditorInfo.IME_FLAG_NO_EXTRACT_UI
+        EditorInfo.IME_NULL
     }
 
     val isEmojiPickerOpen = MutableLiveData<Boolean>()
diff --git a/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
index 18509bfc0..ea529b1a7 100644
--- a/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
@@ -138,7 +138,7 @@ class Api23Compatibility {
         }
 
         fun getImeFlagsForSecureChatRoom(): Int {
-            return EditorInfo.IME_FLAG_NO_EXTRACT_UI
+            return EditorInfo.IME_NULL
         }
 
         suspend fun addImageToMediaStore(context: Context, content: Content): Boolean {
diff --git a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
index 8587e6a60..8953f9006 100644
--- a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
@@ -346,7 +346,7 @@ class Api26Compatibility {
         }
 
         fun getImeFlagsForSecureChatRoom(): Int {
-            return EditorInfo.IME_FLAG_NO_EXTRACT_UI or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
+            return EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
         }
 
         fun startForegroundService(context: Context, intent: Intent) {
diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml
index 378ddf5ea..0a5dfeb6f 100644
--- a/app/src/main/res/layout/chat_room_detail_fragment.xml
+++ b/app/src/main/res/layout/chat_room_detail_fragment.xml
@@ -145,18 +145,6 @@
             android:layout_alignTop="@id/top_bar"
             tools:layout="@layout/list_edit_top_bar_fragment" />
 
-        <include
-            android:id="@+id/footer"
-            layout="@layout/chat_room_sending"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            app:viewModel="@{viewModel}"
-            app:chatSendingViewModel="@{chatSendingViewModel}"
-            app:attachFileClickListener="@{attachFileClickListener}"
-            app:voiceRecordingTouchListener="@{voiceRecordingTouchListener}"
-            app:cancelReplyToClickListener="@{cancelReplyToClickListener}"/>
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/chat_messages_list"
             android:layout_width="match_parent"
@@ -196,9 +184,21 @@
             android:src="@{viewModel.securityLevelIcon, default=@drawable/security_alert_indicator}"
             android:visibility="@{viewModel.encryptedChatRoom ? View.VISIBLE : View.GONE}" />
 
+        <include
+            android:id="@+id/footer"
+            layout="@layout/chat_room_sending"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            app:viewModel="@{viewModel}"
+            app:chatSendingViewModel="@{chatSendingViewModel}"
+            app:attachFileClickListener="@{attachFileClickListener}"
+            app:voiceRecordingTouchListener="@{voiceRecordingTouchListener}"
+            app:cancelReplyToClickListener="@{cancelReplyToClickListener}"/>
+
         <RelativeLayout
             android:onClick="@{scrollToBottomClickListener}"
-            android:visibility="@{viewModel.isUserScrollingUp ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.isUserScrollingUp &amp;&amp; !chatSendingViewModel.isEmojiPickerOpen ? View.VISIBLE : View.GONE, default=gone}"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_marginEnd="5dp"
diff --git a/app/src/main/res/values-land/dimen.xml b/app/src/main/res/values-land/dimen.xml
index 19eaa83b7..3f0923567 100644
--- a/app/src/main/res/values-land/dimen.xml
+++ b/app/src/main/res/values-land/dimen.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="chat_room_emoji_picker_height">240dp</dimen>
+    <dimen name="chat_room_emoji_picker_height">200dp</dimen>
 </resources>
\ No newline at end of file