From 9f1dfac07aa01a6926dd156897af1a181042df8d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 1 Oct 2019 12:24:41 +0200
Subject: [PATCH] Improved card layout

---
 .../java/eu/faircode/email/ViewCardOptional.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ViewCardOptional.java b/app/src/main/java/eu/faircode/email/ViewCardOptional.java
index 73792c8096..6c5f8a19c8 100644
--- a/app/src/main/java/eu/faircode/email/ViewCardOptional.java
+++ b/app/src/main/java/eu/faircode/email/ViewCardOptional.java
@@ -56,20 +56,18 @@ public class ViewCardOptional extends CardView {
         boolean compact = prefs.getBoolean("compact", false);
 
         if (cards) {
-            int dp6 = Helper.dp2pixels(getContext(), 6);
+            int dp = Helper.dp2pixels(getContext(), compact ? 3 : 6);
 
             FrameLayout.LayoutParams lparam = (FrameLayout.LayoutParams) getLayoutParams();
-            lparam.setMargins(dp6, compact ? 0 : dp6, dp6, dp6);
+            lparam.setMargins(dp, dp, dp, dp);
             setLayoutParams(lparam);
 
-            setRadius(dp6);
-            setCardElevation(compact ? dp6 / 2f : dp6);
-            setMaxCardElevation(compact ? dp6 / 2f : dp6);
-            setContentPadding(dp6, dp6, dp6, dp6);
-        } else {
+            setRadius(dp);
+            setContentPadding(dp, dp, dp, dp);
+        } else
             setRadius(0);
-            setCardElevation(0);
-        }
+
+        setCardElevation(0);
     }
 
     @Override