From 8ab78d35fe451c44a5f39cd7bddd834e29ac4e6e Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 8 Jan 2019 17:37:39 +0000 Subject: [PATCH] Added image placeholders for signatures --- .../java/eu/faircode/email/FragmentCompose.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 38b463dc62..3f4d984aa8 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -223,8 +223,20 @@ public class FragmentCompose extends FragmentEx { tvExtraPrefix.setText(at < 0 ? null : identity.email.substring(0, at)); tvExtraSuffix.setText(at < 0 ? null : identity.email.substring(at)); if (pro) { - tvSignature.setText(identity == null || identity.signature == null ? null : Html.fromHtml(identity.signature)); - grpSignature.setVisibility(identity == null || TextUtils.isEmpty(identity.signature) ? View.GONE : View.VISIBLE); + Spanned signature = null; + if (identity != null && identity.signature != null) + signature = Html.fromHtml(identity.signature, new Html.ImageGetter() { + @Override + public Drawable getDrawable(String source) { + int px = Helper.dp2pixels(getContext(), 24); + Drawable d = getContext().getResources() + .getDrawable(R.drawable.baseline_image_24, getContext().getTheme()); + d.setBounds(0, 0, px, px); + return d; + } + }, null); + tvSignature.setText(signature); + grpSignature.setVisibility(signature == null ? View.GONE : View.VISIBLE); } }