From 08dbfb2e09b9718d9cfabf5c9285741f9a6d97ab Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 3 Nov 2023 11:18:34 +0100
Subject: [PATCH] View HTML improvements

---
 .../java/eu/faircode/email/ActivityCode.java  | 10 ++++++++--
 .../drawable/twotone_cleaning_services_24.xml | 20 -------------------
 app/src/main/res/menu/menu_code.xml           |  4 ++--
 app/src/main/res/values/strings.xml           |  1 -
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/drawable/twotone_cleaning_services_24.xml

diff --git a/app/src/main/java/eu/faircode/email/ActivityCode.java b/app/src/main/java/eu/faircode/email/ActivityCode.java
index 1763d82897..5c19141ac5 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCode.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCode.java
@@ -116,7 +116,13 @@ public class ActivityCode extends ActivityBase {
 
         menu.findItem(R.id.menu_sanitize)
                 .setVisible(BuildConfig.DEBUG || debug)
-                .setChecked(sanitize);
+                .setChecked(sanitize)
+                .setIcon(sanitize
+                        ? R.drawable.twotone_fullscreen_24
+                        : R.drawable.twotone_fullscreen_exit_24)
+                .setTitle(getString(sanitize
+                        ? R.string.title_legend_show_full
+                        : R.string.title_legend_show_reformatted));
         return super.onPrepareOptionsMenu(menu);
     }
 
@@ -128,7 +134,7 @@ public class ActivityCode extends ActivityBase {
             return true;
         } else if (itemId == R.id.menu_sanitize) {
             sanitize = !sanitize;
-            item.setChecked(sanitize);
+            invalidateOptionsMenu();
             load();
             return true;
         }
diff --git a/app/src/main/res/drawable/twotone_cleaning_services_24.xml b/app/src/main/res/drawable/twotone_cleaning_services_24.xml
deleted file mode 100644
index 13c7501478..0000000000
--- a/app/src/main/res/drawable/twotone_cleaning_services_24.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11,3h2v8h-2z"
-      android:strokeAlpha="0.3"
-      android:fillAlpha="0.3"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16,13H8c-1.65,0 -3,1.35 -3,3v5h2v-3c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v3h2v-3c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v3h2v-3c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v3h2v-5C19,14.35 17.65,13 16,13z"
-      android:strokeAlpha="0.3"
-      android:fillAlpha="0.3"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16,11h-1V3c0,-1.1 -0.9,-2 -2,-2h-2C9.9,1 9,1.9 9,3v8H8c-2.76,0 -5,2.24 -5,5v7h18v-7C21,13.24 18.76,11 16,11zM11,3h2v8h-2V3zM19,21h-2v-3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3h-2v-3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3H9v-3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3H5v-5c0,-1.65 1.35,-3 3,-3h8c1.65,0 3,1.35 3,3V21z"/>
-</vector>
diff --git a/app/src/main/res/menu/menu_code.xml b/app/src/main/res/menu/menu_code.xml
index 96e7ac0031..c49fc7df43 100644
--- a/app/src/main/res/menu/menu_code.xml
+++ b/app/src/main/res/menu/menu_code.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/menu_sanitize"
         android:checkable="true"
-        android:icon="@drawable/twotone_cleaning_services_24"
-        android:title="@string/title_sanitize"
+        android:icon="@drawable/twotone_fullscreen_exit_24"
+        android:title="@string/title_legend_show_reformatted"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e52f4c555..524301d5e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2344,7 +2344,6 @@
     <string name="title_widget_day_night">Follow dark system theme</string>
 
     <string name="title_compat_dark">Google removed dark mode for Android versions before version 10</string>
-    <string name="title_sanitize" translatable="false">Sanitize</string>
 
     <!-- Thunderbird -->
     <string name="title_keyword_label1">Important</string>