Skip to content

improving the background of reactions with added contrast #5522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

improving the background of reactions with added contrast #5522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba87675
improving the background of reactions
rapterjet2004 Oct 30, 2025
9d6d4cb
implementing changes
rapterjet2004 Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down
19 changes: 12 additions & 7 deletions app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading