From 54c40e99efd326e598877626b6e551045e8e30d3 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 8 Apr 2022 14:56:18 +0200 Subject: [PATCH] hide amount in message if it's only 1 Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/adapters/messages/Reaction.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 6788e5559..5c1c11753 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 @@ -49,13 +49,16 @@ class Reaction { for ((emoji, amount) in message.reactions) { val reactionEmoji = EmojiTextView(context) reactionEmoji.text = emoji + binding.reactionsEmojiWrapper.addView(reactionEmoji) val reactionAmount = TextView(context) - if (useLightColorForText){ - reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.nc_grey)) - } - reactionAmount.text = amount.toString() + if (amount > 1) { + if (useLightColorForText) { + reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.nc_grey)) + } + reactionAmount.text = amount.toString() + } val params = RelativeLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, @@ -68,10 +71,9 @@ class Reaction { 0 ) reactionAmount.layoutParams = params - - binding.reactionsEmojiWrapper.addView(reactionEmoji) binding.reactionsEmojiWrapper.addView(reactionAmount) + remainingEmojisToDisplay-- if (remainingEmojisToDisplay == 0 && showInfoAboutMoreEmojis) { val infoAboutMoreEmojis = TextView(context)