Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36f568be authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '5181-Mail_UI_improvement-part02' into 'main' 

5181-Mail_UI_improvement-part02

See merge request !71
parents 47f67b26 cd530170

app/k9mail-jmap/src/main/res/values/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>

        <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>

        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageStarColor">#EB621E</item>

        <item name="messageStarColor">#FFC300</item>

        <item name="messageViewBackgroundColor">#ffffffff</item>

        <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>

        <item name="attachmentCardBackground">#e8e8e8</item>
@@ -212,7 +212,7 @@ 
        <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>

        <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>

        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageStarColor">#EB621E</item>

        <item name="messageStarColor">#FFC300</item>

        <item name="messageViewBackgroundColor">#000000</item>

        <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>

        <item name="attachmentCardBackground">#313131</item>

app/k9mail/src/main/res/values-night/colors.xml

+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <color name="color_default_background">#121212</color>

    <color name="color_message_list_unread_background">#2F2F2F</color>

    <color name="color_message_list_thread_count_background">#61FFFFFF</color>

    <color name="color_default_primary_text">#DEFFFFFF</color>

    <color name="color_default_secondary_text">#99FFFFFF</color>

    <color name="color_default_ternary_text">#61FFFFFF</color>



    <color name="color_dialog_backgronund">#383838</color>

</resources>
 
 No newline at end of file

app/k9mail/src/main/res/values/colors.xml

+5 −3
Original line number Diff line number Diff line
@@ -3,10 +3,11 @@ 
    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>

    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>

    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>

    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>

    <color name="color_default_background">@android:color/white</color>

    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>

    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>

    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>

    <color name="color_default_primary_text">#DE000000</color>

    <color name="color_default_secondary_text">#99000000</color>

    <color name="color_default_ternary_text">#61000000</color>

    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>

    <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>

    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
@@ -14,4 +15,5 @@ 
    <color name="color_message_list_selected_background">@lineageos.platform:color/color_default_selector_background</color>

    <color name="color_message_list_unread_background">#DCDCDC</color>

    <color name="color_message_list_thread_count_background">#61000000</color>

    <color name="color_dialog_backgronund">@android:color/white</color>

</resources>
 
 No newline at end of file

app/k9mail/src/main/res/values/themes.xml

+36 −26
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 
    <style name="Theme.K9.Startup" parent="Theme.K9.Common">

    </style>



    <style name="Theme.k9.Dialog.Base" parent="Theme.MaterialComponents.Dialog.Alert">

        <item name="android:windowBackground">@color/color_dialog_backgronund</item>

        <item name="android:colorAccent">@color/color_default_accent</item>

        <item name="android:textColorPrimary">@color/color_default_primary_text</item>

        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>

    </style>



    <!-- Empty base themes that can be easily replaced by RRO (Runtime Resource Overlay) themes -->

    <style name="Theme.K9.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge" />
@@ -21,9 +28,11 @@ 
        <item name="colorAccent">@color/color_default_accent</item>

        <item name="android:textColorPrimary">@color/color_default_primary_text</item>

        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>

        <item name="android:textCursorDrawable">@drawable/edittext_cursor</item>

        <item name="android:alertDialogTheme">@style/Theme.k9.Dialog.Base</item>



        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>

        <item name="iconMenu">@lineageos.platform:drawable/ic_hamburger</item>

        <item name="iconMenu">@drawable/ic_hamburger</item>

        <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>

        <item name="iconFolder">@drawable/ic_folder</item>

        <item name="iconFolderInbox">@drawable/ic_inbox</item>
@@ -39,9 +48,9 @@ 
        <item name="iconActionDelete">@drawable/ic_trash_can</item>

        <item name="iconActionMove">@drawable/ic_folder</item>

        <item name="iconActionCopy">@drawable/ic_content_copy</item>

        <item name="iconActionNextStatus">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionNextMessage">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionPreviousMessage">@lineageos.platform:drawable/ic_back</item>

        <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>

        <item name="iconActionNextMessage">@drawable/ic_chevron_right</item>

        <item name="iconActionPreviousMessage">@drawable/ic_chevron_left</item>

        <item name="iconActionRefresh">@drawable/ic_refresh</item>

        <item name="iconActionSearch">@drawable/ic_magnify</item>

        <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
@@ -50,24 +59,24 @@ 
        <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>

        <item name="iconActionSort">@drawable/ic_sort</item>

        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>

        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionFlag">@drawable/ic_star</item>

        <item name="iconActionUnflag">@drawable/ic_star_border</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionAdd">@drawable/ic_plus</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>

        <item name="iconActionUpload">@drawable/ic_file_upload</item>

        <item name="iconActionSelectAll">@drawable/ic_select_all</item>

        <item name="iconActionSave">@drawable/ic_floppy</item>

        <item name="iconActionSaveAttachment">@lineageos.platform:drawable/ic_downloads</item>

        <item name="iconActionCancel">@lineageos.platform:drawable/ic_cancel</item>

        <item name="iconActionSaveAttachment">@drawable/ic_download</item>

        <item name="iconActionCancel">@drawable/ic_clear</item>

        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_light</item>

        <item name="iconActionExpand">@drawable/ic_chevron_down</item>

        <item name="iconActionCollapse">@drawable/ic_chevron_up</item>

        <item name="iconPreferencesDisplay">@drawable/ic_tv</item>

        <item name="iconPreferencesInteraction">@drawable/ic_touch</item>

        <item name="iconPreferencesNotifications">@lineageos.platform:drawable/ic_notifications</item>

        <item name="iconPreferencesNotifications">@drawable/ic_notifications</item>

        <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>

        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>

        <item name="iconPreferencesDebug">@drawable/ic_bug</item>
