From 1d2d06c9336dbe9ae55ca2c13a5bda1540efc781 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 7 May 2021 14:19:59 +0200 Subject: [PATCH] Use dimensions for blockquotes --- app/src/main/java/eu/faircode/email/EditTextCompose.java | 6 +++--- app/src/main/java/eu/faircode/email/FragmentCompose.java | 6 +++--- app/src/main/java/eu/faircode/email/HtmlHelper.java | 4 +++- app/src/main/java/eu/faircode/email/StyleHelper.java | 6 +++--- app/src/main/res/values/dimen.xml | 2 ++ 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java index 7a46c6e32d..85d187fb4e 100644 --- a/app/src/main/java/eu/faircode/email/EditTextCompose.java +++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java @@ -135,8 +135,8 @@ public class EditTextCompose extends FixedEditText { html = h; final int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary); - final int dp3 = Helper.dp2pixels(context, 3); - final int dp6 = Helper.dp2pixels(context, 6); + final int quoteGap = context.getResources().getDimensionPixelSize(R.dimen.quote_gap_size); + final int quoteStripe = context.getResources().getDimensionPixelSize(R.dimen.quote_stripe_width); executor.submit(new Runnable() { @Override @@ -162,7 +162,7 @@ public class EditTextCompose extends FixedEditText { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) q = new QuoteSpan(colorPrimary); else - q = new QuoteSpan(colorPrimary, dp3, dp6); + q = new QuoteSpan(colorPrimary, quoteStripe, quoteGap); ssb.setSpan(q, ssb.getSpanStart(span), ssb.getSpanEnd(span), diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 67ee963421..f260f882f9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5458,8 +5458,8 @@ public class FragmentCompose extends FragmentBase { final boolean show_images = args.getBoolean("show_images", false); int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary); - int dp3 = Helper.dp2pixels(context, 3); - int dp6 = Helper.dp2pixels(context, 6); + int quoteGap = context.getResources().getDimensionPixelSize(R.dimen.quote_gap_size); + int quoteStripe = context.getResources().getDimensionPixelSize(R.dimen.quote_stripe_width); DB db = DB.getInstance(context); EntityMessage draft = db.message().getMessage(id); @@ -5485,7 +5485,7 @@ public class FragmentCompose extends FragmentBase { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) q = new QuoteSpan(colorPrimary); else - q = new QuoteSpan(colorPrimary, dp3, dp6); + q = new QuoteSpan(colorPrimary, quoteStripe, quoteGap); bodyBuilder.setSpan(q, bodyBuilder.getSpanStart(quoteSpan), bodyBuilder.getSpanEnd(quoteSpan), diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index b7e4b5a0ed..c3b8b2c53f 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -2040,6 +2040,8 @@ public class HtmlHelper { int bulletGap = context.getResources().getDimensionPixelSize(R.dimen.bullet_gap_size); int bulletRadius = context.getResources().getDimensionPixelSize(R.dimen.bullet_radius_size); int bulletIndent = context.getResources().getDimensionPixelSize(R.dimen.bullet_indent_size); + int quoteGap = context.getResources().getDimensionPixelSize(R.dimen.quote_gap_size); + int quoteStripe = context.getResources().getDimensionPixelSize(R.dimen.quote_stripe_width); int message_zoom = prefs.getInt("message_zoom", 100); float textSize = Helper.getTextSize(context, 0) * message_zoom / 100f; @@ -2307,7 +2309,7 @@ public class HtmlHelper { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) setSpan(ssb, new QuoteSpan(colorPrimary), start, ssb.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); else - setSpan(ssb, new QuoteSpan(colorPrimary, dp3, dp6), start, ssb.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + setSpan(ssb, new QuoteSpan(colorPrimary, quoteStripe, quoteGap), start, ssb.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); break; case "br": ssb.append('\n'); diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java index d7825886cd..2a74617daa 100644 --- a/app/src/main/java/eu/faircode/email/StyleHelper.java +++ b/app/src/main/java/eu/faircode/email/StyleHelper.java @@ -356,8 +356,8 @@ public class StyleHelper { Context context = etBody.getContext(); int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary); - int dp3 = Helper.dp2pixels(context, 3); - int dp6 = Helper.dp2pixels(context, 6); + int quoteGap = context.getResources().getDimensionPixelSize(R.dimen.quote_gap_size); + int quoteStripe = context.getResources().getDimensionPixelSize(R.dimen.quote_stripe_width); Pair paragraph = ensureParagraph(edit, start, end); int s = paragraph.first; @@ -371,7 +371,7 @@ public class StyleHelper { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) q = new QuoteSpan(colorPrimary); else - q = new QuoteSpan(colorPrimary, dp3, dp6); + q = new QuoteSpan(colorPrimary, quoteStripe, quoteGap); edit.setSpan(q, s, e, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); etBody.setText(edit); diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 921cd5aa8f..b90fb32b9d 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -8,4 +8,6 @@ 6dp 3dp 24dp + 6dp + 3dp \ No newline at end of file