mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-06 17:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Notifications - HTML formatting for title, group summary and collapsed notifications (#712)

Browse source
This commit is contained in:
chriss158 2020-08-08 18:28:28 +02:00 committed by GitHub
parent ceedaf4cbe
commit a150610d51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/full/java/io/homeassistant/companion/android/notifications/MessagingService.kt
View file

@ -9,6 +9,7 @@ import android.graphics.BitmapFactory
import android.graphics.Color
import android.media.RingtoneManager
import android.os.Build
import android.text.Spanned
import android.util.Log
import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat
@ -180,6 +181,8 @@ class MessagingService : FirebaseMessagingService() {
handleText(notificationBuilder, data)
handleSubject(notificationBuilder, data)
handleImage(notificationBuilder, data)
handleActions(notificationBuilder, tag, messageId, data)
@ -263,13 +266,16 @@ class MessagingService : FirebaseMessagingService() {
private fun getGroupNotificationBuilder(
channelId: String,
group: String?,
group: String,
data: Map<String, String>
): NotificationCompat.Builder {
val groupNotificationBuilder = NotificationCompat.Builder(this, channelId)
var groupNotificationBuilder = NotificationCompat.Builder(this, channelId)
.setSmallIcon(R.drawable.ic_stat_ic_notification)
.setStyle(
NotificationCompat.InboxStyle().setSummaryText(group?.substring(GROUP_PREFIX.length))
NotificationCompat.BigTextStyle()
.setSummaryText(getSpannedTextFromHtml(group.substring(GROUP_PREFIX.length))
)
)
.setGroup(group)
.setGroupSummary(true)
@ -400,24 +406,34 @@ class MessagingService : FirebaseMessagingService() {
builder.setAutoCancel(!sticky)
}
private fun handleSubject(
builder: NotificationCompat.Builder,
data: Map<String, String>
) {
if (!data[SUBJECT].isNullOrEmpty()) {
builder.setContentText(getSpannedTextFromHtml(data[SUBJECT]))
}
}
private fun handleText(
builder: NotificationCompat.Builder,
data: Map<String, String>
) {
builder
.setContentTitle(data[TITLE])
.setContentText(data[SUBJECT] ?: data[MESSAGE])
.setContentTitle(getSpannedTextFromHtml(data[TITLE]))
.setStyle(
NotificationCompat.BigTextStyle()
.bigText(
HtmlCompat.fromHtml(
data[MESSAGE] ?: "Unspecified",
HtmlCompat.FROM_HTML_MODE_LEGACY
)
)
.bigText(getSpannedTextFromHtml(data[MESSAGE]))
)
}
private fun getSpannedTextFromHtml(
text: String?
): Spanned {
return HtmlCompat.fromHtml(text ?: "Missing", HtmlCompat.FROM_HTML_MODE_LEGACY)
}
private suspend fun handleLargeIcon(
builder: NotificationCompat.Builder,
data: Map<String, String>