From 9094a167eb6ee44a2625903ae6bc0dddffc0ba14 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 27 Nov 2023 09:34:33 +0100
Subject: [PATCH] Fixed bubble UI when scrolling after a voice record has been
 displayed

---
 app/build.gradle                                           | 4 ++--
 app/src/main/res/layout/chat_bubble_incoming.xml           | 6 ++++--
 .../main/res/layout/chat_bubble_meeting_invite_content.xml | 7 ++++++-
 app/src/main/res/layout/chat_bubble_outgoing.xml           | 6 ++++--
 .../main/res/layout/chat_bubble_voice_record_content.xml   | 4 ++++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0b8735505..0da584612 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,7 +70,7 @@ android {
 }
 
 dependencies {
-    implementation "androidx.activity:activity-ktx:1.8.0"
+    implementation "androidx.activity:activity-ktx:1.8.1"
     implementation "androidx.annotation:annotation:1.7.0"
     implementation "androidx.appcompat:appcompat:1.7.0-alpha03"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
@@ -81,7 +81,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
-    implementation "androidx.window:window:1.1.0"
+    implementation "androidx.window:window:1.2.0"
 
     def nav_version = "2.7.5"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 1e2b2d06a..17ac2ce04 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -173,16 +173,18 @@
                 android:id="@+id/meeting_info"
                 android:layout_width="@dimen/chat_bubble_meeting_invite_width"
                 android:layout_height="wrap_content"
-                android:visibility="@{model.meetingFound ? View.VISIBLE : View.GONE, default=gone}"
                 android:layout="@layout/chat_bubble_meeting_invite_content"
+                android:visibility="@{model.meetingFound ? View.VISIBLE : View.GONE, default=gone}"
+                bind:inflatedVisibility="@{model.meetingFound ? View.VISIBLE : View.GONE}"
                 bind:model="@{model}"/>
 
             <ViewStub
                 android:id="@+id/voice_record"
                 android:layout_width="@dimen/chat_bubble_voice_record_width"
                 android:layout_height="wrap_content"
-                android:visibility="@{model.isVoiceRecord ? View.VISIBLE : View.GONE, default=gone}"
                 android:layout="@layout/chat_bubble_voice_record_content"
+                android:visibility="@{model.isVoiceRecord ? View.VISIBLE : View.GONE, default=gone}"
+                bind:inflatedVisibility="@{model.isVoiceRecord ? View.VISIBLE : View.GONE}"
                 bind:model="@{model}" />
 
             <org.linphone.ui.main.chat.view.ChatBubbleTextView
diff --git a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
index cc71b8e8d..66f2eb31f 100644
--- a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
+++ b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
@@ -7,12 +7,17 @@
         <variable
             name="model"
             type="org.linphone.ui.main.chat.model.ChatMessageModel" />
+        <variable
+            name="inflatedVisibility"
+            type="Integer" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/chat_bubble_meeting_invite_width"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_squircle_white_r10_background">
+        android:background="@drawable/shape_squircle_white_r10_background"
+        android:visibility="@{inflatedVisibility == View.VISIBLE ? View.VISIBLE : View.GONE}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/header_background"
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 7d928f43e..37a0529c7 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -135,16 +135,18 @@
                 android:id="@+id/meeting_info"
                 android:layout_width="@dimen/chat_bubble_meeting_invite_width"
                 android:layout_height="wrap_content"
-                android:visibility="@{model.meetingFound ? View.VISIBLE : View.GONE, default=gone}"
                 android:layout="@layout/chat_bubble_meeting_invite_content"
+                android:visibility="@{model.meetingFound ? View.VISIBLE : View.GONE, default=gone}"
+                bind:inflatedVisibility="@{model.meetingFound ? View.VISIBLE : View.GONE}"
                 bind:model="@{model}"/>
 
             <ViewStub
                 android:id="@+id/voice_record"
                 android:layout_width="@dimen/chat_bubble_voice_record_width"
                 android:layout_height="wrap_content"
-                android:visibility="@{model.isVoiceRecord ? View.VISIBLE : View.GONE, default=gone}"
                 android:layout="@layout/chat_bubble_voice_record_content"
+                android:visibility="@{model.isVoiceRecord ? View.VISIBLE : View.GONE, default=gone}"
+                bind:inflatedVisibility="@{model.isVoiceRecord ? View.VISIBLE : View.GONE}"
                 bind:model="@{model}" />
 
             <org.linphone.ui.main.chat.view.ChatBubbleTextView
diff --git a/app/src/main/res/layout/chat_bubble_voice_record_content.xml b/app/src/main/res/layout/chat_bubble_voice_record_content.xml
index 99af40bf9..3b9cf2219 100644
--- a/app/src/main/res/layout/chat_bubble_voice_record_content.xml
+++ b/app/src/main/res/layout/chat_bubble_voice_record_content.xml
@@ -8,11 +8,15 @@
         <variable
             name="model"
             type="org.linphone.ui.main.chat.model.ChatMessageModel" />
+        <variable
+            name="inflatedVisibility"
+            type="Integer" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/chat_bubble_voice_record_width"
         android:layout_height="wrap_content"
+        android:visibility="@{inflatedVisibility == View.VISIBLE ? View.VISIBLE : View.GONE}"
         inflatedLifecycleOwner="@{true}">
 
         <ProgressBar