From c036c686a6f1c07a00965e852e6137c710d0a3c5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 28 Jul 2019 22:06:21 +0200
Subject: [PATCH] Added hint about color precedence

---
 app/src/main/res/layout/fragment_identity.xml | 14 ++++++++++++--
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 5d14469433..8ae74b5a92 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -152,6 +152,16 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toTopOf="@id/btnColor" />
 
+            <TextView
+                android:id="@+id/tvColorHint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_identity_color_hint"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textStyle="italic"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btnColor" />
+
             <TextView
                 android:id="@+id/tvColorPro"
                 android:layout_width="wrap_content"
@@ -161,7 +171,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textColor="?android:attr/textColorLink"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/btnColor" />
+                app:layout_constraintTop_toBottomOf="@id/tvColorHint" />
 
             <TextView
                 android:id="@+id/tvSignature"
@@ -657,7 +667,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="
                 tvName,etName,tvEmail,etEmail,tvDisplay,etDisplay,
-                tvColor,btnColor,vwColor,ibColorDefault,tvColorPro,
+                tvColor,btnColor,vwColor,ibColorDefault,tvColorHint,tvColorPro,
                 tvSignature,etSignature,btnHtml,
                 btnAdvanced,btnSave" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5148acd2fc..18a77b1df8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -311,6 +311,7 @@
     <string name="title_select">Select &#8230;</string>
     <string name="title_identity_name">Your name</string>
     <string name="title_identity_email">Your email address</string>
+    <string name="title_identity_color_hint">Identity colors take precedence over account colors</string>
     <string name="title_advanced_sender">Allow editing sender address</string>
     <string name="title_identity_reply_to">Reply to address</string>
     <string name="title_identity_encrypt">Encrypt by default</string>