From 1c01bb980d23b5f7c89d0f20bba51b35fece79d9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 17 Sep 2021 13:41:56 +0200
Subject: [PATCH] Added HTML signature remark

---
 .../java/eu/faircode/email/ActivitySignature.java   |  4 ++++
 app/src/main/res/layout/activity_signature.xml      | 13 ++++++++++++-
 app/src/main/res/values/strings.xml                 |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java
index f515d4f141..df497e7e50 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySignature.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java
@@ -59,6 +59,7 @@ import java.util.Objects;
 
 public class ActivitySignature extends ActivityBase {
     private ViewGroup view;
+    private TextView tvHtmlRemark;
     private EditTextCompose etText;
     private BottomNavigationView style_bar;
     private BottomNavigationView bottom_navigation;
@@ -81,6 +82,7 @@ public class ActivitySignature extends ActivityBase {
         view = (ViewGroup) inflater.inflate(R.layout.activity_signature, null, false);
         setContentView(view);
 
+        tvHtmlRemark = findViewById(R.id.tvHtmlRemark);
         etText = findViewById(R.id.etText);
         style_bar = findViewById(R.id.style_bar);
         bottom_navigation = findViewById(R.id.bottom_navigation);
@@ -176,6 +178,7 @@ public class ActivitySignature extends ActivityBase {
 
         // Initialize
         FragmentDialogTheme.setBackground(this, view, true);
+        tvHtmlRemark.setVisibility(View.GONE);
         style_bar.setVisibility(View.GONE);
 
         setResult(RESULT_CANCELED, new Intent());
@@ -279,6 +282,7 @@ public class ActivitySignature extends ActivityBase {
         String html = (dirty
                 ? getHtml()
                 : getIntent().getStringExtra("html"));
+        tvHtmlRemark.setVisibility(raw ? View.VISIBLE : View.GONE);
         etText.setRaw(raw);
         etText.setTypeface(raw ? Typeface.MONOSPACE : Typeface.DEFAULT);
         load(html);
diff --git a/app/src/main/res/layout/activity_signature.xml b/app/src/main/res/layout/activity_signature.xml
index c734d1dbfa..863333306f 100644
--- a/app/src/main/res/layout/activity_signature.xml
+++ b/app/src/main/res/layout/activity_signature.xml
@@ -11,6 +11,17 @@
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvHtmlRemark"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="6dp"
+            android:text="@string/title_edit_signature_remark"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <eu.faircode.email.EditTextCompose
             android:id="@+id/etText"
             android:layout_width="0dp"
@@ -26,7 +37,7 @@
             app:layout_constraintBottom_toTopOf="@+id/style_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/tvHtmlRemark" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/style_bar"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a5d8453694..8eed96e9c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1359,6 +1359,7 @@
     <string name="title_next">Next</string>
 
     <string name="title_edit_signature">Edit signature</string>
+    <string name="title_edit_signature_remark">Although Android cannot display all HTML, it will be sent as-is</string>
     <string name="title_edit_signature_text">Signature text</string>
     <string name="title_edit_signature_image">Insert image</string>