Update/fix notification icons

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

@@ -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 iconSendingMail: Int = R.drawable.notification_icon_check_mail
-    override val iconCheckingMail: Int = R.drawable.ic_notify_check_mail
+    override val iconCheckingMail: Int = R.drawable.notification_icon_check_mail
-    override val wearIconMarkAsRead: Int = R.drawable.ic_opened_envelope
+    override val wearIconMarkAsRead: Int = R.drawable.notification_action_mark_as_read
-    override val wearIconDelete: Int = R.drawable.ic_trash_can
+    override val wearIconDelete: Int = R.drawable.notification_action_delete
-    override val wearIconArchive: Int = R.drawable.ic_archive
+    override val wearIconArchive: Int = R.drawable.notification_action_archive
-    override val wearIconReplyAll: Int = R.drawable.ic_reply_all
+    override val wearIconReplyAll: Int = R.drawable.notification_action_reply
-    override val wearIconMarkAsSpam: Int = R.drawable.ic_alert_octagon
+    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

@@ -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 iconSendingMail: Int = R.drawable.notification_icon_check_mail
-    override val iconCheckingMail: Int = R.drawable.ic_notify_check_mail
+    override val iconCheckingMail: Int = R.drawable.notification_icon_check_mail
-    override val wearIconMarkAsRead: Int = R.drawable.ic_opened_envelope
+    override val wearIconMarkAsRead: Int = R.drawable.notification_action_mark_as_read
-    override val wearIconDelete: Int = R.drawable.ic_trash_can
+    override val wearIconDelete: Int = R.drawable.notification_action_delete
-    override val wearIconArchive: Int = R.drawable.ic_archive
+    override val wearIconArchive: Int = R.drawable.notification_action_archive
-    override val wearIconReplyAll: Int = R.drawable.ic_reply_all
+    override val wearIconReplyAll: Int = R.drawable.notification_action_reply
-    override val wearIconMarkAsSpam: Int = R.drawable.ic_alert_octagon
+    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/ui/legacy/src/main/res/drawable-anydpi/notification_action_delete.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:pathData="M17.5,10.156L17,19.313c0,0-2.281,1.469-5,1.469S7,19.25,7,19.25l-0.5-9.094c0,0,2.969,0.938,5.5,0.938 S17.5,10.156,17.5,10.156z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-    <path
-        android:pathData="M14.479,6.17V3.844H9.521V6.17C7.428,6.469,5.969,7.133,5.969,7.906c0,1.053,2.7,1.906,6.031,1.906 s6.031-0.854,6.031-1.906C18.031,7.133,16.572,6.469,14.479,6.17z M10.306,6.078V4.656h3.375v1.42C13.146,6.027,12.584,6,12,6 C11.411,6,10.844,6.028,10.306,6.078z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-</vector>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:pathData="M3,11L3 7.612 12 3.338 21 7.612 21 11 19 11 19 9 4 9 4 11 z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-    <path
-        android:pathData="M10.212,14.612a1.788,1.788 0 1,0 3.576,0a1.788,1.788 0 1,0 -3.576,0"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-    <path
-        android:pathData="M14.646,14.966c-0.175,1.313-1.287,2.329-2.646,2.329c-1.36,0-2.472-1.017-2.646-2.329L3,11.612V21h18 v-9.388L14.646,14.966z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-</vector>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:pathData="M17.938,10C15.168,10,14,10,14,10v4c0,0,1.843,0,2.939,0c1.18,0,2.078,1.338,2.5,3.18l3.49-1.888	C22.93,15.292,21.133,10,17.938,10z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-    <path
-        android:pathData="M14,4.791L6.825 12.005 14 19.208 z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-    <path
-        android:pathData="M2.825,12.005L9 19.208 9 15.09 5.938 12 9 8.91 9 4.791 z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.8" />
-</vector>

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:pathData="M1,8.655v11.508h22V8.655l-11,5.47L1,8.655z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M1,3.837v3.062l11,5.467l11-5.467V3.837H1z"
-        android:fillColor="#ffffff" />
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
-</vector>

app/ui/legacy/src/main/res/drawable/ic_notify_check_mail.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:oneshot="false" >
-
-    <item
-        android:drawable="@drawable/ic_notify_check_mail_anim_0"
-        android:duration="100"/>
-    <item
-        android:drawable="@drawable/ic_notify_check_mail_anim_1"
-        android:duration="100"/>
-    <item
-        android:drawable="@drawable/ic_notify_check_mail_anim_2"
-        android:duration="100"/>
-    <item
-        android:drawable="@drawable/ic_notify_check_mail_anim_3"
-        android:duration="100"/>
-    <item
-        android:drawable="@drawable/ic_notify_check_mail_anim_4"
-        android:duration="100"/>
-    <item
-        android:drawable="@drawable/ic_notify_check_mail_anim_5"
-        android:duration="100"/>
-
-</animation-list>

app/ui/legacy/src/main/res/drawable/notification_action_archive.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@android:color/white"
+        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" />
+</vector>

app/ui/legacy/src/main/res/drawable/notification_action_delete.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        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" />
+</vector>

app/ui/legacy/src/main/res/drawable/notification_action_mark_as_read.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        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" />
+</vector>

app/ui/legacy/src/main/res/drawable/notification_action_mark_as_spam.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@android:color/white"
+        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" />
+</vector>

app/ui/legacy/src/main/res/drawable/notification_action_reply.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        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" />
+</vector>

app/ui/legacy/src/main/res/drawable/notification_icon_check_mail.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false" >
+
+    <item
+        android:drawable="@drawable/notification_icon_check_mail_anim_0"
+        android:duration="100"/>
+    <item
+        android:drawable="@drawable/notification_icon_check_mail_anim_1"
+        android:duration="100"/>
+    <item
+        android:drawable="@drawable/notification_icon_check_mail_anim_2"
+        android:duration="100"/>
+    <item
+        android:drawable="@drawable/notification_icon_check_mail_anim_3"
+        android:duration="100"/>
+    <item
+        android:drawable="@drawable/notification_icon_check_mail_anim_4"
+        android:duration="100"/>
+    <item
+        android:drawable="@drawable/notification_icon_check_mail_anim_5"
+        android:duration="100"/>
+
+</animation-list>

app/ui/legacy/src/main/res/drawable/notification_icon_new_mail.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
+</vector>

app/ui/legacy/src/main/res/drawable/notification_icon_warning.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
+</vector>