From df615345a355bdbfae844c1a115a86d0d74b07d3 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Mon, 13 Jun 2022 12:45:57 +0600 Subject: [PATCH] main-314-encryption_icon_update issue: https://gitlab.e.foundation/e/os/backlog/-/issues/314 - update encryption icons - update openPgp green, orange, red colors update icons --- .../src/main/res/values/themes.xml | 14 +++++----- app/k9mail/src/main/res/values/themes.xml | 12 ++++---- .../src/main/res/drawable/status_lock.xml | 13 +++++---- .../res/drawable/status_lock_disabled.xml | 12 ++------ .../drawable/status_lock_disabled_dots_1.xml | 18 +++++++----- .../main/res/drawable/status_lock_dots_2.xml | 23 ++++++++------- .../main/res/drawable/status_lock_dots_3.xml | 27 ++++++++---------- .../main/res/drawable/status_lock_error.xml | 19 +++++++++---- .../main/res/drawable/status_lock_unknown.xml | 19 +++++++++---- .../main/res/drawable/status_signature.xml | 13 +++++---- .../res/drawable/status_signature_dots_3.xml | 28 ++++++++----------- .../res/drawable/status_signature_unknown.xml | 10 +++---- .../main/res/layout/message_view_header.xml | 5 +--- 13 files changed, 109 insertions(+), 104 deletions(-) diff --git a/app/k9mail-jmap/src/main/res/values/themes.xml b/app/k9mail-jmap/src/main/res/values/themes.xml index 23370b9b02..fd36fad97d 100644 --- a/app/k9mail-jmap/src/main/res/values/themes.xml +++ b/app/k9mail-jmap/src/main/res/values/themes.xml @@ -115,9 +115,9 @@ @drawable/ic_visibility #000 - #FF8800 - #CC0000 - #669900 + #FF7A00 + #F8432E + #44B04C #336699 #bbb #888 @@ -234,10 +234,10 @@ @drawable/ic_visibility #fff - #ee7700 - #CC0000 - #77aa00 - #6699cc + #FF7A00 + #F8432E + #44B04C + #336699 #888 #bbb diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml index 9da0928dd4..5a61f29260 100644 --- a/app/k9mail/src/main/res/values/themes.xml +++ b/app/k9mail/src/main/res/values/themes.xml @@ -140,9 +140,9 @@ @drawable/ic_visibility @color/default_icon_color - #FF8800 - #CC0000 - #669900 + #FF7A00 + #F8432E + #44B04C #336699 #bbb #888 @@ -266,9 +266,9 @@ @drawable/ic_visibility @color/default_icon_color - #FF8800 - #CC0000 - #669900 + #FF7A00 + #F8432E + #44B04C #336699 #bbb #888 diff --git a/app/ui/legacy/src/main/res/drawable/status_lock.xml b/app/ui/legacy/src/main/res/drawable/status_lock.xml index 4d19d5e15f..b6611d5123 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock.xml @@ -1,6 +1,9 @@ - - + + diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml index 0f7777f6ca..0563ae6ea2 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml @@ -1,15 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> - + android:pathData="M18,8.5H17V6.5C17,3.74 14.76,1.5 12,1.5C9.24,1.5 7,3.74 7,6.5H9C9,4.84 10.34,3.5 12,3.5C13.66,3.5 15,4.84 15,6.5V8.5H6C4.9,8.5 4,9.4 4,10.5V20.5C4,21.6 4.9,22.5 6,22.5H18C19.1,22.5 20,21.6 20,20.5V10.5C20,9.4 19.1,8.5 18,8.5ZM18,20.5H6V10.5H18V20.5ZM12,17.5C13.1,17.5 14,16.6 14,15.5C14,14.4 13.1,13.5 12,13.5C10.9,13.5 10,14.4 10,15.5C10,16.6 10.9,17.5 12,17.5Z" /> diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml b/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml index c96eb7217d..4d63e30f7d 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml @@ -1,8 +1,12 @@ - - - + + + diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml b/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml index bb155f30d4..ca305fb883 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml @@ -1,13 +1,12 @@ - - - - + + + diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml b/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml index d27cdd9e91..2fe0371925 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml @@ -1,17 +1,12 @@ - - - - - + + + diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_error.xml b/app/ui/legacy/src/main/res/drawable/status_lock_error.xml index d5ed073de2..6d35306c46 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock_error.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock_error.xml @@ -1,6 +1,15 @@ - - + + + + diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml b/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml index 35d6767d95..5cef3f41e1 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml @@ -1,6 +1,15 @@ - - + + + + diff --git a/app/ui/legacy/src/main/res/drawable/status_signature.xml b/app/ui/legacy/src/main/res/drawable/status_signature.xml index 142aac33a5..41f6b21c0c 100644 --- a/app/ui/legacy/src/main/res/drawable/status_signature.xml +++ b/app/ui/legacy/src/main/res/drawable/status_signature.xml @@ -1,6 +1,9 @@ - - + + diff --git a/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml b/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml index e72ee19f89..985021c83a 100644 --- a/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml +++ b/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml @@ -1,18 +1,12 @@ - - - - - + + + diff --git a/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml b/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml index 4ae926f452..e4ec718148 100644 --- a/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml +++ b/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml @@ -1,11 +1,9 @@ + android:height="25dp" + android:viewportWidth="24" + android:viewportHeight="25"> + android:pathData="M12,2.5C6.48,2.5 2,6.98 2,12.5C2,18.02 6.48,22.5 12,22.5C17.52,22.5 22,18.02 22,12.5C22,6.98 17.52,2.5 12,2.5ZM13,19.5H11V17.5H13V19.5ZM15.07,11.75L14.17,12.67C13.45,13.4 13,14 13,15.5H11V15C11,13.9 11.45,12.9 12.17,12.17L13.41,10.91C13.78,10.55 14,10.05 14,9.5C14,8.4 13.1,7.5 12,7.5C10.9,7.5 10,8.4 10,9.5H8C8,7.29 9.79,5.5 12,5.5C14.21,5.5 16,7.29 16,9.5C16,10.38 15.64,11.18 15.07,11.75Z" /> diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml index 4d178c2666..f754aa561f 100644 --- a/app/ui/legacy/src/main/res/layout/message_view_header.xml +++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml @@ -31,6 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp" + android:layout_marginTop="13dp" android:orientation="horizontal"> @@ -66,7 +64,6 @@ android:layout_height="24dp" android:layout_gravity="center" android:layout_marginEnd="8dp" - android:layout_marginTop="13dp" android:focusable="false" android:checked="false" style="@style/MessageStarStyle" /> -- GitLab