Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/talk-android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hibbe <dev@mhibbe.de>2022-04-21 13:12:09 +0300
committerMarcel Hibbe <dev@mhibbe.de>2022-04-22 12:28:07 +0300
commitb136465415ae873fcb11367e512e58b2a7f4c80c (patch)
treebddd57694e60f502d3e4ac5b10891dcc11d89c2e /app/src/main
parent31bb614bac7b2ef65cb872b8fdd626f934783f16 (diff)
fix more emojis ("...") color
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt15
1 files changed, 7 insertions, 8 deletions
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 7d19269a8..ead5473d5 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
@@ -50,6 +50,11 @@ class Reaction {
var remainingEmojisToDisplay = MAX_EMOJIS_TO_DISPLAY
val showInfoAboutMoreEmojis = message.reactions.size > MAX_EMOJIS_TO_DISPLAY
+ var textColor = ContextCompat.getColor(context, R.color.white)
+ if (!isOutgoingMessage) {
+ textColor = ContextCompat.getColor(binding.root.context, R.color.high_emphasis_text)
+ }
+
val amountParams = LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT
@@ -81,13 +86,7 @@ class Reaction {
if (amount > 1) {
val reactionAmount = TextView(context)
- if (isOutgoingMessage) {
- reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.white))
- } else {
- reactionAmount.setTextColor(
- ContextCompat.getColor(binding.root.context, R.color.high_emphasis_text)
- )
- }
+ reactionAmount.setTextColor(textColor)
reactionAmount.text = amount.toString()
reactionAmount.layoutParams = amountParams
emojiWithAmountWrapper.addView(reactionAmount)
@@ -103,7 +102,7 @@ class Reaction {
remainingEmojisToDisplay--
if (remainingEmojisToDisplay == 0 && showInfoAboutMoreEmojis) {
val infoAboutMoreEmojis = TextView(context)
- infoAboutMoreEmojis.setTextColor(ContextCompat.getColor(context, R.color.textColorMaxContrast))
+ infoAboutMoreEmojis.setTextColor(textColor)
infoAboutMoreEmojis.text = EMOJI_MORE
binding.reactionsEmojiWrapper.addView(infoAboutMoreEmojis)
break