From 79df5c58c8a96b04a48bb230d965acebac931d76 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 1 May 2019 15:58:41 +0200
Subject: [PATCH] Added text size and color actions

---
 .../eu/faircode/email/FragmentCompose.java    | 51 +++++++++++++++++++
 .../java/eu/faircode/email/HtmlHelper.java    | 23 ++++++++-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 870e976833..d3b3cb1b3c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -37,6 +37,7 @@ import android.database.Cursor;
 import android.database.CursorWrapper;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
@@ -58,8 +59,10 @@ import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
 import android.text.style.QuoteSpan;
+import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
 import android.text.style.UnderlineSpan;
@@ -99,6 +102,8 @@ import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.colorpicker.ColorPickerDialog;
+import com.android.colorpicker.ColorPickerSwatch;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.bottomnavigation.LabelVisibilityMode;
 import com.google.android.material.snackbar.Snackbar;
@@ -417,6 +422,52 @@ public class FragmentCompose extends FragmentBase {
                         return true;
                     }
 
+                    case R.string.title_style_size: {
+                        RelativeSizeSpan[] spans = ss.getSpans(start, end, RelativeSizeSpan.class);
+                        float size = (spans.length > 0 ? spans[0].getSizeChange() : 1.0f);
+
+                        // Match small/big
+                        if (size == 0.8f)
+                            size = 1.0f;
+                        else if (size == 1.0)
+                            size = 1.25f;
+                        else
+                            size = 0.8f;
+
+                        for (RelativeSizeSpan span : spans)
+                            ss.removeSpan(span);
+
+                        if (size != 1.0f)
+                            ss.setSpan(new RelativeSizeSpan(size), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+                        etBody.setText(ss);
+                        etBody.setSelection(end);
+
+                        return false;
+                    }
+
+                    case R.string.title_style_color: {
+                        ForegroundColorSpan[] spans = ss.getSpans(start, end, ForegroundColorSpan.class);
+                        int color = (spans.length > 0 ? spans[0].getForegroundColor() : Color.TRANSPARENT);
+
+                        int[] colors = getContext().getResources().getIntArray(R.array.colorPicker);
+                        ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
+                        colorPickerDialog.initialize(R.string.title_account_color, colors, color, 4, colors.length);
+                        colorPickerDialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+                            @Override
+                            public void onColorSelected(int color) {
+                                for (ForegroundColorSpan span : ss.getSpans(start, end, ForegroundColorSpan.class))
+                                    ss.removeSpan(span);
+                                ss.setSpan(new ForegroundColorSpan(color), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                etBody.setText(ss);
+                                etBody.setSelection(end);
+                            }
+                        });
+                        colorPickerDialog.show(getFragmentManager(), "colorpicker");
+
+                        return true;
+                    }
+
                     default:
                         return false;
                 }
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index e87d104b4d..81e856c6b9 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -630,6 +630,27 @@ public class HtmlHelper {
     }
 
     static String toHtml(Spanned spanned) {
-        return HtmlCompat.toHtml(spanned, TO_HTML_PARAGRAPH_LINES_CONSECUTIVE);
+        String html = HtmlCompat.toHtml(spanned, TO_HTML_PARAGRAPH_LINES_CONSECUTIVE);
+
+        // @Google: why convert size to and from in a different way?
+        Document doc = Jsoup.parse(html);
+        for (Element element : doc.select("span")) {
+            String style = element.attr("style");
+            if (style.startsWith("font-size:")) {
+                int colon = style.indexOf(':');
+                int semi = style.indexOf("em;", colon);
+                if (semi > colon)
+                    try {
+                        String hsize = style.substring(colon + 1, semi).replace(',', '.');
+                        float size = Float.parseFloat(hsize);
+                        element.tagName(size < 1.0f ? "small" : "big");
+                        element.attributes().remove("style");
+                    } catch (NumberFormatException ex) {
+                        Log.e(ex);
+                    }
+            }
+        }
+
+        return doc.outerHtml();
     }
 }