From cc403f262427c5571cd3f5f0ea73beb66c1acda7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 8 Jan 2024 10:05:16 +0100
Subject: [PATCH] Also search in contact name when filtering conversations list
 + updated gradle

---
 .../ui/main/chat/viewmodel/ConversationsListViewModel.kt   | 7 ++++++-
 app/src/main/res/layout/chat_bubble_incoming.xml           | 5 ++---
 app/src/main/res/layout/chat_bubble_outgoing.xml           | 5 ++---
 app/src/main/res/values/styles.xml                         | 4 ++--
 build.gradle                                               | 4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
index 1c9985bdd..6543561ae 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
@@ -154,7 +154,12 @@ class ConversationsListViewModel @UiThread constructor() : AbstractTopBarViewMod
 
             val participants = chatRoom.participants
             val found = participants.find {
-                it.address.asStringUriOnly().contains(filter, ignoreCase = true)
+                // Search in address but also in contact name if exists
+                val model = coreContext.contactsManager.getContactAvatarModelForAddress(it.address)
+                model.contactName?.contains(filter, ignoreCase = true) == true || it.address.asStringUriOnly().contains(
+                    filter,
+                    ignoreCase = true
+                )
             }
             if (
                 found != null ||
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 8ad1086f7..9799eba16 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -263,10 +263,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@{model.reactions, default=@string/emoji_love}"
-            android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="@id/bubble"
-            app:layout_constraintTop_toBottomOf="@id/bubble"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/bubble" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index ab4b5cc35..05d5ba586 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -226,10 +226,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@{model.reactions, default=@string/emoji_love}"
-            android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="@id/bubble"
-            app:layout_constraintTop_toBottomOf="@id/bubble"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/bubble" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c189566d9..613a5bb89 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -134,8 +134,8 @@
         <item name="android:paddingBottom">5dp</item>
         <item name="android:paddingTop">2dp</item>
         <item name="android:orientation">horizontal</item>
-        <item name="android:layout_marginTop">-15dp</item>
-        <item name="android:layout_marginBottom">10dp</item>
+        <item name="android:layout_marginTop">-10dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
         <item name="android:background">@drawable/shape_chat_bubble_reactions_background</item>
     </style>
     <style name="call_numpad_digits_style">
diff --git a/build.gradle b/build.gradle
index 4c6e556d7..a4ced39bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,8 +11,8 @@ buildscript {
 }
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.2.0' apply false
-    id 'com.android.library' version '8.2.0' apply false
+    id 'com.android.application' version '8.2.1' apply false
+    id 'com.android.library' version '8.2.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0-RC' apply false
     id 'com.google.gms.google-services' version '4.4.0' apply false
 }