From b4e6169fb17487e74a2fc562e1f013807b6532eb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 5 Nov 2018 11:18:49 +0000
Subject: [PATCH] Added clear style menu

---
 .../main/java/eu/faircode/email/FragmentCompose.java   |  7 +++++--
 app/src/main/res/drawable/baseline_format_clear_24.xml | 10 ++++++++++
 app/src/main/res/menu/menu_compose.xml                 |  6 ++++++
 app/src/main/res/values/strings.xml                    |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_format_clear_24.xml

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b18d528bba..426d9f5d27 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -411,6 +411,7 @@ public class FragmentCompose extends FragmentEx {
                 return true;
             case R.id.menu_bold:
             case R.id.menu_italic:
+            case R.id.menu_clear:
             case R.id.menu_link:
                 onMenuStyle(item.getItemId());
                 return true;
@@ -448,6 +449,10 @@ public class FragmentCompose extends FragmentEx {
                 case R.id.menu_italic:
                     s.setSpan(new StyleSpan(Typeface.ITALIC), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                     break;
+                case R.id.menu_clear:
+                    for (Object span : s.getSpans(start, end, Object.class))
+                        s.removeSpan(span);
+                    break;
                 case R.id.menu_link:
                     Uri uri = null;
                     ClipboardManager cbm = getContext().getSystemService(ClipboardManager.class);
@@ -796,8 +801,6 @@ public class FragmentCompose extends FragmentEx {
                     ImageSpan is = new ImageSpan(getContext(), Uri.parse("cid:" + BuildConfig.APPLICATION_ID + "." + attachment.id), ImageSpan.ALIGN_BASELINE);
                     s.setSpan(is, start, start + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                     String html = Html.toHtml(s);
-                    Log.i(Helper.TAG, "html=" + html);
-
                     etBody.setText(Html.fromHtml(html, cidGetter, null));
                 }
             }
diff --git a/app/src/main/res/drawable/baseline_format_clear_24.xml b/app/src/main/res/drawable/baseline_format_clear_24.xml
new file mode 100644
index 0000000000..926305fc45
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_format_clear_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3.27,5L2,6.27l6.97,6.97L6.5,19h3l1.57,-3.66L16.73,21 18,19.73 3.55,5.27 3.27,5zM6,5v0.18L8.82,8h2.4l-0.72,1.68 2.1,2.1L14.21,8H20V5H6z"/>
+</vector>
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 3320afe58f..6f7edfe70b 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -14,6 +14,12 @@
         android:title="@string/title_style_italic"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/menu_clear"
+        android:icon="@drawable/baseline_format_clear_24"
+        android:title="@string/title_style_clear"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/menu_link"
         android:icon="@drawable/baseline_insert_link_24"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fe80bd534..8ee37ef38d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -223,6 +223,7 @@
     <string name="title_clipboard_empty">Clipboard empty</string>
     <string name="title_style_bold">Bold</string>
     <string name="title_style_italic">Italic</string>
+    <string name="title_style_clear">Clear formatting</string>
     <string name="title_style_link">Insert link</string>
     <string name="title_style_image">Insert image</string>
     <string name="title_add_attachment">Add attachment</string>