From ab4ec867bbc4083debaf502cec158c0e4b6ad3f6 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Mon, 14 Mar 2022 14:30:24 +0600 Subject: [PATCH] 69-Update_drawer_icons issue: https://gitlab.e.foundation/e/os/backlog/-/issues/69 Use material icons (outlined, 18dp) for drawer items. Updated icons: - ic_inbox_multiple - ic_folder - ic_inbox - ic_outbox - ic_drafts_folder - ic_send - ic_alert_octagon - ic_cog --- app/k9mail/src/main/res/values/themes.xml | 52 +++++++++---------- .../main/res/drawable/ic_alert_octagon.xml | 18 ++++--- .../legacy/src/main/res/drawable/ic_cog.xml | 12 ++--- .../main/res/drawable/ic_drafts_folder.xml | 12 ++--- .../src/main/res/drawable/ic_folder.xml | 12 ++--- .../legacy/src/main/res/drawable/ic_inbox.xml | 12 ++--- .../main/res/drawable/ic_inbox_multiple.xml | 10 ++-- .../src/main/res/drawable/ic_outbox.xml | 15 +++--- .../legacy/src/main/res/drawable/ic_send.xml | 12 ++--- 9 files changed, 82 insertions(+), 73 deletions(-) diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml index 4b6a14a27c..2f8e2d73ff 100644 --- a/app/k9mail/src/main/res/values/themes.xml +++ b/app/k9mail/src/main/res/values/themes.xml @@ -24,20 +24,20 @@ @style/PreferenceThemeOverlay @lineageos.platform:drawable/ic_hamburger - @lineageos.platform:drawable/ic_unified_inbox - @lineageos.platform:drawable/ic_folder - @lineageos.platform:drawable/ic_inbox - @lineageos.platform:drawable/ic_outbox + @drawable/ic_inbox_multiple + @drawable/ic_folder + @drawable/ic_inbox + @drawable/ic_outbox @drawable/ic_archive - @lineageos.platform:drawable/ic_file - @lineageos.platform:drawable/ic_send - @lineageos.platform:drawable/ic_mail_spam + @drawable/ic_drafts_folder + @drawable/ic_send + @drawable/ic_alert_octagon @drawable/ic_trash_can @lineageos.platform:drawable/ic_attachment @drawable/ic_archive @drawable/ic_pencil @drawable/ic_trash_can - @lineageos.platform:drawable/ic_folder + @drawable/ic_folder @drawable/ic_content_copy @lineageos.platform:drawable/ic_chevron_right @lineageos.platform:drawable/ic_chevron_right @@ -45,11 +45,11 @@ @drawable/ic_refresh @drawable/ic_magnify @drawable/ic_folder_magnify - @lineageos.platform:drawable/ic_send - @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_send + @drawable/ic_cog @drawable/ic_reply_all @drawable/ic_sort - @lineageos.platform:drawable/ic_mail_spam + @drawable/ic_alert_octagon @lineageos.platform:drawable/ic_star_filled @lineageos.platform:drawable/ic_star @drawable/ic_opened_envelope @@ -71,14 +71,14 @@ @drawable/ic_arrow_up_down @drawable/ic_shield @drawable/ic_bug - @lineageos.platform:drawable/ic_folder + @drawable/ic_folder @drawable/ic_magnify @drawable/ic_preferences_crypto @drawable/ic_preferences_check_mail @drawable/ic_opened_envelope @drawable/ic_pencil @lineageos.platform:drawable/ic_info - @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_cog @drawable/ic_envelope @lineageos.platform:drawable/ic_add @drawable/ic_export @@ -150,20 +150,20 @@ @style/PreferenceThemeOverlay @lineageos.platform:drawable/ic_hamburger - @lineageos.platform:drawable/ic_unified_inbox - @lineageos.platform:drawable/ic_folder - @lineageos.platform:drawable/ic_inbox - @lineageos.platform:drawable/ic_outbox + @drawable/ic_inbox_multiple + @drawable/ic_folder + @drawable/ic_inbox + @drawable/ic_outbox @drawable/ic_archive - @lineageos.platform:drawable/ic_file - @lineageos.platform:drawable/ic_send - @lineageos.platform:drawable/ic_mail_spam + @drawable/ic_drafts_folder + @drawable/ic_send + @drawable/ic_alert_octagon @drawable/ic_trash_can @lineageos.platform:drawable/ic_attachment @drawable/ic_archive @drawable/ic_pencil @drawable/ic_trash_can - @lineageos.platform:drawable/ic_folder + @drawable/ic_folder @drawable/ic_content_copy @lineageos.platform:drawable/ic_chevron_right @lineageos.platform:drawable/ic_chevron_right @@ -171,11 +171,11 @@ @drawable/ic_refresh @drawable/ic_magnify @drawable/ic_folder_magnify - @lineageos.platform:drawable/ic_send - @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_send + @drawable/ic_cog @drawable/ic_reply_all @drawable/ic_sort - @lineageos.platform:drawable/ic_mail_spam + @drawable/ic_alert_octagon @lineageos.platform:drawable/ic_star_filled @lineageos.platform:drawable/ic_star @drawable/ic_opened_envelope @@ -197,14 +197,14 @@ @drawable/ic_arrow_up_down @drawable/ic_shield @drawable/ic_bug - @lineageos.platform:drawable/ic_folder + @drawable/ic_folder @drawable/ic_magnify @drawable/ic_preferences_crypto @drawable/ic_preferences_check_mail @drawable/ic_opened_envelope @drawable/ic_pencil @lineageos.platform:drawable/ic_info - @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_cog @drawable/ic_envelope @lineageos.platform:drawable/ic_add @drawable/ic_export diff --git a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml index a10a748180..8896679805 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml @@ -1,9 +1,15 @@ + android:width="18dp" + android:height="18dp" + android:viewportWidth="18" + android:viewportHeight="18"> + android:pathData="M12.73,0H5.27L0,5.27V12.73L5.27,18H12.73L18,12.73V5.27L12.73,0ZM16,11.9L11.9,16H6.1L2,11.9V6.1L6.1,2H11.9L16,6.1V11.9Z" + android:fillColor="@color/default_icon_color"/> + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_cog.xml b/app/ui/legacy/src/main/res/drawable/ic_cog.xml index e9c598c1d0..5764b3c420 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_cog.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_cog.xml @@ -1,9 +1,9 @@ + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20"> + android:pathData="M17.4318,10.98C17.4718,10.66 17.5018,10.34 17.5018,10C17.5018,9.66 17.4718,9.34 17.4318,9.02L19.5418,7.37C19.7318,7.22 19.7818,6.95 19.6618,6.73L17.6618,3.27C17.5718,3.11 17.4018,3.02 17.2218,3.02C17.1618,3.02 17.1018,3.03 17.0518,3.05L14.5618,4.05C14.0418,3.65 13.4818,3.32 12.8718,3.07L12.4918,0.42C12.4618,0.18 12.2518,0 12.0018,0H8.0018C7.7518,0 7.5418,0.18 7.5118,0.42L7.1318,3.07C6.5218,3.32 5.9618,3.66 5.4418,4.05L2.9518,3.05C2.8918,3.03 2.8318,3.02 2.7718,3.02C2.6018,3.02 2.4318,3.11 2.3418,3.27L0.3418,6.73C0.2118,6.95 0.2718,7.22 0.4618,7.37L2.5718,9.02C2.5318,9.34 2.5018,9.67 2.5018,10C2.5018,10.33 2.5318,10.66 2.5718,10.98L0.4618,12.63C0.2718,12.78 0.2218,13.05 0.3418,13.27L2.3418,16.73C2.4318,16.89 2.6018,16.98 2.7818,16.98C2.8418,16.98 2.9018,16.97 2.9518,16.95L5.4418,15.95C5.9618,16.35 6.5218,16.68 7.1318,16.93L7.5118,19.58C7.5418,19.82 7.7518,20 8.0018,20H12.0018C12.2518,20 12.4618,19.82 12.4918,19.58L12.8718,16.93C13.4818,16.68 14.0418,16.34 14.5618,15.95L17.0518,16.95C17.1118,16.97 17.1718,16.98 17.2318,16.98C17.4018,16.98 17.5718,16.89 17.6618,16.73L19.6618,13.27C19.7818,13.05 19.7318,12.78 19.5418,12.63L17.4318,10.98ZM15.4518,9.27C15.4918,9.58 15.5018,9.79 15.5018,10C15.5018,10.21 15.4818,10.43 15.4518,10.73L15.3118,11.86L16.2018,12.56L17.2818,13.4L16.5818,14.61L15.3118,14.1L14.2718,13.68L13.3718,14.36C12.9418,14.68 12.5318,14.92 12.1218,15.09L11.0618,15.52L10.9018,16.65L10.7018,18H9.3018L8.9518,15.52L7.8918,15.09C7.4618,14.91 7.0618,14.68 6.6618,14.38L5.7518,13.68L4.6918,14.11L3.4218,14.62L2.7218,13.41L3.8018,12.57L4.6918,11.87L4.5518,10.74C4.5218,10.43 4.5018,10.2 4.5018,10C4.5018,9.8 4.5218,9.57 4.5518,9.27L4.6918,8.14L3.8018,7.44L2.7218,6.6L3.4218,5.39L4.6918,5.9L5.7318,6.32L6.6318,5.64C7.0618,5.32 7.4718,5.08 7.8818,4.91L8.9418,4.48L9.1018,3.35L9.3018,2H10.6918L11.0418,4.48L12.1018,4.91C12.5318,5.09 12.9318,5.32 13.3318,5.62L14.2418,6.32L15.3018,5.89L16.5718,5.38L17.2718,6.59L16.2018,7.44L15.3118,8.14L15.4518,9.27ZM10.0018,6C7.7918,6 6.0018,7.79 6.0018,10C6.0018,12.21 7.7918,14 10.0018,14C12.2118,14 14.0018,12.21 14.0018,10C14.0018,7.79 12.2118,6 10.0018,6ZM10.0018,12C8.9018,12 8.0018,11.1 8.0018,10C8.0018,8.9 8.9018,8 10.0018,8C11.1018,8 12.0018,8.9 12.0018,10C12.0018,11.1 11.1018,12 10.0018,12Z" + android:fillColor="@color/default_icon_color"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml index ab4ecff6d0..e7da3b70ad 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml @@ -1,9 +1,9 @@ + android:width="16dp" + android:height="20dp" + android:viewportWidth="16" + android:viewportHeight="20"> + android:pathData="M10,0H2C0.9,0 0.01,0.9 0.01,2L0,18C0,19.1 0.89,20 1.99,20H14C15.1,20 16,19.1 16,18V6L10,0ZM2,18V2H9V7H14V18H2Z" + android:fillColor="@color/default_icon_color"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_folder.xml index 0a2b1a23a5..1f96ee0bcc 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml @@ -1,9 +1,9 @@ + android:width="20dp" + android:height="16dp" + android:viewportWidth="20" + android:viewportHeight="16"> + android:pathData="M7.17,2L9.17,4H18V14H2V2H7.17ZM8,0H2C0.9,0 0.01,0.9 0.01,2L0,14C0,15.1 0.9,16 2,16H18C19.1,16 20,15.1 20,14V4C20,2.9 19.1,2 18,2H10L8,0Z" + android:fillColor="@color/default_icon_color"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml index 82d62d1a4f..f6d7df5b7c 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml @@ -1,9 +1,9 @@ + android:width="18dp" + android:height="18dp" + android:viewportWidth="18" + android:viewportHeight="18"> + android:pathData="M16,0H2C0.9,0 0,0.9 0,2V16C0,17.1 0.89,18 2,18H16C17.1,18 18,17.1 18,16V2C18,0.9 17.1,0 16,0ZM16,16H2V13H5.56C6.25,14.19 7.53,15 9.01,15C10.49,15 11.76,14.19 12.46,13H16V16ZM16,11H11.01C11.01,12.1 10.11,13 9.01,13C7.91,13 7.01,12.1 7.01,11H2V2H16V11Z" + android:fillColor="@color/default_icon_color"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml index cdfc0666d4..d8e92c2082 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml @@ -1,9 +1,9 @@ + android:width="18dp" + android:height="18dp" + android:viewportWidth="18" + android:viewportHeight="18"> + android:pathData="M16,0H2C0.9,0 0,0.9 0,2V9C0,10.1 0.9,11 2,11H16C17.1,11 18,10.1 18,9V2C18,0.9 17.1,0 16,0ZM16,6H12C12,7.62 10.62,9 9,9C7.38,9 6,7.62 6,6H2V2H16V6ZM12,13H18V16C18,17.1 17.1,18 16,18H2C0.9,18 0,17.1 0,16V13H6C6,14.66 7.34,16 9,16C10.66,16 12,14.66 12,13Z" /> diff --git a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml index 47a9b9f760..319f688f67 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml @@ -1,9 +1,12 @@ + android:width="18dp" + android:height="18dp" + android:viewportWidth="18" + android:viewportHeight="18"> + android:pathData="M8,6.83V11H10V6.83L11.59,8.41L13,7L9,3L5,7L6.41,8.41L8,6.83Z" + android:fillColor="@color/default_icon_color"/> + diff --git a/app/ui/legacy/src/main/res/drawable/ic_send.xml b/app/ui/legacy/src/main/res/drawable/ic_send.xml index aa4a1bfa94..1356700783 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_send.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml @@ -1,9 +1,9 @@ + android:width="22dp" + android:height="18dp" + android:viewportWidth="22" + android:viewportHeight="18"> + android:pathData="M0.51,18L21.5,9L0.51,0L0.5,7L15.5,9L0.5,11L0.51,18Z" + android:fillColor="@color/default_icon_color"/> -- GitLab