From ad1dbcf5f16cfae91318899a3e31dbe349804561 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 3 Jun 2018 17:17:33 +0200
Subject: [PATCH] Properly format invite messages
---
.../ui/chat/messages/QuasselMessageRenderer.kt | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index 31fd41ade..40cb51c1b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -552,7 +552,7 @@ class QuasselMessageRenderer @Inject constructor(
isExpanded = message.isExpanded,
isSelected = message.isSelected
)
- Message_Type.Topic -> FormattedMessage(
+ Message_Type.Topic -> FormattedMessage(
id = message.content.messageId,
time = timeFormatter.format(message.content.time.atZone(zoneId)),
dayChange = formatDayChange(message),
@@ -562,7 +562,7 @@ class QuasselMessageRenderer @Inject constructor(
isExpanded = message.isExpanded,
isSelected = message.isSelected
)
- Message_Type.DayChange -> FormattedMessage(
+ Message_Type.DayChange -> FormattedMessage(
id = message.content.messageId,
time = "",
dayChange = formatDayChange(message),
@@ -572,8 +572,17 @@ class QuasselMessageRenderer @Inject constructor(
isExpanded = false,
isSelected = false
)
- //Message_Type.Invite
- else -> FormattedMessage(
+ Message_Type.Invite -> FormattedMessage(
+ id = message.content.messageId,
+ time = timeFormatter.format(message.content.time.atZone(zoneId)),
+ dayChange = formatDayChange(message),
+ combined = contentFormatter.formatContent(message.content.content, monochromeForeground),
+ hasDayChange = message.hasDayChange,
+ isMarkerLine = message.isMarkerLine,
+ isExpanded = message.isExpanded,
+ isSelected = message.isSelected
+ )
+ else -> FormattedMessage(
id = message.content.messageId,
time = timeFormatter.format(message.content.time.atZone(zoneId)),
dayChange = formatDayChange(message),
--
GitLab