From 8ae7a4a626713653513ddaf126e4767e9127b08a Mon Sep 17 00:00:00 2001
From: Vincent TE <vincent.te@infomaniak.com>
Date: Fri, 8 Mar 2024 09:36:15 +0100
Subject: [PATCH 1/2] Various cleaning in NewMessage

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageActivity.kt    | 1 -
 .../com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt    | 2 +-
 app/src/main/res/layout/fragment_new_message.xml               | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageActivity.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageActivity.kt
index d97fcb4031..d10b1c0ee4 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageActivity.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageActivity.kt
@@ -42,7 +42,6 @@ import javax.inject.Inject
 class NewMessageActivity : BaseActivity() {
 
     private val binding by lazy { ActivityNewMessageBinding.inflate(layoutInflater) }
-    private val newMessageViewModel: NewMessageViewModel by viewModels()
 
     private val navController by lazy {
         (supportFragmentManager.findFragmentById(R.id.newMessageHostFragment) as NavHostFragment).navController
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
index 3fb0efc013..648b0b75cc 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
@@ -214,7 +214,7 @@ class RecipientFieldView @JvmOverloads constructor(
     private fun setTextInputListeners() = with(binding.textInput) {
 
         fun performContactSearch(text: CharSequence) {
-            if ((text.trim().count()) > 0) {
+            if (text.isNotEmpty()) {
                 contactAdapter.searchContacts(text)
             } else {
                 contactAdapter.clear()
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 1332c79d2f..1820b5acbc 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -111,7 +111,6 @@
                     </FrameLayout>
 
                     <com.google.android.material.divider.MaterialDivider
-                        android:id="@+id/divider1"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="@dimen/marginStandardMedium"
@@ -138,7 +137,6 @@
                         app:title="@string/toTitle" />
 
                     <com.google.android.material.divider.MaterialDivider
-                        android:id="@+id/divider2"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="@dimen/marginStandardMedium"
@@ -188,7 +186,6 @@
                         app:title="@string/bccTitle" />
 
                     <com.google.android.material.divider.MaterialDivider
-                        android:id="@+id/divider4"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="@dimen/marginStandardMedium"

From 8e40142902aebb1f9ee2945fff665aeeef0b4488 Mon Sep 17 00:00:00 2001
From: Vincent TE <vincent.te@infomaniak.com>
Date: Tue, 12 Mar 2024 16:23:44 +0100
Subject: [PATCH 2/2] Invert condition and use isBlank instead

---
 .../com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
index 648b0b75cc..e48ec98c01 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
@@ -214,10 +214,10 @@ class RecipientFieldView @JvmOverloads constructor(
     private fun setTextInputListeners() = with(binding.textInput) {
 
         fun performContactSearch(text: CharSequence) {
-            if (text.isNotEmpty()) {
-                contactAdapter.searchContacts(text)
-            } else {
+            if (text.isBlank()) {
                 contactAdapter.clear()
+            } else {
+                contactAdapter.searchContacts(text)
             }
         }