From 3c6678197e0c1b911e679e1719964c5dabb398f8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 24 Sep 2019 07:48:47 +0200
Subject: [PATCH] Use dp for block quotes

---
 .../main/java/eu/faircode/email/AdapterMessage.java  |  2 +-
 .../main/java/eu/faircode/email/FragmentCompose.java |  2 +-
 .../main/java/eu/faircode/email/StyledQuoteSpan.java | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 04be385108..bc4e58b15d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2591,7 +2591,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 QuoteSpan[] quoteSpans = builder.getSpans(0, builder.length(), QuoteSpan.class);
                 for (QuoteSpan quoteSpan : quoteSpans) {
                     builder.setSpan(
-                            new StyledQuoteSpan(colorPrimary),
+                            new StyledQuoteSpan(context, colorPrimary),
                             builder.getSpanStart(quoteSpan),
                             builder.getSpanEnd(quoteSpan),
                             builder.getSpanFlags(quoteSpan));
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f5d493b659..67cd12fea1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3096,7 +3096,7 @@ public class FragmentCompose extends FragmentBase {
                     QuoteSpan[] quoteSpans = builder.getSpans(0, builder.length(), QuoteSpan.class);
                     for (QuoteSpan quoteSpan : quoteSpans) {
                         builder.setSpan(
-                                new StyledQuoteSpan(colorPrimary),
+                                new StyledQuoteSpan(context, colorPrimary),
                                 builder.getSpanStart(quoteSpan),
                                 builder.getSpanEnd(quoteSpan),
                                 builder.getSpanFlags(quoteSpan));
diff --git a/app/src/main/java/eu/faircode/email/StyledQuoteSpan.java b/app/src/main/java/eu/faircode/email/StyledQuoteSpan.java
index 788c98885a..a160392eb4 100644
--- a/app/src/main/java/eu/faircode/email/StyledQuoteSpan.java
+++ b/app/src/main/java/eu/faircode/email/StyledQuoteSpan.java
@@ -19,6 +19,7 @@ package eu.faircode.email;
     Copyright 2018-2019 by Marcel Bokhorst (M66B)
 */
 
+import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.text.Layout;
@@ -27,13 +28,18 @@ import android.text.style.QuoteSpan;
 import androidx.annotation.NonNull;
 
 public class StyledQuoteSpan extends QuoteSpan {
-    StyledQuoteSpan(int color) {
+    private int stripeWidth;
+    private int gapWidth;
+
+    StyledQuoteSpan(Context context, int color) {
         super(color);
+        stripeWidth = Helper.dp2pixels(context, 3);
+        gapWidth = Helper.dp2pixels(context, 6);
     }
 
     @Override
     public int getLeadingMargin(boolean first) {
-        return 6 /* stripeWidth */ + 12 /* gapWidth */;
+        return stripeWidth + gapWidth;
     }
 
     @Override
@@ -48,7 +54,7 @@ public class StyledQuoteSpan extends QuoteSpan {
         p.setStyle(Paint.Style.FILL);
         p.setColor(getColor());
 
-        c.drawRect(x, top, x + dir * 6 /* stripeWidth */, bottom, p);
+        c.drawRect(x, top, x + dir * stripeWidth, bottom, p);
 
         p.setStyle(style);
         p.setColor(color);