@@ -77,10 +86,10 @@ 
        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>

        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>

        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>

        <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>

        <item name="iconSettingsAbout">@drawable/ic_info</item>

        <item name="iconSettingsGeneral">@drawable/ic_cog</item>

        <item name="iconSettingsAccount">@drawable/ic_envelope</item>

        <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconSettingsAccountAdd">@drawable/ic_plus</item>

        <item name="iconSettingsExport">@drawable/ic_export</item>

        <item name="iconSettingsImport">@drawable/ic_import</item>

        <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
@@ -110,7 +119,7 @@ 
        <item name="tintColorBulletPointNegative">#dd2222</item>

        <item name="tintColorBulletPointNeutral">#888</item>



        <item name="iconAboutVersion">@lineageos.platform:drawable/ic_info</item>

        <item name="iconAboutVersion">@drawable/ic_info</item>

        <item name="iconAboutAuthors">@drawable/ic_people</item>

        <item name="iconAboutSourceCode">@drawable/ic_code</item>

        <item name="iconAboutLicense">@drawable/ic_description</item>
@@ -149,7 +158,7 @@ 
        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>



        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>

        <item name="iconMenu">@lineageos.platform:drawable/ic_hamburger</item>

        <item name="iconMenu">@drawable/ic_hamburger</item>

        <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>

        <item name="iconFolder">@drawable/ic_folder</item>

        <item name="iconFolderInbox">@drawable/ic_inbox</item>
@@ -165,9 +174,9 @@ 
        <item name="iconActionDelete">@drawable/ic_trash_can</item>

        <item name="iconActionMove">@drawable/ic_folder</item>

        <item name="iconActionCopy">@drawable/ic_content_copy</item>

        <item name="iconActionNextStatus">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionNextMessage">@lineageos.platform:drawable/ic_chevron_right</item>

        <item name="iconActionPreviousMessage">@lineageos.platform:drawable/ic_back</item>

        <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>

        <item name="iconActionNextMessage">@drawable/ic_chevron_right</item>

        <item name="iconActionPreviousMessage">@drawable/ic_chevron_left</item>

        <item name="iconActionRefresh">@drawable/ic_refresh</item>

        <item name="iconActionSearch">@drawable/ic_magnify</item>

        <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
@@ -176,24 +185,24 @@ 
        <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>

        <item name="iconActionSort">@drawable/ic_sort</item>

        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>

        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionFlag">@drawable/ic_star</item>

        <item name="iconActionUnflag">@drawable/ic_star_border</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionAdd">@drawable/ic_plus</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>

        <item name="iconActionUpload">@drawable/ic_file_upload</item>

        <item name="iconActionSelectAll">@drawable/ic_select_all</item>

        <item name="iconActionSave">@drawable/ic_floppy</item>

        <item name="iconActionSaveAttachment">@lineageos.platform:drawable/ic_downloads</item>

        <item name="iconActionCancel">@lineageos.platform:drawable/ic_cancel</item>

        <item name="iconActionSaveAttachment">@drawable/ic_download</item>

        <item name="iconActionCancel">@drawable/ic_clear</item>

        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_light</item>

        <item name="iconActionExpand">@drawable/ic_chevron_down</item>

        <item name="iconActionCollapse">@drawable/ic_chevron_up</item>

        <item name="iconPreferencesDisplay">@drawable/ic_tv</item>

        <item name="iconPreferencesInteraction">@drawable/ic_touch</item>

        <item name="iconPreferencesNotifications">@lineageos.platform:drawable/ic_notifications</item>

        <item name="iconPreferencesNotifications">@drawable/ic_notifications</item>

        <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>

        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>

        <item name="iconPreferencesDebug">@drawable/ic_bug</item>
@@ -203,10 +212,10 @@ 
        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>

        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>

        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>

        <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>

        <item name="iconSettingsAbout">@drawable/ic_info</item>

        <item name="iconSettingsGeneral">@drawable/ic_cog</item>

        <item name="iconSettingsAccount">@drawable/ic_envelope</item>

        <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconSettingsAccountAdd">@drawable/ic_plus</item>

        <item name="iconSettingsExport">@drawable/ic_export</item>

        <item name="iconSettingsImport">@drawable/ic_import</item>

        <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
@@ -236,7 +245,7 @@ 
        <item name="tintColorBulletPointNegative">#dd2222</item>

        <item name="tintColorBulletPointNeutral">#888</item>



        <item name="iconAboutVersion">@lineageos.platform:drawable/ic_info</item>

        <item name="iconAboutVersion">@drawable/ic_info</item>

        <item name="iconAboutAuthors">@drawable/ic_people</item>

        <item name="iconAboutSourceCode">@drawable/ic_code</item>

        <item name="iconAboutLicense">@drawable/ic_description</item>
@@ -275,6 +284,7 @@ 


    <style name="Theme.K9.DayNight" parent="Theme.K9.Common" />

    <style name="Theme.K9.Dialog.DayNight" parent="Theme.K9.Common">

        <item name="android:windowBackground">@color/color_dialog_backgronund</item>

        <item name="backgroundColorChooseAccountHeader">@color/color_default_secondary_text</item>

    </style>

    <style name="Theme.K9.Dialog.Translucent.DayNight" parent="Theme.K9.Dialog.Translucent.Common" />

app/ui/base/src/main/res/drawable/edittext_cursor.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android" >

    <size android:width="1dp" />

    <solid android:color="@color/color_default_primary_text"  />

</shape>