yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert download notification icon changes

Browse Source
This commit is contained in:
arkon 2021-12-12 11:14:47 -05:00
parent ecd5414287
commit 7f998ecdbd
5 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
View File

@ -84,7 +84,7 @@ internal class DownloadNotifier(private val context: Context) {
fun onProgressChange(download: Download) { fun onProgressChange(download: Download) {
with(progressNotificationBuilder) { with(progressNotificationBuilder) {
if (!isDownloading) { if (!isDownloading) {
setSmallIcon(R.drawable.ic_photo_24dp) setSmallIcon(android.R.drawable.stat_sys_download)
clearActions() clearActions()
// Open download manager when clicked // Open download manager when clicked
setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
@ -165,7 +165,7 @@ internal class DownloadNotifier(private val context: Context) {
with(completeNotificationBuilder) { with(completeNotificationBuilder) {
setContentTitle(context.getString(R.string.download_notifier_downloader_title)) setContentTitle(context.getString(R.string.download_notifier_downloader_title))
setContentText(context.getString(R.string.download_notifier_download_finish)) setContentText(context.getString(R.string.download_notifier_download_finish))
setSmallIcon(R.drawable.ic_download_24dp) setSmallIcon(android.R.drawable.stat_sys_download_done)
clearActions() clearActions()
setAutoCancel(true) setAutoCancel(true)
setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))

2
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
View File

@ -217,7 +217,7 @@ class LibraryUpdateNotifier(private val context: Context) {
// Only add the action when chapters is within threshold // Only add the action when chapters is within threshold
if (chapters.size <= Downloader.CHAPTERS_PER_SOURCE_QUEUE_WARNING_THRESHOLD) { if (chapters.size <= Downloader.CHAPTERS_PER_SOURCE_QUEUE_WARNING_THRESHOLD) {
addAction( addAction(
R.drawable.ic_download_24dp, android.R.drawable.stat_sys_download_done,
context.getString(R.string.action_download), context.getString(R.string.action_download),
NotificationReceiver.downloadChaptersPendingBroadcast( NotificationReceiver.downloadChaptersPendingBroadcast(
context, context,

8
app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt
View File

@ -40,12 +40,12 @@ internal class AppUpdateNotifier(private val context: Context) {
with(notificationBuilder) { with(notificationBuilder) {
setContentTitle(context.getString(R.string.update_check_notification_update_available)) setContentTitle(context.getString(R.string.update_check_notification_update_available))
setContentText(release.version) setContentText(release.version)
setSmallIcon(R.drawable.ic_download_24dp) setSmallIcon(android.R.drawable.stat_sys_download_done)
setContentIntent(updateIntent) setContentIntent(updateIntent)
clearActions() clearActions()
addAction( addAction(
R.drawable.ic_download_24dp, android.R.drawable.stat_sys_download_done,
context.getString(R.string.action_download), context.getString(R.string.action_download),
updateIntent, updateIntent,
) )
@ -67,7 +67,7 @@ internal class AppUpdateNotifier(private val context: Context) {
with(notificationBuilder) { with(notificationBuilder) {
title?.let { setContentTitle(title) } title?.let { setContentTitle(title) }
setContentText(context.getString(R.string.update_check_notification_download_in_progress)) 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) setOngoing(true)
} }
notificationBuilder.show() notificationBuilder.show()
@ -96,7 +96,7 @@ internal class AppUpdateNotifier(private val context: Context) {
val installIntent = NotificationHandler.installApkPendingActivity(context, uri) val installIntent = NotificationHandler.installApkPendingActivity(context, uri)
with(notificationBuilder) { with(notificationBuilder) {
setContentText(context.getString(R.string.update_check_notification_download_complete)) 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) setOnlyAlertOnce(false)
setProgress(0, 0, false) setProgress(0, 0, false)
setContentIntent(installIntent) setContentIntent(installIntent)

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
View File

@ -103,7 +103,7 @@ class SaveImageNotifier(private val context: Context) {
with(notificationBuilder) { with(notificationBuilder) {
setContentTitle(context.getString(R.string.download_notifier_title_error)) setContentTitle(context.getString(R.string.download_notifier_title_error))
setContentText(error ?: context.getString(R.string.unknown_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() updateNotification()
} }

9
app/src/main/res/drawable/ic_download_24dp.xml
View File

@ -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>