プッシュ通知の受取ユーザのacctの表記に通称と色を適用する
This commit is contained in:
parent
55965dd654
commit
9f907b44ce
|
@ -739,6 +739,8 @@ class PushRepo(
|
||||||
val density = context.resources.displayMetrics.density
|
val density = context.resources.displayMetrics.density
|
||||||
val iconAndColor = pm.iconColor()
|
val iconAndColor = pm.iconColor()
|
||||||
|
|
||||||
|
val targetName = daoAcctColor.getNicknameWithColor(account.acct)
|
||||||
|
|
||||||
suspend fun PushMessage.loadSmallIcon(context: Context): IconCompat {
|
suspend fun PushMessage.loadSmallIcon(context: Context): IconCompat {
|
||||||
iconSmall?.notEmpty()
|
iconSmall?.notEmpty()
|
||||||
?.let { context.loadIcon(pm.iconSmall, (24f * density + 0.5f).toInt()) }
|
?.let { context.loadIcon(pm.iconSmall, (24f * density + 0.5f).toInt()) }
|
||||||
|
@ -794,7 +796,7 @@ class PushRepo(
|
||||||
?: ContextCompat.getColor(context, R.color.colorOsNotificationAccent)
|
?: ContextCompat.getColor(context, R.color.colorOsNotificationAccent)
|
||||||
setSmallIcon(iconSmall)
|
setSmallIcon(iconSmall)
|
||||||
iconBitmapLarge?.let { setLargeIcon(it) }
|
iconBitmapLarge?.let { setLargeIcon(it) }
|
||||||
setContentTitle(pm.loginAcct?.pretty)
|
setContentTitle(targetName)
|
||||||
setContentText(pm.text)
|
setContentText(pm.text)
|
||||||
setWhen(pm.timestamp)
|
setWhen(pm.timestamp)
|
||||||
setContentIntent(piTap)
|
setContentIntent(piTap)
|
||||||
|
@ -807,7 +809,7 @@ class PushRepo(
|
||||||
}
|
}
|
||||||
|
|
||||||
ncPushMessage.notify(context, urlDeleteSummary) {
|
ncPushMessage.notify(context, urlDeleteSummary) {
|
||||||
setContentTitle(account.acct.pretty)
|
setContentTitle(targetName)
|
||||||
setContentText("notifications")
|
setContentText("notifications")
|
||||||
setWhen(pm.timestamp)
|
setWhen(pm.timestamp)
|
||||||
setSmallIcon(R.drawable.ic_notification)
|
setSmallIcon(R.drawable.ic_notification)
|
||||||
|
|
Loading…
Reference in New Issue