rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: getColor compatibility changes

Browse source
This commit is contained in:
TwistedUmbrellaX 2024-03-17 20:03:06 -04:00
parent 56aefef693
commit 12a5b602e9
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
View file

@ -14,6 +14,7 @@ import android.os.PowerManager
import android.util.TypedValue import android.util.TypedValue
import androidx.annotation.AttrRes import androidx.annotation.AttrRes
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
import androidx.core.content.ContextCompat
import androidx.core.content.PermissionChecker import androidx.core.content.PermissionChecker
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import androidx.core.graphics.alpha import androidx.core.graphics.alpha
@ -85,7 +86,7 @@ fun Context.getThemeColor(attr: Int): Int {
val tv = TypedValue() val tv = TypedValue()
return if (this.theme.resolveAttribute(attr, tv, true)) { return if (this.theme.resolveAttribute(attr, tv, true)) {
if (tv.resourceId != 0) { if (tv.resourceId != 0) {
getColor(tv.resourceId) ContextCompat.getColor(this, tv.resourceId)
} else { } else {
tv.data tv.data
} }

3
app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt
View file

@ -10,6 +10,7 @@ import androidx.core.app.NotificationChannelGroupCompat
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import androidx.core.app.NotificationManagerCompat.NotificationWithIdAndTag import androidx.core.app.NotificationManagerCompat.NotificationWithIdAndTag
import androidx.core.content.ContextCompat
import androidx.core.content.PermissionChecker import androidx.core.content.PermissionChecker
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
@ -65,7 +66,7 @@ fun Context.notificationBuilder(
block: (NotificationCompat.Builder.() -> Unit)? = null block: (NotificationCompat.Builder.() -> Unit)? = null
): NotificationCompat.Builder { ): NotificationCompat.Builder {
val builder = NotificationCompat.Builder(this, channelId) 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) { if (block != null) {
builder.block() builder.block()
} }