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

Unverified Commit c2ff696a authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #5097 from k9mail/unify_icons 

Unify icon vector drawables for dark and light themes
parents 4e314c9b fae9255b

app/k9mail-jmap/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt

+7 −7
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ class K9NotificationResourceProvider(private val context: Context) : Notificatio 
    override val iconDelete: Int = R.drawable.notification_action_delete

    override val iconReply: Int = R.drawable.notification_action_reply

    override val iconNewMail: Int = R.drawable.notification_icon_new_mail

    override val iconSendingMail: Int = R.drawable.ic_notify_check_mail

    override val iconCheckingMail: Int = R.drawable.ic_notify_check_mail

    override val wearIconMarkAsRead: Int = R.drawable.ic_opened_envelope_dark

    override val wearIconDelete: Int = R.drawable.ic_trash_can_dark

    override val wearIconArchive: Int = R.drawable.ic_archive_dark

    override val wearIconReplyAll: Int = R.drawable.ic_reply_all_dark

    override val wearIconMarkAsSpam: Int = R.drawable.ic_alert_octagon_dark

    override val iconSendingMail: Int = R.drawable.notification_icon_check_mail

    override val iconCheckingMail: Int = R.drawable.notification_icon_check_mail

    override val wearIconMarkAsRead: Int = R.drawable.notification_action_mark_as_read

    override val wearIconDelete: Int = R.drawable.notification_action_delete

    override val wearIconArchive: Int = R.drawable.notification_action_archive

    override val wearIconReplyAll: Int = R.drawable.notification_action_reply

    override val wearIconMarkAsSpam: Int = R.drawable.notification_action_mark_as_spam



    override val messagesChannelName: String

        get() = context.getString(R.string.notification_channel_messages_title)

app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt

+7 −7
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ class K9NotificationResourceProvider(private val context: Context) : Notificatio 
    override val iconDelete: Int = R.drawable.notification_action_delete

    override val iconReply: Int = R.drawable.notification_action_reply

    override val iconNewMail: Int = R.drawable.notification_icon_new_mail

    override val iconSendingMail: Int = R.drawable.ic_notify_check_mail

    override val iconCheckingMail: Int = R.drawable.ic_notify_check_mail

    override val wearIconMarkAsRead: Int = R.drawable.ic_opened_envelope_dark

    override val wearIconDelete: Int = R.drawable.ic_trash_can_dark

    override val wearIconArchive: Int = R.drawable.ic_archive_dark

    override val wearIconReplyAll: Int = R.drawable.ic_reply_all_dark

    override val wearIconMarkAsSpam: Int = R.drawable.ic_alert_octagon_dark

    override val iconSendingMail: Int = R.drawable.notification_icon_check_mail

    override val iconCheckingMail: Int = R.drawable.notification_icon_check_mail

    override val wearIconMarkAsRead: Int = R.drawable.notification_action_mark_as_read

    override val wearIconDelete: Int = R.drawable.notification_action_delete

    override val wearIconArchive: Int = R.drawable.notification_action_archive

    override val wearIconReplyAll: Int = R.drawable.notification_action_reply

    override val wearIconMarkAsSpam: Int = R.drawable.notification_action_mark_as_spam



    override val messagesChannelName: String

        get() = context.getString(R.string.notification_channel_messages_title)

app/k9mail/src/main/res/layout/message_list_widget_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
            android:background="?android:attr/selectableItemBackground"

            android:contentDescription="@string/compose_action"

            android:scaleType="center"

            android:src="@drawable/ic_envelope_dark" />

            android:src="@drawable/ic_envelope" />



    </LinearLayout>

app/ui/legacy/src/main/res/drawable-anydpi/ic_account_dark.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:height="24dp"

        android:width="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path android:fillColor="#FFFFFFFF" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />

</vector>

app/ui/legacy/src/main/res/drawable-anydpi/ic_account_light.xml

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:alpha="0.54"

        android:height="24dp"

        android:width="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path android:fillColor="#FF000000" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />

</vector>