improving the background of reactions

Signed-off-by: rapterjet2004 <[email protected]>

Author: rapterjet2004

app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt

@@ -11,8 +11,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
 import com.nextcloud.talk.chat.data.model.ChatMessage
+import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.utils.DisplayUtils
 import com.vanniktech.emoji.EmojiTextView
@@ -98,27 +98,19 @@ class Reaction {
         emojiWithAmountWrapper.addView(getReactionCount(context, layoutInfo.textColor, amount, layoutInfo.amountParams))
         emojiWithAmountWrapper.layoutParams = layoutInfo.wrapperParams
 
-        if (layoutInfo.isSelfReaction) {
-            layoutInfo.viewThemeUtils.talk.setCheckedBackground(
-                emojiWithAmountWrapper,
-                layoutInfo.isOutgoingMessage,
-                isBubbled
-            )
-
-            emojiWithAmountWrapper.setPaddingRelative(
-                layoutInfo.paddingSide,
-                layoutInfo.paddingTop,
-                layoutInfo.paddingSide,
-                layoutInfo.paddingBottom
-            )
-        } else {
-            emojiWithAmountWrapper.setPaddingRelative(
-                0,
-                layoutInfo.paddingTop,
-                layoutInfo.paddingSide,
-                layoutInfo.paddingBottom
-            )
-        }
+        layoutInfo.viewThemeUtils.talk.setReactionsBackground(
+            emojiWithAmountWrapper,
+            layoutInfo.isOutgoingMessage,
+            layoutInfo.isSelfReaction
+        )
+
+        emojiWithAmountWrapper.setPaddingRelative(
+            layoutInfo.paddingSide,
+            layoutInfo.paddingTop,
+            layoutInfo.paddingSide,
+            layoutInfo.paddingBottom
+        )
+
         return emojiWithAmountWrapper
     }
 

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

@@ -176,19 +176,24 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         }
     }
 
-    fun setCheckedBackground(linearLayout: LinearLayout, outgoing: Boolean, isBubbled: Boolean) {
+    fun setReactionsBackground(linearLayout: LinearLayout, outgoing: Boolean, isBubbled: Boolean) {
         withScheme(linearLayout) { scheme ->
             val drawable = AppCompatResources
                 .getDrawable(linearLayout.context, R.drawable.reaction_self_background)!!
                 .mutate()
-            val backgroundColor = if (outgoing && isBubbled) {
-                ContextCompat.getColor(
-                    linearLayout.context,
-                    R.color.bg_message_list_incoming_bubble
-                )
-            } else {
+            val backgroundColor = if (isBubbled) {
                 dynamicColor.primaryContainer().getArgb(scheme)
+            } else {
+                if (outgoing) {
+                    ContextCompat.getColor(
+                        linearLayout.context,
+                        R.color.bg_message_list_incoming_bubble
+                    )
+                } else {
+                    dynamicColor.surfaceVariant().getArgb(scheme)
+                }
             }
+
             DrawableCompat.setTintList(
                 drawable,
                 ColorStateList.valueOf(backgroundColor)