From fcf21180088e725735db7abb7d36def42eb0e6fb Mon Sep 17 00:00:00 2001
From: Dariusz Olszewski <starypatyk@users.noreply.github.com>
Date: Mon, 16 May 2022 22:52:37 +0200
Subject: [PATCH] Implemented suggested design changes - first attempt

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
---
 .../talk/receivers/DirectReplyReceiver.kt         | 15 +++++++--------
 app/src/main/res/values/strings.xml               |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/receivers/DirectReplyReceiver.kt b/app/src/main/java/com/nextcloud/talk/receivers/DirectReplyReceiver.kt
index 3b9e5153f..0eb78d2cc 100644
--- a/app/src/main/java/com/nextcloud/talk/receivers/DirectReplyReceiver.kt
+++ b/app/src/main/java/com/nextcloud/talk/receivers/DirectReplyReceiver.kt
@@ -26,7 +26,8 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.text.Html
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
@@ -125,13 +126,11 @@ class DirectReplyReceiver : BroadcastReceiver() {
 
     @RequiresApi(Build.VERSION_CODES.N)
     private fun informReplyFailed() {
-        val errorMessage =
-            Html.fromHtml(
-                "<font color='red'><em>" +
-                    context.resources.getString(R.string.nc_message_failed_to_send) +
-                    "</em></font>",
-                Html.FROM_HTML_MODE_COMPACT
-            )
+        val errorColor = ForegroundColorSpan(context.resources.getColor(R.color.medium_emphasis_text, context.theme))
+        val errorMessageHeader = context.resources.getString(R.string.nc_message_failed_to_send)
+        val errorMessage = SpannableStringBuilder()
+            .append("$errorMessageHeader\n$replyMessage", errorColor, 0)
+            // .append("\n$replyMessage")
         appendMessageToNotification(errorMessage)
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a5cb32f38..946e04356 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -325,7 +325,7 @@
     <string name="nc_formatted_message_you">You: %1$s</string>
     <string name="nc_message_read">Message read</string>
     <string name="nc_message_sent">Message sent</string>
-    <string name="nc_message_failed_to_send">Failed to send message</string>
+    <string name="nc_message_failed_to_send">Failed to send message:</string>
     <string name="nc_remote_audio_off">Remote audio off</string>
     <string name="nc_add_attachment">Add attachment</string>