diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt index 85783dcec..2588aebc8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt @@ -32,7 +32,8 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity -import code.name.monkey.retromusic.extensions.surfaceColor +import code.name.monkey.retromusic.extensions.isColorLight +import code.name.monkey.retromusic.extensions.isSystemDarkModeEnabled import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper @@ -80,6 +81,7 @@ class PlayingNotificationClassic( setContentIntent(clickIntent) setDeleteIntent(deleteIntent) setCategory(NotificationCompat.CATEGORY_SERVICE) + setColorized(true) priority = NotificationCompat.PRIORITY_MAX setVisibility(NotificationCompat.VISIBILITY_PUBLIC) setCustomContentView(notificationLayout) @@ -152,8 +154,13 @@ class PlayingNotificationClassic( } setBackgroundColor(bgColorFinal) setNotificationContent(ColorUtil.isColorLight(bgColorFinal)) - }else { - setNotificationContent(!ColorUtil.isColorLight(context.surfaceColor())) + } else { + if (PreferenceUtil.isColoredNotification) { + color = bgColor + setNotificationContent(color.isColorLight) + } else { + setNotificationContent(!context.isSystemDarkModeEnabled()) + } } onUpdate() } @@ -256,7 +263,8 @@ class PlayingNotificationClassic( R.drawable.ic_pause_white_48dp else R.drawable.ic_play_arrow_white_48dp, primaryColor - ), NOTIFICATION_CONTROLS_SIZE_MULTIPLIER) + ), NOTIFICATION_CONTROLS_SIZE_MULTIPLIER + ) } override fun setPlaying(isPlaying: Boolean, onUpdate: () -> Unit) { diff --git a/app/src/main/res/values-v31/donottranslate.xml b/app/src/main/res/values-v31/donottranslate.xml index 4b3685c6e..fb985e1c5 100644 --- a/app/src/main/res/values-v31/donottranslate.xml +++ b/app/src/main/res/values-v31/donottranslate.xml @@ -3,7 +3,6 @@ true true - false 0 false false diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 79ca523fd..52cf6b212 100755 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -27,7 +27,6 @@ false false - true 2 true diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml index 327e93708..77ad1b564 100755 --- a/app/src/main/res/xml/pref_notification.xml +++ b/app/src/main/res/xml/pref_notification.xml @@ -13,7 +13,6 @@ android:defaultValue="true" android:key="colored_notification" android:layout="@layout/list_item_view_switch" - app:isPreferenceVisible="@bool/colored_notification_available" android:summary="@string/pref_summary_colored_notification" android:title="@string/pref_title_colored_notification" />