From 12a5b602e93ab2a4302c3774ab6934327be69973 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Sun, 17 Mar 2024 20:03:06 -0400 Subject: [PATCH] feat: getColor compatibility changes --- .../java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt | 3 ++- .../eu/kanade/tachiyomi/util/system/NotificationExtensions.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index 231443bb..280af466 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -14,6 +14,7 @@ import android.os.PowerManager import android.util.TypedValue import androidx.annotation.AttrRes import androidx.annotation.ColorInt +import androidx.core.content.ContextCompat import androidx.core.content.PermissionChecker import androidx.core.content.getSystemService import androidx.core.graphics.alpha @@ -85,7 +86,7 @@ fun Context.getThemeColor(attr: Int): Int { val tv = TypedValue() return if (this.theme.resolveAttribute(attr, tv, true)) { if (tv.resourceId != 0) { - getColor(tv.resourceId) + ContextCompat.getColor(this, tv.resourceId) } else { tv.data } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt index 67ce5a03..53049e4b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt @@ -10,6 +10,7 @@ import androidx.core.app.NotificationChannelGroupCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat.NotificationWithIdAndTag +import androidx.core.content.ContextCompat import androidx.core.content.PermissionChecker import androidx.core.content.getSystemService @@ -65,7 +66,7 @@ fun Context.notificationBuilder( block: (NotificationCompat.Builder.() -> Unit)? = null ): NotificationCompat.Builder { val builder = NotificationCompat.Builder(this, channelId) - .setColor(getColor(android.R.color.holo_blue_dark)) + .setColor(ContextCompat.getColor(this, android.R.color.holo_blue_dark)) if (block != null) { builder.block() }