From 7f998ecdbd93c1e0d220a1365625e3737c446d60 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 12 Dec 2021 11:14:47 -0500
Subject: [PATCH] Revert download notification icon changes

---
 .../kanade/tachiyomi/data/download/DownloadNotifier.kt   | 4 ++--
 .../tachiyomi/data/library/LibraryUpdateNotifier.kt      | 2 +-
 .../kanade/tachiyomi/data/updater/AppUpdateNotifier.kt   | 8 ++++----
 .../eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt   | 2 +-
 app/src/main/res/drawable/ic_download_24dp.xml           | 9 ---------
 5 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_download_24dp.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
index 83c2a3afb..e73acf1f1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
@@ -84,7 +84,7 @@ internal class DownloadNotifier(private val context: Context) {
     fun onProgressChange(download: Download) {
         with(progressNotificationBuilder) {
             if (!isDownloading) {
-                setSmallIcon(R.drawable.ic_photo_24dp)
+                setSmallIcon(android.R.drawable.stat_sys_download)
                 clearActions()
                 // Open download manager when clicked
                 setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
@@ -165,7 +165,7 @@ internal class DownloadNotifier(private val context: Context) {
             with(completeNotificationBuilder) {
                 setContentTitle(context.getString(R.string.download_notifier_downloader_title))
                 setContentText(context.getString(R.string.download_notifier_download_finish))
-                setSmallIcon(R.drawable.ic_download_24dp)
+                setSmallIcon(android.R.drawable.stat_sys_download_done)
                 clearActions()
                 setAutoCancel(true)
                 setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
index 3a1fa00b3..1ba931e97 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
@@ -217,7 +217,7 @@ class LibraryUpdateNotifier(private val context: Context) {
             // Only add the action when chapters is within threshold
             if (chapters.size <= Downloader.CHAPTERS_PER_SOURCE_QUEUE_WARNING_THRESHOLD) {
                 addAction(
-                    R.drawable.ic_download_24dp,
+                    android.R.drawable.stat_sys_download_done,
                     context.getString(R.string.action_download),
                     NotificationReceiver.downloadChaptersPendingBroadcast(
                         context,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt
index 7a7c533aa..d0d2a03cb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt
@@ -40,12 +40,12 @@ internal class AppUpdateNotifier(private val context: Context) {
         with(notificationBuilder) {
             setContentTitle(context.getString(R.string.update_check_notification_update_available))
             setContentText(release.version)
-            setSmallIcon(R.drawable.ic_download_24dp)
+            setSmallIcon(android.R.drawable.stat_sys_download_done)
             setContentIntent(updateIntent)
 
             clearActions()
             addAction(
-                R.drawable.ic_download_24dp,
+                android.R.drawable.stat_sys_download_done,
                 context.getString(R.string.action_download),
                 updateIntent,
             )
@@ -67,7 +67,7 @@ internal class AppUpdateNotifier(private val context: Context) {
         with(notificationBuilder) {
             title?.let { setContentTitle(title) }
             setContentText(context.getString(R.string.update_check_notification_download_in_progress))
-            setSmallIcon(R.drawable.ic_photo_24dp)
+            setSmallIcon(android.R.drawable.stat_sys_download)
             setOngoing(true)
         }
         notificationBuilder.show()
@@ -96,7 +96,7 @@ internal class AppUpdateNotifier(private val context: Context) {
         val installIntent = NotificationHandler.installApkPendingActivity(context, uri)
         with(notificationBuilder) {
             setContentText(context.getString(R.string.update_check_notification_download_complete))
-            setSmallIcon(R.drawable.ic_download_24dp)
+            setSmallIcon(android.R.drawable.stat_sys_download_done)
             setOnlyAlertOnce(false)
             setProgress(0, 0, false)
             setContentIntent(installIntent)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
index 6818031f0..98e844304 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
@@ -103,7 +103,7 @@ class SaveImageNotifier(private val context: Context) {
         with(notificationBuilder) {
             setContentTitle(context.getString(R.string.download_notifier_title_error))
             setContentText(error ?: context.getString(R.string.unknown_error))
-            setSmallIcon(R.drawable.ic_error_outline_24dp)
+            setSmallIcon(android.R.drawable.ic_menu_report_image)
         }
         updateNotification()
     }
diff --git a/app/src/main/res/drawable/ic_download_24dp.xml b/app/src/main/res/drawable/ic_download_24dp.xml
deleted file mode 100644
index 32b27d4bc..000000000
--- a/app/src/main/res/drawable/ic_download_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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/black"
-        android:pathData="M9,3v6L5,9l7,7 7,-7h-4L15,3zM19,18L5,18v2h14v-2z" />
-</vector>