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

Merge pull request #4162 from nextcloud/bugfix/4078/fixSelfReactionWhenReEnteringChat

Browse Source 
Bugfix/4078/fix self reaction when re entering chat
This commit is contained in:
Marcel Hibbe 2024-09-06 15:26:01 +02:00 committed by GitHub
commit 06f5c0b7c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/data/source/local/converters/ArrayListConverter.kt
View File

@ -33,6 +33,6 @@ class ArrayListConverter {
return null return null
} }
return LoganSquare.parseList(value, List::class.java) as ArrayList<String>? return LoganSquare.parseList(value, String::class.java) as ArrayList<String>?
} }
} }

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

@ -164,18 +164,18 @@ class TalkSpecificViewThemeUtils @Inject constructor(
} }
} }
fun setCheckedBackground(linearLayout: LinearLayout, incoming: Boolean) { fun setCheckedBackground(linearLayout: LinearLayout, outgoing: Boolean) {
withScheme(linearLayout) { scheme -> withScheme(linearLayout) { scheme ->
val drawable = AppCompatResources val drawable = AppCompatResources
.getDrawable(linearLayout.context, R.drawable.reaction_self_background)!! .getDrawable(linearLayout.context, R.drawable.reaction_self_background)!!
.mutate() .mutate()
val backgroundColor = if (incoming) { val backgroundColor = if (outgoing) {
dynamicColor.primaryContainer().getArgb(scheme)
} else {
ContextCompat.getColor( ContextCompat.getColor(
linearLayout.context, linearLayout.context,
R.color.bg_message_list_incoming_bubble R.color.bg_message_list_incoming_bubble
) )
} else {
dynamicColor.primaryContainer().getArgb(scheme)
} }
DrawableCompat.setTintList( DrawableCompat.setTintList(
drawable, drawable,