From fc141cb92a146450c8710cebd70a2093670fe7ed 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 (cherry picked from commit 653b7ffcd0fa5213668096059b43766f8ad8ed59) # Conflicts: # app/src/main/res/drawable/ic_tachi.xml --- app/src/main/java/eu/kanade/tachiyomi/App.kt | 2 +- .../tachiyomi/data/library/LibraryUpdateNotifier.kt | 2 +- .../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 | 12 ++++++------ 14 files changed, 19 insertions(+), 19 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 31b16e5d0..c29dab4cc 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -112,7 +112,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 8cc9700f7..19faefc73 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 @@ -204,7 +204,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 77e6f03c8..9b2305d9e 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 @@ -70,7 +70,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 8754d33d1..7d4d31694 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 73349bf37..6f6c8767d 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 4cb701748..8d17bb3c5 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 8fe8a232f..ab42ef1ab 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 8ec7d1586..3316bfde1 100755 --- 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 5c49e973b..2ffb66b3c 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 d82210307..cffc7970d 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 97278530f..88f629175 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 0fdf73582..311594eaa 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 6f52bf4a8..394e3effe 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 e052000ea..9055a1974 100644 --- a/app/src/main/res/drawable/ic_tachi.xml +++ b/app/src/main/res/drawable/ic_tachi.xml @@ -4,21 +4,21 @@ android:viewportWidth="256" android:viewportHeight="256">