From 2150054c636254d3ccf3d48c9152977a9cab8f31 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 5 Sep 2023 08:33:33 +0200
Subject: [PATCH] Added option to disable highlighting checked text

---
 .../java/eu/faircode/email/FragmentCompose.java    |  4 +++-
 .../eu/faircode/email/FragmentOptionsMisc.java     | 14 +++++++++++++-
 app/src/main/res/layout/fragment_options_misc.xml  | 14 +++++++++++++-
 app/src/main/res/values/strings.xml                |  1 +
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 1da5f78bfb..4ae42bdcb0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2908,7 +2908,9 @@ public class FragmentCompose extends FragmentBase {
             @Override
             protected void onPreExecute(Bundle args) {
                 if (silent) {
-                    if (!BuildConfig.PLAY_STORE_RELEASE) {
+                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+                    boolean lt_highlight = prefs.getBoolean("lt_highlight", !BuildConfig.PLAY_STORE_RELEASE);
+                    if (lt_highlight) {
                         int textColorHighlight = Helper.resolveColor(getContext(), android.R.attr.textColorHighlight);
                         highlightSpan = new BackgroundColorSpan(textColorHighlight);
                         etBody.getText().setSpan(highlightSpan, start, end,
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 579d99b528..356fb5f747 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -147,6 +147,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private SwitchCompat swLanguageToolSentence;
     private SwitchCompat swLanguageToolAuto;
     private SwitchCompat swLanguageToolPicky;
+    private SwitchCompat swLanguageToolHighlight;
     private EditText etLanguageTool;
     private EditText etLanguageToolUser;
     private TextInputLayout tilLanguageToolKey;
@@ -286,7 +287,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             "classification", "class_min_probability", "class_min_difference",
             "show_filtered",
             "language",
-            "lt_enabled", "lt_sentence", "lt_auto", "lt_picky", "lt_uri", "lt_user", "lt_key",
+            "lt_enabled", "lt_sentence", "lt_auto", "lt_picky", "lt_highlight", "lt_uri", "lt_user", "lt_key",
             "deepl_enabled",
             "vt_enabled", "vt_apikey",
             "send_enabled", "send_host", "send_dlimit", "send_tlimit",
@@ -403,6 +404,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         swLanguageToolSentence = view.findViewById(R.id.swLanguageToolSentence);
         swLanguageToolAuto = view.findViewById(R.id.swLanguageToolAuto);
         swLanguageToolPicky = view.findViewById(R.id.swLanguageToolPicky);
+        swLanguageToolHighlight = view.findViewById(R.id.swLanguageToolHighlight);
         etLanguageTool = view.findViewById(R.id.etLanguageTool);
         etLanguageToolUser = view.findViewById(R.id.etLanguageToolUser);
         tilLanguageToolKey = view.findViewById(R.id.tilLanguageToolKey);
@@ -863,6 +865,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                 swLanguageToolSentence.setEnabled(checked);
                 swLanguageToolAuto.setEnabled(checked);
                 swLanguageToolPicky.setEnabled(checked);
+                swLanguageToolHighlight.setEnabled(checked);
             }
         });
 
@@ -895,6 +898,13 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             }
         });
 
+        swLanguageToolHighlight.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("lt_highlight", checked).apply();
+            }
+        });
+
         etLanguageTool.setHint(LanguageTool.LT_URI);
         etLanguageTool.addTextChangedListener(new TextWatcher() {
             @Override
@@ -2554,6 +2564,8 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             swLanguageToolAuto.setEnabled(swLanguageTool.isChecked());
             swLanguageToolPicky.setChecked(prefs.getBoolean("lt_picky", false));
             swLanguageToolPicky.setEnabled(swLanguageTool.isChecked());
+            swLanguageToolHighlight.setChecked(prefs.getBoolean("lt_highlight", !BuildConfig.PLAY_STORE_RELEASE));
+            swLanguageToolHighlight.setEnabled(swLanguageTool.isChecked());
             etLanguageTool.setText(prefs.getString("lt_uri", null));
             etLanguageToolUser.setText(prefs.getString("lt_user", null));
             tilLanguageToolKey.getEditText().setText(prefs.getString("lt_key", null));
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 4225bab73a..80eeaa4645 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -684,6 +684,18 @@
                     app:layout_constraintTop_toBottomOf="@id/swLanguageToolAuto"
                     app:switchPadding="12dp" />
 
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/swLanguageToolHighlight"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:text="@string/title_advanced_lt_highlight"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swLanguageToolPicky"
+                    app:switchPadding="12dp" />
+
                 <EditText
                     android:id="@+id/etLanguageTool"
                     android:layout_width="0dp"
@@ -694,7 +706,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swLanguageToolPicky" />
+                    app:layout_constraintTop_toBottomOf="@id/swLanguageToolHighlight" />
 
                 <EditText
                     android:id="@+id/etLanguageToolUser"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c2242bb8a..88bce61340 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -826,6 +826,7 @@
     <string name="title_advanced_lt">LanguageTool integration</string>
     <string name="title_advanced_lt_sentence">Check every sentence</string>
     <string name="title_advanced_lt_auto">Check paragraph after a new line</string>
+    <string name="title_advanced_lt_highlight">Highlight the text being checked</string>
     <string name="title_advanced_lt_user">Username (optional)</string>
     <string name="title_advanced_lt_key">API key (optional)</string>
     <string name="title_advanced_deepl">DeepL integration</string>