From 653b7ffcd0fa5213668096059b43766f8ad8ed59 Mon Sep 17 00:00:00 2001 From: Soitora Date: Wed, 9 Jun 2021 23:16:09 +0200 Subject: [PATCH] Fix black icon for small notifications on EMUI (#5350) * Set notification icon fillColor to Android white Closes #5340 * Remove '_black' suffix from the glasses icon drawable --- app/src/main/java/eu/kanade/tachiyomi/App.kt | 2 +- .../eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt | 2 +- .../main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt | 2 +- app/src/main/res/drawable/ic_book_24dp.xml | 2 +- app/src/main/res/drawable/ic_close_24dp.xml | 2 +- app/src/main/res/drawable/ic_delete_24dp.xml | 2 +- app/src/main/res/drawable/ic_folder_24dp.xml | 2 +- .../{ic_glasses_black_24dp.xml => ic_glasses_24dp.xml} | 2 +- app/src/main/res/drawable/ic_pause_24dp.xml | 2 +- app/src/main/res/drawable/ic_photo_24dp.xml | 2 +- app/src/main/res/drawable/ic_play_arrow_24dp.xml | 2 +- app/src/main/res/drawable/ic_refresh_24dp.xml | 2 +- app/src/main/res/drawable/ic_share_24dp.xml | 2 +- app/src/main/res/drawable/ic_tachi.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) rename app/src/main/res/drawable/{ic_glasses_black_24dp.xml => ic_glasses_24dp.xml} (95%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index ff9fc2b958..d2a1d0bc65 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -81,7 +81,7 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory { val notification = notification(Notifications.CHANNEL_INCOGNITO_MODE) { setContentTitle(getString(R.string.pref_incognito_mode)) setContentText(getString(R.string.notification_incognito_text)) - setSmallIcon(R.drawable.ic_glasses_black_24dp) + setSmallIcon(R.drawable.ic_glasses_24dp) setOngoing(true) val pendingIntent = PendingIntent.getBroadcast( 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 870c3ef562..9cc135cb91 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 @@ -203,7 +203,7 @@ class LibraryUpdateNotifier(private val context: Context) { // Mark chapters as read action addAction( - R.drawable.ic_glasses_black_24dp, + R.drawable.ic_glasses_24dp, context.getString(R.string.action_mark_as_read), NotificationReceiver.markAsReadPendingBroadcast( context, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index 5cdb3b66fe..b0b69c5728 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -67,7 +67,7 @@ class MoreController : key = Keys.incognitoMode summaryRes = R.string.pref_incognito_mode_summary titleRes = R.string.pref_incognito_mode - iconRes = R.drawable.ic_glasses_black_24dp + iconRes = R.drawable.ic_glasses_24dp iconTint = tintColor defaultValue = false } diff --git a/app/src/main/res/drawable/ic_book_24dp.xml b/app/src/main/res/drawable/ic_book_24dp.xml index 8754d33d15..7d4d316941 100644 --- a/app/src/main/res/drawable/ic_book_24dp.xml +++ b/app/src/main/res/drawable/ic_book_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml index 73349bf375..6f6c8767dc 100644 --- a/app/src/main/res/drawable/ic_close_24dp.xml +++ b/app/src/main/res/drawable/ic_close_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml index 4cb7017487..8d17bb3c5e 100644 --- a/app/src/main/res/drawable/ic_delete_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_folder_24dp.xml b/app/src/main/res/drawable/ic_folder_24dp.xml index 8fe8a232ff..ab42ef1ab3 100644 --- a/app/src/main/res/drawable/ic_folder_24dp.xml +++ b/app/src/main/res/drawable/ic_folder_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_glasses_black_24dp.xml b/app/src/main/res/drawable/ic_glasses_24dp.xml similarity index 95% rename from app/src/main/res/drawable/ic_glasses_black_24dp.xml rename to app/src/main/res/drawable/ic_glasses_24dp.xml index 8ec7d15867..3316bfde11 100644 --- a/app/src/main/res/drawable/ic_glasses_black_24dp.xml +++ b/app/src/main/res/drawable/ic_glasses_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml index 5c49e973b8..2ffb66b3c8 100644 --- a/app/src/main/res/drawable/ic_pause_24dp.xml +++ b/app/src/main/res/drawable/ic_pause_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_photo_24dp.xml b/app/src/main/res/drawable/ic_photo_24dp.xml index d822103078..cffc7970d4 100644 --- a/app/src/main/res/drawable/ic_photo_24dp.xml +++ b/app/src/main/res/drawable/ic_photo_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_play_arrow_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml index 97278530f6..88f629175b 100644 --- a/app/src/main/res/drawable/ic_play_arrow_24dp.xml +++ b/app/src/main/res/drawable/ic_play_arrow_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_refresh_24dp.xml b/app/src/main/res/drawable/ic_refresh_24dp.xml index 0fdf73582c..311594eaa6 100644 --- a/app/src/main/res/drawable/ic_refresh_24dp.xml +++ b/app/src/main/res/drawable/ic_refresh_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml index 6f52bf4a8b..394e3effe4 100644 --- a/app/src/main/res/drawable/ic_share_24dp.xml +++ b/app/src/main/res/drawable/ic_share_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_tachi.xml b/app/src/main/res/drawable/ic_tachi.xml index 0c988fbf1b..0065c6340d 100644 --- a/app/src/main/res/drawable/ic_tachi.xml +++ b/app/src/main/res/drawable/ic_tachi.xml @@ -4,9 +4,9 @@ android:viewportWidth="256" android:viewportHeight="256">