From 764273db684c22d537ba0784ce877741d2c245ab Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 28 Jul 2021 14:47:19 +0200
Subject: [PATCH] Added re/fwd option title

---
 .../java/eu/faircode/email/FragmentOptionsSend.java |  8 ++++++--
 app/src/main/res/layout/fragment_options_send.xml   | 13 ++++++++++++-
 app/src/main/res/values/strings.xml                 |  1 +
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
index 739756db8b..150d0a6dd3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
@@ -449,13 +449,17 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         String re2 = getString(R.string.title_subject_reply_alt, "");
         ((RadioButton) view.findViewById(R.id.rbRe1)).setText(re1);
         ((RadioButton) view.findViewById(R.id.rbRe2)).setText(re2);
-        rgRe.setVisibility(Objects.equals(re1, re2) ? View.GONE : View.VISIBLE);
+        boolean re = !Objects.equals(re1, re2);
+        for (int i = 0; i < rgRe.getChildCount(); i++)
+            rgRe.getChildAt(i).setEnabled(re);
 
         String fwd1 = getString(R.string.title_subject_forward, "");
         String fwd2 = getString(R.string.title_subject_forward_alt, "");
         ((RadioButton) view.findViewById(R.id.rbFwd1)).setText(fwd1);
         ((RadioButton) view.findViewById(R.id.rbFwd2)).setText(fwd2);
-        rgFwd.setVisibility(Objects.equals(fwd1, fwd2) ? View.GONE : View.VISIBLE);
+        boolean fwd = !Objects.equals(fwd1, fwd2);
+        for (int i = 0; i < rgFwd.getChildCount(); i++)
+            rgFwd.getChildAt(i).setEnabled(fwd);
 
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 
diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml
index 7bf545d0ac..140bfc6d60 100644
--- a/app/src/main/res/layout/fragment_options_send.xml
+++ b/app/src/main/res/layout/fragment_options_send.xml
@@ -183,6 +183,17 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swSuggestFrequently" />
 
+                <eu.faircode.email.FixedTextView
+                    android:id="@+id/tvAltReFws"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_alt_re_fwd"
+                    android:textColor="?android:attr/textColorPrimary"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btnLocalContacts" />
+
                 <RadioGroup
                     android:id="@+id/rgRe"
                     android:layout_width="0dp"
@@ -191,7 +202,7 @@
                     android:orientation="horizontal"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnLocalContacts">
+                    app:layout_constraintTop_toBottomOf="@id/tvAltReFws">
 
                     <RadioButton
                         android:id="@+id/rbRe1"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 626131762a..7e664cd8e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -342,6 +342,7 @@
     <string name="title_advanced_suggest_sent">Suggest addresses found in sent messages</string>
     <string name="title_advanced_suggest_received">Suggest addresses found in received messages</string>
     <string name="title_advanced_suggest_frequently">Sort suggested addresses on frequency of use</string>
+    <string name="title_advanced_alt_re_fwd">Alternative reply/forward prefix</string>
     <string name="title_advanced_send_reminders">Show reminders</string>
     <string name="title_advanced_send_delayed">Delay sending messages</string>
     <string name="title_advanced_send_pending">Show non-obtrusive send delayed icon</string>