From 65c47098ddbb5097b4a865193339ffbf39fbda6b Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Tue, 17 May 2022 17:36:34 +0600
Subject: [PATCH] 
 311-Encrpytion_notifier_in_recipient_token_not_visible_in_dark_mode_issue

issue: https://gitlab.e.foundation/e/os/backlog/-/issues/311

- `openpgp_black` as pure black color always, it is not visible in dark
  mode. We upate it to default_color to be visible in both light & dark
  mode.
- move encrytion status notifiers in the token item view under the
  background, because they look better this way with new circular corner
  background.
---
 app/k9mail/src/main/res/values/themes.xml     |  4 +-
 .../main/res/layout/recipient_token_item.xml  | 70 ++++++++++---------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index b18641e71e..9da0928dd4 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -139,7 +139,7 @@
         <item name="iconAboutTwitter">@drawable/ic_twitter</item>
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
-        <item name="openpgp_black">#000</item>
+        <item name="openpgp_black">@color/default_icon_color</item>
         <item name="openpgp_orange">#FF8800</item>
         <item name="openpgp_red">#CC0000</item>
         <item name="openpgp_green">#669900</item>
@@ -265,7 +265,7 @@
         <item name="iconAboutTwitter">@drawable/ic_twitter</item>
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
-        <item name="openpgp_black">#000</item>
+        <item name="openpgp_black">@color/default_icon_color</item>
         <item name="openpgp_orange">#FF8800</item>
         <item name="openpgp_red">#CC0000</item>
         <item name="openpgp_green">#669900</item>
diff --git a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
index 1262310d25..894005a033 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
@@ -5,6 +5,42 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
+    <ImageView
+        android:id="@+id/contact_crypto_status_icon_simple"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_status_corner"
+        app:tint="?openpgp_black"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/contact_crypto_status_icon_simple_enabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_status_corner"
+        app:tint="?openpgp_green"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/contact_crypto_status_icon_simple_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_status_corner"
+        app:tint="?openpgp_red"
+        tools:visibility="gone" />
+
     <View
         android:id="@+id/background"
         android:layout_width="0dp"
@@ -57,41 +93,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Jane Doe" />
 
-    <ImageView
-        android:id="@+id/contact_crypto_status_icon_simple"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_status_corner"
-        app:tint="?openpgp_black"
-        tools:visibility="gone" />
 
-    <ImageView
-        android:id="@+id/contact_crypto_status_icon_simple_enabled"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_status_corner"
-        app:tint="?openpgp_green"
-        tools:visibility="gone" />
-
-    <ImageView
-        android:id="@+id/contact_crypto_status_icon_simple_error"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_status_corner"
-        app:tint="?openpgp_red"
-        tools:visibility="gone" />
 
     <ImageView
         android:id="@+id/contact_crypto_status_red"
-- 
GitLab