Merge branch 'pr/257' into dev
This commit is contained in:
commit
1fd91b9ec6
10 changed files with 47 additions and 29 deletions
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue