From 40d5d6a61c21bd92771ec4fe04181be669e0e712 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 25 Jun 2018 23:55:42 +0200
Subject: [PATCH] Fix highlight accent color

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../com/nextcloud/talk/adapters/items/AdvancedUserItem.java | 3 ++-
 .../java/com/nextcloud/talk/adapters/items/CallItem.java    | 3 ++-
 .../talk/adapters/items/MentionAutocompleteItem.java        | 6 ++++--
 .../java/com/nextcloud/talk/adapters/items/UserItem.java    | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
index 7ae6dcb20..c015e8699 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
@@ -113,7 +113,8 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
     public void bindViewHolder(FlexibleAdapter adapter, UserItemViewHolder holder, int position, List payloads) {
         if (adapter.hasFilter()) {
             FlexibleUtils.highlightText(holder.contactDisplayName, participant.getName(),
-                    String.valueOf(adapter.getFilter(String.class)));
+                    String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.getSharedApplication()
+                            .getResources().getColor(R.color.colorPrimary));
         } else {
             holder.contactDisplayName.setText(participant.getName());
         }
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
index f2a26e89d..2a25d561f 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
@@ -104,7 +104,8 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
     public void bindViewHolder(final FlexibleAdapter adapter, RoomItemViewHolder holder, int position, List payloads) {
         if (adapter.hasFilter()) {
             FlexibleUtils.highlightText(holder.roomDisplayName, room.getDisplayName(),
-                    String.valueOf(adapter.getFilter(String.class)));
+                    String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.getSharedApplication()
+                            .getResources().getColor(R.color.colorPrimary));
         } else {
             holder.roomDisplayName.setText(room.getDisplayName());
         }
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
index 58e55306e..1519e9ef0 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
@@ -90,9 +90,11 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
 
         if (adapter.hasFilter()) {
             FlexibleUtils.highlightText(holder.contactDisplayName, displayName,
-                    String.valueOf(adapter.getFilter(String.class)));
+                    String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.getSharedApplication()
+                            .getResources().getColor(R.color.colorPrimary));
             FlexibleUtils.highlightText(holder.contactMentionId, "@" + userId,
-                    String.valueOf(adapter.getFilter(String.class)));
+                    String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.getSharedApplication()
+                            .getResources().getColor(R.color.colorPrimary));
         } else {
             holder.contactDisplayName.setText(displayName);
             holder.contactMentionId.setText("@" + userId);
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
index 99e0bd928..0052a3445 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
@@ -116,7 +116,8 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
 
         if (adapter.hasFilter()) {
             FlexibleUtils.highlightText(holder.contactDisplayName, participant.getName(),
-                    String.valueOf(adapter.getFilter(String.class)));
+                    String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.getSharedApplication()
+                            .getResources().getColor(R.color.colorPrimary));
         } else {
             holder.contactDisplayName.setText(participant.getName());
         }