From 995a088490bec688156650f1bad33e242a97c53c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 14 Mar 2019 12:59:36 +0100
Subject: [PATCH] Fixed issue with searchview background and edit contact row
 text color

---
 app/src/main/res/layout/assistant_country_list.xml | 2 +-
 app/src/main/res/layout/chat_create.xml            | 1 -
 app/src/main/res/layout/contact_edit.xml           | 3 +++
 app/src/main/res/layout/contact_edit_row.xml       | 1 +
 app/src/main/res/layout/contacts_list.xml          | 1 -
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/assistant_country_list.xml b/app/src/main/res/layout/assistant_country_list.xml
index d80d9459f..b36dbe533 100644
--- a/app/src/main/res/layout/assistant_country_list.xml
+++ b/app/src/main/res/layout/assistant_country_list.xml
@@ -32,7 +32,7 @@
             android:background="@drawable/resizable_textfield"
             android:gravity="center"
             android:inputType="textPersonName"
-            android:textColor="@android:color/black"
+            android:textColor="@color/colorB"
             android:textCursorDrawable="@null" />
 
         <ImageView
diff --git a/app/src/main/res/layout/chat_create.xml b/app/src/main/res/layout/chat_create.xml
index 9be61f31a..d4b60389b 100644
--- a/app/src/main/res/layout/chat_create.xml
+++ b/app/src/main/res/layout/chat_create.xml
@@ -136,7 +136,6 @@
                 android:id="@+id/searchField"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:background="@drawable/resizable_textfield"
                 android:gravity="center"
                 android:iconifiedByDefault="false"
                 android:inputType="textPersonName"
diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml
index f558d9d47..438b368d3 100644
--- a/app/src/main/res/layout/contact_edit.xml
+++ b/app/src/main/res/layout/contact_edit.xml
@@ -91,6 +91,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
+                    android:textColor="@color/colorB"
                     android:contentDescription="@string/content_description_contact_last_name"
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
@@ -111,6 +112,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
+                    android:textColor="@color/colorB"
                     android:contentDescription="@string/content_description_contact_first_name"
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
@@ -132,6 +134,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
+                    android:textColor="@color/colorB"
                     android:contentDescription="@string/content_description_contact_organization"
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
diff --git a/app/src/main/res/layout/contact_edit_row.xml b/app/src/main/res/layout/contact_edit_row.xml
index c143cdbe0..1a86372bb 100644
--- a/app/src/main/res/layout/contact_edit_row.xml
+++ b/app/src/main/res/layout/contact_edit_row.xml
@@ -13,6 +13,7 @@
         android:layout_toStartOf="@+id/delete_field"
         android:layout_toLeftOf="@+id/delete_field"
         android:background="@drawable/resizable_textfield"
+        android:textColor="@color/colorB"
         android:inputType="textEmailAddress"
         android:textCursorDrawable="@null" />
 
diff --git a/app/src/main/res/layout/contacts_list.xml b/app/src/main/res/layout/contacts_list.xml
index 850a9851b..b1f63d7af 100644
--- a/app/src/main/res/layout/contacts_list.xml
+++ b/app/src/main/res/layout/contacts_list.xml
@@ -97,7 +97,6 @@
             android:id="@+id/searchField"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:background="@drawable/resizable_textfield"
             android:gravity="center"
             android:iconifiedByDefault="false"
             android:inputType="textPersonName"