gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3246 from nextcloud/bugfix/noid/fix3235ThemingIssues

Browse Source 
Fix theming issues
This commit is contained in:
Andy Scherzinger 2023-08-12 17:28:04 +02:00 committed by GitHub
commit c4a7fbf736
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
View File

@ -363,7 +363,11 @@ class TalkSpecificViewThemeUtils @Inject constructor(
fun themeMarkdown(context: Context, message: String, incoming: Boolean): Spanned { fun themeMarkdown(context: Context, message: String, incoming: Boolean): Spanned {
return withScheme(context) { scheme -> return withScheme(context) { scheme ->
return@withScheme if (incoming) { 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 { } else {
MessageUtils(context).getRenderedMarkdownText(context, message, scheme.onSurfaceVariant) MessageUtils(context).getRenderedMarkdownText(context, message, scheme.onSurfaceVariant)
} }

2
app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
View File

@ -71,7 +71,7 @@ class MessageUtils(val context: Context) {
} else if (message.renderMarkdown == false) { } else if (message.renderMarkdown == false) {
SpannableString(message.message) SpannableString(message.message)
} else { } else {
enrichChatMessageText(context, message.text, incoming, viewThemeUtils) enrichChatMessageText(context, message.message!!, incoming, viewThemeUtils)
} }
} }