From 44ea50d05b65e3ab18edf7efa8bf3d23e85aeef2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 12 Aug 2019 19:12:56 +0200
Subject: [PATCH] Use card view for account color

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 5 +++--
 app/src/main/res/layout/include_message_compact.xml     | 6 ++++--
 app/src/main/res/layout/include_message_normal.xml      | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6f47ee6983..bf17fa8366 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -87,6 +87,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.Fragment;
@@ -226,7 +227,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             View.OnClickListener, View.OnLongClickListener, View.OnKeyListener,
             BottomNavigationView.OnNavigationItemSelectedListener {
         private View view;
-        private View vwColor;
+        private CardView vwColor;
         private ImageView ivExpander;
         private ImageView ivFlagged;
         private ImageView ivAvatar;
@@ -644,7 +645,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvTime.setTextColor(colorUnseen);
 
             // Account color
-            vwColor.setBackgroundColor(message.accountColor == null ? Color.TRANSPARENT : message.accountColor);
+            vwColor.setCardBackgroundColor(message.accountColor == null ? Color.TRANSPARENT : message.accountColor);
             vwColor.setVisibility(Helper.isPro(context) ? View.VISIBLE : View.INVISIBLE);
 
             // Expander
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index f0779f2f6e..3d9f679811 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -5,11 +5,13 @@
     android:layout_height="wrap_content"
     android:paddingEnd="3dp">
 
-    <View
+    <androidx.cardview.widget.CardView
         android:id="@+id/vwColor"
         android:layout_width="6dp"
         android:layout_height="0dp"
-        android:background="?attr/colorAccent"
+        app:cardBackgroundColor="?attr/colorAccent"
+        app:cardCornerRadius="3dp"
+        app:cardElevation="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index 7d5692a111..9ce207511f 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -4,11 +4,13 @@
     android:layout_height="wrap_content"
     android:paddingEnd="3dp">
 
-    <View
+    <androidx.cardview.widget.CardView
         android:id="@+id/vwColor"
         android:layout_width="6dp"
         android:layout_height="0dp"
-        android:background="?attr/colorAccent"
+        app:cardBackgroundColor="?attr/colorAccent"
+        app:cardCornerRadius="3dp"
+        app:cardElevation="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />