From 583b52588cb0dea937eb33011d855978a71ceda9 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 21 Apr 2022 09:43:40 +0200 Subject: [PATCH] use proper context to be day/night aware Signed-off-by: Andy Scherzinger --- .../adapters/messages/MagicPreviewMessageViewHolder.java | 2 +- .../java/com/nextcloud/talk/adapters/messages/Reaction.kt | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java index f3481ad94..36d05ed3f 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java @@ -259,7 +259,7 @@ public abstract class MagicPreviewMessageViewHolder extends MessageHolders.Incom itemView.setTag(REPLYABLE_VIEW_TAG, message.isReplyable()); reactionsBinding = getReactionsBinding(); - new Reaction().showReactions(message, reactionsBinding, context, true); + new Reaction().showReactions(message, reactionsBinding, getMessageText().getContext(), true); reactionsBinding.reactionsEmojiWrapper.setOnClickListener(l -> { reactionsInterface.onClickReactions(message); }); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt index 0f7187a08..e129ea7b1 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt @@ -72,13 +72,17 @@ class Reaction { reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.white)) } else { // reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.nc_message_incoming_reaction_text_color)) + /* reactionAmount.setTextColor( ResourcesCompat.getColor( - context.applicationContext.resources, - R.color.nc_message_incoming_reaction_text_color, + context.resources, + R.color.high_emphasis_text, null ) ) + */ + reactionAmount.setTextColor(ContextCompat.getColor(binding.root.context, R.color + .high_emphasis_text)) } reactionAmount.text = amount.toString() emojiWithAmountWrapper.addView(reactionAmount)