From dea6645002566cdcb5b102056576225c64087a3f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 12 Aug 2023 15:52:39 +0200 Subject: [PATCH 1/3] fix mention rendering Signed-off-by: Andy Scherzinger --- .../main/java/com/nextcloud/talk/utils/message/MessageUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt index c386aec64..89b64c55f 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt @@ -71,7 +71,7 @@ class MessageUtils(val context: Context) { } else if (message.renderMarkdown == false) { SpannableString(message.message) } else { - enrichChatMessageText(context, message.text, incoming, viewThemeUtils) + enrichChatMessageText(context, message.message!!, incoming, viewThemeUtils) } } From 1b10c08d7e18369891d6b788e1f797d6a63cea50 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 12 Aug 2023 16:10:23 +0200 Subject: [PATCH 2/3] fix markdown checked item theming Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt index 64a016459..1aaaae6fe 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt @@ -363,7 +363,7 @@ class TalkSpecificViewThemeUtils @Inject constructor( fun themeMarkdown(context: Context, message: String, incoming: Boolean): Spanned { return withScheme(context) { scheme -> return@withScheme if (incoming) { - MessageUtils(context).getRenderedMarkdownText(context, message, R.color.nc_incoming_text_default) + MessageUtils(context).getRenderedMarkdownText(context, message, context.getColor(R.color.nc_incoming_text_default)) } else { MessageUtils(context).getRenderedMarkdownText(context, message, scheme.onSurfaceVariant) } From 9a1d501952aac9ef51f2dc10fc31d2e8aa446faa Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 12 Aug 2023 16:12:53 +0200 Subject: [PATCH 3/3] reformat code Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt index 1aaaae6fe..5a06acef8 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt @@ -363,7 +363,11 @@ class TalkSpecificViewThemeUtils @Inject constructor( fun themeMarkdown(context: Context, message: String, incoming: Boolean): Spanned { return withScheme(context) { scheme -> return@withScheme if (incoming) { - MessageUtils(context).getRenderedMarkdownText(context, message, context.getColor(R.color.nc_incoming_text_default)) + MessageUtils(context).getRenderedMarkdownText( + context, + message, + context.getColor(R.color.nc_incoming_text_default) + ) } else { MessageUtils(context).getRenderedMarkdownText(context, message, scheme.onSurfaceVariant) }