From d71fa753bc08ecbd10636dee0f09cecd2c7237fe Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Fri, 4 Mar 2022 01:00:36 +0600 Subject: [PATCH 1/2] 4723-Fix_UI_issues issue: https://gitlab.e.foundation/e/backlog/-/issues/4723 Update UI accroding to: https://www.figma.com/file/IYFNR6xuNZXd1hqGl6itT6/Mail-app-%F0%9F%94%A8?node-id=323%3A2025 - remove dummy `Add Account(New)` option - fix navigation drawer selected state colors - fix drawer account selection view margin - add extra left & right paading on thread-count of message_list_item - use material icons for acctionBar & drawer items - update actionMode close button to `X` icon - on messageDetails page, remove chip color bar - on messageDetails page, use default background color for headerView --- app/k9mail/src/main/res/values/themes.xml | 126 +++++++++--------- .../base/src/main/res/drawable/ic_close.xml | 10 ++ app/ui/base/src/main/res/values/styles.xml | 1 + .../src/main/java/com/fsck/k9/ui/K9Drawer.kt | 22 ++- .../k9/ui/settings/SettingsListFragment.kt | 2 - .../main/res/drawable/ic_alert_octagon.xml | 6 +- .../src/main/res/drawable/ic_archive.xml | 6 +- .../main/res/drawable/ic_arrow_up_down.xml | 6 +- .../src/main/res/drawable/ic_attachment.xml | 6 +- .../src/main/res/drawable/ic_chevron_down.xml | 6 +- .../src/main/res/drawable/ic_chevron_left.xml | 6 +- .../main/res/drawable/ic_chevron_right.xml | 6 +- .../src/main/res/drawable/ic_chevron_up.xml | 6 +- .../legacy/src/main/res/drawable/ic_clear.xml | 6 +- .../legacy/src/main/res/drawable/ic_cog.xml | 6 +- .../src/main/res/drawable/ic_content_copy.xml | 6 +- .../src/main/res/drawable/ic_download.xml | 2 +- .../src/main/res/drawable/ic_envelope.xml | 2 +- .../src/main/res/drawable/ic_file_upload.xml | 2 +- .../src/main/res/drawable/ic_floppy.xml | 2 +- .../src/main/res/drawable/ic_folder.xml | 2 +- .../legacy/src/main/res/drawable/ic_inbox.xml | 2 +- .../main/res/drawable/ic_inbox_multiple.xml | 4 +- .../src/main/res/drawable/ic_magnify.xml | 2 +- .../main/res/drawable/ic_opened_envelope.xml | 5 +- .../src/main/res/drawable/ic_outbox.xml | 9 +- .../src/main/res/drawable/ic_pencil.xml | 2 +- .../legacy/src/main/res/drawable/ic_plus.xml | 2 +- .../src/main/res/drawable/ic_receipt.xml | 10 ++ .../src/main/res/drawable/ic_refresh.xml | 2 +- .../src/main/res/drawable/ic_reply_all.xml | 2 +- .../src/main/res/drawable/ic_select_all.xml | 2 +- .../legacy/src/main/res/drawable/ic_send.xml | 2 +- .../legacy/src/main/res/drawable/ic_sort.xml | 2 +- .../legacy/src/main/res/drawable/ic_star.xml | 16 +-- .../src/main/res/drawable/ic_star_border.xml | 6 +- .../src/main/res/drawable/ic_trash_can.xml | 2 +- .../res/layout/custom_profile_drawer_item.xml | 105 +++++++++++++++ .../src/main/res/layout/message_list_item.xml | 4 +- .../main/res/layout/message_view_header.xml | 4 +- 40 files changed, 277 insertions(+), 143 deletions(-) create mode 100644 app/ui/base/src/main/res/drawable/ic_close.xml create mode 100644 app/ui/legacy/src/main/res/drawable/ic_receipt.xml create mode 100644 app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml index 1a3da0b4b8..283958e762 100644 --- a/app/k9mail/src/main/res/values/themes.xml +++ b/app/k9mail/src/main/res/values/themes.xml @@ -24,45 +24,45 @@ @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 - @lineageos.platform:drawable/ic_archive + @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 - @lineageos.platform:drawable/ic_bin - @lineageos.platform:drawable/ic_attachment - @lineageos.platform:drawable/ic_archive - @lineageos.platform:drawable/ic_pen - @lineageos.platform:drawable/ic_bin - @lineageos.platform:drawable/ic_folder + @drawable/ic_send + @drawable/ic_alert_octagon + @drawable/ic_trash_can + @drawable/ic_attachment + @drawable/ic_archive + @drawable/ic_pencil + @drawable/ic_trash_can + @drawable/ic_folder @drawable/ic_content_copy - @lineageos.platform:drawable/ic_chevron_right - @lineageos.platform:drawable/ic_chevron_right - @lineageos.platform:drawable/ic_back + @drawable/ic_chevron_right + @drawable/ic_chevron_right + @drawable/ic_chevron_left @drawable/ic_refresh - @lineageos.platform:drawable/ic_search + @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 - @lineageos.platform:drawable/ic_star_filled - @lineageos.platform:drawable/ic_star + @drawable/ic_alert_octagon + @drawable/ic_star + @drawable/ic_star_border @drawable/ic_opened_envelope - @lineageos.platform:drawable/ic_envelope + @drawable/ic_envelope @drawable/ic_magnify_cloud - @lineageos.platform:drawable/ic_add + @drawable/ic_plus @drawable/ic_arrow_up_down @drawable/ic_file_upload @drawable/ic_select_all @drawable/ic_floppy - @lineageos.platform:drawable/ic_downloads - @lineageos.platform:drawable/ic_cancel - @drawable/ic_action_request_read_receipt_light + @drawable/ic_download + @drawable/ic_clear + @drawable/ic_receipt @drawable/ic_chevron_down @drawable/ic_chevron_up @drawable/ic_tv @@ -71,14 +71,14 @@ @drawable/ic_arrow_up_down @drawable/ic_shield @drawable/ic_bug - @lineageos.platform:drawable/ic_folder + @drawable/ic_folder @lineageos.platform:drawable/ic_search @drawable/ic_preferences_crypto @drawable/ic_preferences_check_mail @drawable/ic_opened_envelope - @lineageos.platform:drawable/ic_pen + @drawable/ic_pencil @lineageos.platform:drawable/ic_info - @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_cog @lineageos.platform:drawable/ic_envelope @lineageos.platform:drawable/ic_add @drawable/ic_export @@ -95,7 +95,7 @@ @color/color_default_secondary_text @color/color_default_divider @color/default_icon_color - @lineageos.platform:drawable/ic_attachment + @drawable/ic_attachment @drawable/ic_messagelist_answered @drawable/ic_messagelist_forwarded @drawable/ic_messagelist_answered_forwarded @@ -150,45 +150,45 @@ @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 - @lineageos.platform:drawable/ic_archive + @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 - @lineageos.platform:drawable/ic_bin - @lineageos.platform:drawable/ic_attachment - @lineageos.platform:drawable/ic_archive - @lineageos.platform:drawable/ic_pen - @lineageos.platform:drawable/ic_bin - @lineageos.platform:drawable/ic_folder + @drawable/ic_send + @drawable/ic_alert_octagon + @drawable/ic_trash_can + @drawable/ic_attachment + @drawable/ic_archive + @drawable/ic_pencil + @drawable/ic_trash_can + @drawable/ic_folder @drawable/ic_content_copy - @lineageos.platform:drawable/ic_chevron_right - @lineageos.platform:drawable/ic_chevron_right - @lineageos.platform:drawable/ic_back + @drawable/ic_chevron_right + @drawable/ic_chevron_right + @drawable/ic_chevron_left @drawable/ic_refresh - @lineageos.platform:drawable/ic_search + @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 - @lineageos.platform:drawable/ic_star_filled - @lineageos.platform:drawable/ic_star + @drawable/ic_alert_octagon + @drawable/ic_star + @drawable/ic_star_border @drawable/ic_opened_envelope - @lineageos.platform:drawable/ic_envelope + @drawable/ic_envelope @drawable/ic_magnify_cloud - @lineageos.platform:drawable/ic_add + @drawable/ic_plus @drawable/ic_arrow_up_down @drawable/ic_file_upload @drawable/ic_select_all @drawable/ic_floppy - @lineageos.platform:drawable/ic_downloads - @lineageos.platform:drawable/ic_cancel - @drawable/ic_action_request_read_receipt_light + @drawable/ic_download + @drawable/ic_clear + @drawable/ic_receipt @drawable/ic_chevron_down @drawable/ic_chevron_up @drawable/ic_tv @@ -197,16 +197,16 @@ @drawable/ic_arrow_up_down @drawable/ic_shield @drawable/ic_bug - @lineageos.platform:drawable/ic_folder + @drawable/ic_folder @lineageos.platform:drawable/ic_search @drawable/ic_preferences_crypto @drawable/ic_preferences_check_mail @drawable/ic_opened_envelope - @lineageos.platform:drawable/ic_pen + @drawable/ic_pencil @lineageos.platform:drawable/ic_info - @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_cog @lineageos.platform:drawable/ic_envelope - @lineageos.platform:drawable/ic_add + @drawable/ic_plus @drawable/ic_export @drawable/ic_import @drawable/ic_import_status @@ -221,7 +221,7 @@ @color/color_default_secondary_text @color/color_default_divider #bbbbbb - @lineageos.platform:drawable/ic_attachment + @drawable/ic_attachment @drawable/ic_messagelist_answered @drawable/ic_messagelist_forwarded @drawable/ic_messagelist_answered_forwarded diff --git a/app/ui/base/src/main/res/drawable/ic_close.xml b/app/ui/base/src/main/res/drawable/ic_close.xml new file mode 100644 index 0000000000..d27860f95a --- /dev/null +++ b/app/ui/base/src/main/res/drawable/ic_close.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/base/src/main/res/values/styles.xml b/app/ui/base/src/main/res/values/styles.xml index 808e7c55ee..8f10a9b80f 100644 --- a/app/ui/base/src/main/res/values/styles.xml +++ b/app/ui/base/src/main/res/values/styles.xml @@ -4,5 +4,6 @@ @color/default_icon_color @color/color_default_accent @color/color_default_primary_dark + @drawable/ic_close \ No newline at end of file diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt index fdbd3c50c4..e8b735d878 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt @@ -11,6 +11,7 @@ import android.view.View import android.widget.ImageView import android.widget.LinearLayout import android.widget.Toast +import androidx.annotation.LayoutRes import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat @@ -268,7 +269,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K val drawerColors = getDrawerColorsForAccount(account) val selectedTextColor = drawerColors.accentColor.toSelectedColorStateList() - val accountItem = ProfileDrawerItem().apply { + val accountItem = CustomProfileDrawerItem().apply { isNameShown = true nameText = account.description ?: "" descriptionText = account.email @@ -374,7 +375,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K folderList.unifiedInbox?.let { unifiedInbox -> val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, R.drawable.ic_inbox_multiple) val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!) - DrawableCompat.setTint(wrappedSelectedDrawable, ContextCompat.getColor(parent.applicationContext, R.color.color_default_accent)) + DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor) val unifiedInboxItem = FolderDrawerItem().apply { iconRes = R.drawable.ic_inbox_multiple //getResId(R.attr.iconUnifiedInbox) @@ -406,7 +407,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K val iconId = folderIconProvider.getFolderIcon(folder.type) val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, iconId) val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!) - DrawableCompat.setTint(wrappedSelectedDrawable, ContextCompat.getColor(parent.applicationContext, R.color.color_default_accent)) + DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor) val drawerItem = FolderDrawerItem().apply { iconRes = iconId @@ -479,9 +480,14 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K ) private fun getDrawerColorsForAccount(account: Account): DrawerColors { + val baseColor = if (themeManager.appTheme == Theme.DARK) { + getDarkThemeAccentColor(account.chipColor) + } else { + account.chipColor + } return DrawerColors( - accentColor = ResourcesCompat.getColor(resources, R.color.color_default_accent, null), - selectedColor = ResourcesCompat.getColor(resources, R.color.color_selected_background, null) + accentColor = baseColor, + selectedColor = baseColor.and(0xffffff).or(0x22000000) ) } @@ -574,3 +580,9 @@ private class FolderDrawerItem : PrimaryDrawerItem() { override val type: Int = R.id.drawer_list_folder_item override val layoutRes: Int = R.layout.drawer_folder_list_item } + +private class CustomProfileDrawerItem : ProfileDrawerItem() { + override val layoutRes: Int + @LayoutRes + get() = R.layout.custom_profile_drawer_item +} diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt index f7e57b5f53..bb9f6f48dd 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt @@ -105,8 +105,6 @@ class SettingsListFragment : Fragment(), ItemTouchCallback { navigationAction = R.id.action_settingsListScreen_to_addAccountScreen, icon = R.attr.iconSettingsAccountAdd ) - - NewSetupUiHack.addAction(this) } addSection(title = getString(R.string.settings_list_backup_category)) { 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 ec074e7b39..a10a748180 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,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M15.73,3L8.27,3L3,8.27v7.46L8.27,21h7.46L21,15.73L21,8.27L15.73,3zM12,17.3c-0.72,0 -1.3,-0.58 -1.3,-1.3 0,-0.72 0.58,-1.3 1.3,-1.3 0.72,0 1.3,0.58 1.3,1.3 0,0.72 -0.58,1.3 -1.3,1.3zM13,13h-2L11,7h2v6z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive.xml b/app/ui/legacy/src/main/res/drawable/ic_archive.xml index 6346854890..d10611f07c 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_archive.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_archive.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml b/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml index eea04380f6..a6f23b1751 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_attachment.xml b/app/ui/legacy/src/main/res/drawable/ic_attachment.xml index d868f68ebd..0deb708fff 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_attachment.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_attachment.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml index e2422205a0..4ab5ce0877 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml index 9856b389aa..a6dc718435 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml index 82255625e8..0774c54dbb 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml index 378e777e4e..06869a9ea0 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_clear.xml b/app/ui/legacy/src/main/res/drawable/ic_clear.xml index 0c78f75565..2c8655466b 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_clear.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_clear.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/> 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 7f4df888cc..e9c598c1d0 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:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml b/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml index 62845fcfb6..501ed4040a 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_download.xml b/app/ui/legacy/src/main/res/drawable/ic_download.xml index 138b22742e..d15cd4d397 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_download.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_download.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M5,20h14v-2H5V20zM19,9h-4V3H9v6H5l7,7L19,9z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_envelope.xml b/app/ui/legacy/src/main/res/drawable/ic_envelope.xml index 715e73e225..07e1b98fba 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_envelope.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_envelope.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M22,8.98V18c0,1.1 -0.9,2 -2,2H4c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10.1C14.04,4.32 14,4.66 14,5c0,1.48 0.65,2.79 1.67,3.71L12,11L4,6v2l8,5l5.3,-3.32C17.84,9.88 18.4,10 19,10C20.13,10 21.16,9.61 22,8.98zM16,5c0,1.66 1.34,3 3,3s3,-1.34 3,-3s-1.34,-3 -3,-3S16,3.34 16,5z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml b/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml index d9883cd1a8..8c6788df95 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_floppy.xml b/app/ui/legacy/src/main/res/drawable/ic_floppy.xml index cc97c00277..64085c5801 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_floppy.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_floppy.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/> 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 d5dedb08af..0a2b1a23a5 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/> 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 a40eb0c9c5..82d62d1a4f 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/> 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 9b8482c815..cdfc0666d4 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:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,9h-4c0,1.62 -1.38,3 -3,3s-3,-1.38 -3,-3L5,9L5,5h14v4zM15,16h6v3c0,1.1 -0.9,2 -2,2L5,21c-1.1,0 -2,-0.9 -2,-2v-3h6c0,1.66 1.34,3 3,3s3,-1.34 3,-3z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml index 7f4449a748..648c7f55cb 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml b/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml index 2d2b1557d1..f82901fac5 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml @@ -2,9 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24"> + android:pathData="M12,19c0,-3.87 3.13,-7 7,-7c1.08,0 2.09,0.25 3,0.68V6c0,-1.1 -0.9,-2 -2,-2H4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h8.08C12.03,19.67 12,19.34 12,19zM4,6l8,5l8,-5v2l-8,5L4,8V6zM17.34,22l-3.54,-3.54l1.41,-1.41l2.12,2.12l4.24,-4.24L23,16.34L17.34,22z"/> 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 85f3386b64..47a9b9f760 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml @@ -1,12 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> - + android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.9 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10zM8,11h2v3h4v-3h2l-4,-4 -4,4z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_pencil.xml b/app/ui/legacy/src/main/res/drawable/ic_pencil.xml index 551d96ea01..7ffffe5f3b 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_pencil.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_pencil.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_plus.xml b/app/ui/legacy/src/main/res/drawable/ic_plus.xml index 035965ddeb..a6974cf515 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_plus.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_plus.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_receipt.xml b/app/ui/legacy/src/main/res/drawable/ic_receipt.xml new file mode 100644 index 0000000000..83bcd40897 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_receipt.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_refresh.xml b/app/ui/legacy/src/main/res/drawable/ic_refresh.xml index 93870b19bf..c8e5a8175e 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_refresh.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_refresh.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml b/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml index e573ed2e0b..c0f13570ff 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M7,8L7,5l-7,7 7,7v-3l-4,-4 4,-4zM13,9L13,5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_select_all.xml b/app/ui/legacy/src/main/res/drawable/ic_select_all.xml index ce914598d8..9ed60d005f 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_select_all.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_select_all.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/> 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 6755e765f4..aa4a1bfa94 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_send.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_sort.xml b/app/ui/legacy/src/main/res/drawable/ic_sort.xml index 8e5e3f71ab..bd0e789631 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_sort.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_sort.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_star.xml b/app/ui/legacy/src/main/res/drawable/ic_star.xml index 7bd436f286..71c9c883e3 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_star.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_star.xml @@ -1,10 +1,10 @@ - +android:width="24dp" +android:height="24dp" +android:viewportWidth="24" +android:viewportHeight="24" +android:tint="?attr/messageStarColor"> + diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_border.xml b/app/ui/legacy/src/main/res/drawable/ic_star_border.xml index 84549a9dd8..91b67b6b73 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_star_border.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_star_border.xml @@ -1,9 +1,9 @@ + android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/> diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml index e0ae94b996..3e07144760 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> diff --git a/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml new file mode 100644 index 0000000000..d2f5c98ebb --- /dev/null +++ b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml index fabbacbb8d..8c79449b35 100644 --- a/app/ui/legacy/src/main/res/layout/message_list_item.xml +++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml @@ -78,9 +78,9 @@ android:layout_height="wrap_content" android:layout_marginStart="3dp" android:layout_marginTop="5dp" - android:paddingRight="3dp" + android:paddingRight="5dp" android:paddingBottom="3dp" - android:paddingLeft="3dp" + android:paddingLeft="5dp" android:paddingTop="4dp" android:focusable="false" tools:text="3" /> 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 11c3c4ce93..53a076f3e8 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 @@ -4,6 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/header_container" + android:background="@color/color_default_background" android:layout_width="match_parent" android:orientation="vertical" android:layout_height="wrap_content"> @@ -18,7 +19,8 @@ android:id="@+id/chip" android:layout_width="8dip" android:layout_height="match_parent" - tools:background="#FF1976D2" /> + tools:background="#FF1976D2" + android:visibility="gone"/> Date: Fri, 4 Mar 2022 20:38:47 +0600 Subject: [PATCH 2/2] Use material icons for action icons --- app/k9mail/src/main/res/values/themes.xml | 102 +++++++++--------- .../src/main/res/drawable/ic_archive.xml | 13 ++- .../src/main/res/drawable/ic_envelope.xml | 10 +- .../src/main/res/drawable/ic_magnify.xml | 11 +- .../main/res/drawable/ic_opened_envelope.xml | 5 +- .../src/main/res/drawable/ic_pencil.xml | 10 +- .../src/main/res/drawable/ic_trash_can.xml | 10 +- 7 files changed, 83 insertions(+), 78 deletions(-) diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml index 283958e762..4b6a14a27c 100644 --- a/app/k9mail/src/main/res/values/themes.xml +++ b/app/k9mail/src/main/res/values/themes.xml @@ -24,45 +24,45 @@ @style/PreferenceThemeOverlay @lineageos.platform:drawable/ic_hamburger - @drawable/ic_inbox_multiple - @drawable/ic_folder - @drawable/ic_inbox - @drawable/ic_outbox + @lineageos.platform:drawable/ic_unified_inbox + @lineageos.platform:drawable/ic_folder + @lineageos.platform:drawable/ic_inbox + @lineageos.platform:drawable/ic_outbox @drawable/ic_archive @lineageos.platform:drawable/ic_file - @drawable/ic_send - @drawable/ic_alert_octagon + @lineageos.platform:drawable/ic_send + @lineageos.platform:drawable/ic_mail_spam @drawable/ic_trash_can - @drawable/ic_attachment + @lineageos.platform:drawable/ic_attachment @drawable/ic_archive @drawable/ic_pencil @drawable/ic_trash_can - @drawable/ic_folder + @lineageos.platform:drawable/ic_folder @drawable/ic_content_copy - @drawable/ic_chevron_right - @drawable/ic_chevron_right - @drawable/ic_chevron_left + @lineageos.platform:drawable/ic_chevron_right + @lineageos.platform:drawable/ic_chevron_right + @lineageos.platform:drawable/ic_back @drawable/ic_refresh @drawable/ic_magnify @drawable/ic_folder_magnify - @drawable/ic_send - @drawable/ic_cog + @lineageos.platform:drawable/ic_send + @lineageos.platform:drawable/ic_settings_wheel @drawable/ic_reply_all @drawable/ic_sort - @drawable/ic_alert_octagon - @drawable/ic_star - @drawable/ic_star_border + @lineageos.platform:drawable/ic_mail_spam + @lineageos.platform:drawable/ic_star_filled + @lineageos.platform:drawable/ic_star @drawable/ic_opened_envelope @drawable/ic_envelope @drawable/ic_magnify_cloud - @drawable/ic_plus + @lineageos.platform:drawable/ic_add @drawable/ic_arrow_up_down @drawable/ic_file_upload @drawable/ic_select_all @drawable/ic_floppy - @drawable/ic_download - @drawable/ic_clear - @drawable/ic_receipt + @lineageos.platform:drawable/ic_downloads + @lineageos.platform:drawable/ic_cancel + @drawable/ic_action_request_read_receipt_light @drawable/ic_chevron_down @drawable/ic_chevron_up @drawable/ic_tv @@ -71,15 +71,15 @@ @drawable/ic_arrow_up_down @drawable/ic_shield @drawable/ic_bug - @drawable/ic_folder - @lineageos.platform:drawable/ic_search + @lineageos.platform: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 - @drawable/ic_cog - @lineageos.platform:drawable/ic_envelope + @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_envelope @lineageos.platform:drawable/ic_add @drawable/ic_export @drawable/ic_import @@ -95,7 +95,7 @@ @color/color_default_secondary_text @color/color_default_divider @color/default_icon_color - @drawable/ic_attachment + @lineageos.platform:drawable/ic_attachment @drawable/ic_messagelist_answered @drawable/ic_messagelist_forwarded @drawable/ic_messagelist_answered_forwarded @@ -150,45 +150,45 @@ @style/PreferenceThemeOverlay @lineageos.platform:drawable/ic_hamburger - @drawable/ic_inbox_multiple - @drawable/ic_folder - @drawable/ic_inbox - @drawable/ic_outbox + @lineageos.platform:drawable/ic_unified_inbox + @lineageos.platform:drawable/ic_folder + @lineageos.platform:drawable/ic_inbox + @lineageos.platform:drawable/ic_outbox @drawable/ic_archive @lineageos.platform:drawable/ic_file - @drawable/ic_send - @drawable/ic_alert_octagon + @lineageos.platform:drawable/ic_send + @lineageos.platform:drawable/ic_mail_spam @drawable/ic_trash_can - @drawable/ic_attachment + @lineageos.platform:drawable/ic_attachment @drawable/ic_archive @drawable/ic_pencil @drawable/ic_trash_can - @drawable/ic_folder + @lineageos.platform:drawable/ic_folder @drawable/ic_content_copy - @drawable/ic_chevron_right - @drawable/ic_chevron_right - @drawable/ic_chevron_left + @lineageos.platform:drawable/ic_chevron_right + @lineageos.platform:drawable/ic_chevron_right + @lineageos.platform:drawable/ic_back @drawable/ic_refresh @drawable/ic_magnify @drawable/ic_folder_magnify - @drawable/ic_send - @drawable/ic_cog + @lineageos.platform:drawable/ic_send + @lineageos.platform:drawable/ic_settings_wheel @drawable/ic_reply_all @drawable/ic_sort - @drawable/ic_alert_octagon - @drawable/ic_star - @drawable/ic_star_border + @lineageos.platform:drawable/ic_mail_spam + @lineageos.platform:drawable/ic_star_filled + @lineageos.platform:drawable/ic_star @drawable/ic_opened_envelope @drawable/ic_envelope @drawable/ic_magnify_cloud - @drawable/ic_plus + @lineageos.platform:drawable/ic_add @drawable/ic_arrow_up_down @drawable/ic_file_upload @drawable/ic_select_all @drawable/ic_floppy - @drawable/ic_download - @drawable/ic_clear - @drawable/ic_receipt + @lineageos.platform:drawable/ic_downloads + @lineageos.platform:drawable/ic_cancel + @drawable/ic_action_request_read_receipt_light @drawable/ic_chevron_down @drawable/ic_chevron_up @drawable/ic_tv @@ -197,16 +197,16 @@ @drawable/ic_arrow_up_down @drawable/ic_shield @drawable/ic_bug - @drawable/ic_folder - @lineageos.platform:drawable/ic_search + @lineageos.platform: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 - @drawable/ic_cog - @lineageos.platform:drawable/ic_envelope - @drawable/ic_plus + @lineageos.platform:drawable/ic_settings_wheel + @drawable/ic_envelope + @lineageos.platform:drawable/ic_add @drawable/ic_export @drawable/ic_import @drawable/ic_import_status @@ -221,7 +221,7 @@ @color/color_default_secondary_text @color/color_default_divider #bbbbbb - @drawable/ic_attachment + @lineageos.platform:drawable/ic_attachment @drawable/ic_messagelist_answered @drawable/ic_messagelist_forwarded @drawable/ic_messagelist_answered_forwarded diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive.xml b/app/ui/legacy/src/main/res/drawable/ic_archive.xml index d10611f07c..52e4a2c3d7 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_archive.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_archive.xml @@ -1,9 +1,12 @@ + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20"> + android:pathData="M18,0H2C1,0 0,0.9 0,2V5.01C0,5.73 0.43,6.35 1,6.7V18C1,19.1 2.1,20 3,20H17C17.9,20 19,19.1 19,18V6.7C19.57,6.35 20,5.73 20,5.01V2C20,0.9 19,0 18,0ZM17,18H3V7H17V18ZM18,5H2V2H18V5Z" /> + diff --git a/app/ui/legacy/src/main/res/drawable/ic_envelope.xml b/app/ui/legacy/src/main/res/drawable/ic_envelope.xml index 07e1b98fba..a73e24c519 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_envelope.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_envelope.xml @@ -1,9 +1,9 @@ + android:width="20dp" + android:height="16dp" + android:viewportWidth="20" + android:viewportHeight="16"> + android:pathData="M18,0H2C0.9,0 0.01,0.9 0.01,2L0,14C0,15.1 0.9,16 2,16H18C19.1,16 20,15.1 20,14V2C20,0.9 19.1,0 18,0ZM18,14H2V4L10,9L18,4V14ZM10,7L2,2H18L10,7Z" /> diff --git a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml index 648c7f55cb..5e56103f62 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml @@ -1,9 +1,10 @@ + android:width="18dp" + android:height="18dp" + android:viewportWidth="18" + android:viewportHeight="18"> + android:pathData="M12.7549,11.2549H11.9649L11.6849,10.9849C12.6649,9.8449 13.2549,8.3649 13.2549,6.7549C13.2549,3.1649 10.3449,0.2549 6.7549,0.2549C3.1649,0.2549 0.2549,3.1649 0.2549,6.7549C0.2549,10.3449 3.1649,13.2549 6.7549,13.2549C8.3649,13.2549 9.8449,12.6649 10.9849,11.6849L11.2549,11.9649V12.7549L16.2549,17.7449L17.7449,16.2549L12.7549,11.2549ZM6.7549,11.2549C4.2649,11.2549 2.2549,9.2449 2.2549,6.7549C2.2549,4.2649 4.2649,2.2549 6.7549,2.2549C9.2449,2.2549 11.2549,4.2649 11.2549,6.7549C11.2549,9.2449 9.2449,11.2549 6.7549,11.2549Z" /> + diff --git a/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml b/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml index f82901fac5..2d2b1557d1 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> + android:pathData="M4,8L12,13L20,8V8L12,3L4,8V8M22,8V18A2,2 0,0 1,20 20H4A2,2 0,0 1,2 18V8C2,7.27 2.39,6.64 2.97,6.29L12,0.64L21.03,6.29C21.61,6.64 22,7.27 22,8Z" /> diff --git a/app/ui/legacy/src/main/res/drawable/ic_pencil.xml b/app/ui/legacy/src/main/res/drawable/ic_pencil.xml index 7ffffe5f3b..b8a355eb03 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_pencil.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_pencil.xml @@ -1,9 +1,9 @@ + android:width="19dp" + android:height="18dp" + android:viewportWidth="19" + android:viewportHeight="18"> + android:pathData="M11.059,6.02L11.979,6.94L2.919,16H1.999V15.08L11.059,6.02ZM14.659,0C14.409,0 14.149,0.1 13.959,0.29L12.129,2.12L15.879,5.87L17.709,4.04C18.099,3.65 18.099,3.02 17.709,2.63L15.369,0.29C15.169,0.09 14.919,0 14.659,0ZM11.059,3.19L-0.001,14.25V18H3.749L14.809,6.94L11.059,3.19Z" /> diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml index 3e07144760..4be2916631 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml @@ -1,9 +1,9 @@ + android:width="14dp" + android:height="18dp" + android:viewportWidth="14" + android:viewportHeight="18"> + android:pathData="M11,6V16H3V6H11ZM9.5,0H4.5L3.5,1H0V3H14V1H10.5L9.5,0ZM13,4H1V16C1,17.1 1.9,18 3,18H11C12.1,18 13,17.1 13,16V4Z" /> -- GitLab