gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-23 12:45:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve reactions alignment

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-04-21 11:09:50 +02:00 committed by Marcel Hibbe
parent 0975968ff9
commit dd59d2dd20
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.content.res.ResourcesCompat
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
@ -38,6 +37,7 @@ import com.nextcloud.talk.utils.DisplayUtils
import com.vanniktech.emoji.EmojiTextView import com.vanniktech.emoji.EmojiTextView
class Reaction { class Reaction {
fun showReactions( fun showReactions(
message: ChatMessage, message: ChatMessage,
binding: ReactionsInsideMessageBinding, binding: ReactionsInsideMessageBinding,
@ -49,6 +49,19 @@ class Reaction {
var remainingEmojisToDisplay = MAX_EMOJIS_TO_DISPLAY var remainingEmojisToDisplay = MAX_EMOJIS_TO_DISPLAY
val showInfoAboutMoreEmojis = message.reactions.size > MAX_EMOJIS_TO_DISPLAY val showInfoAboutMoreEmojis = message.reactions.size > MAX_EMOJIS_TO_DISPLAY
val amountParams = LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT
)
amountParams.marginStart = DisplayUtils.convertDpToPixel(AMOUNT_START_MARGIN, context).toInt()
val wrapperParams = LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT
)
wrapperParams.marginEnd = DisplayUtils.convertDpToPixel(EMOJI_END_MARGIN, context).toInt()
for ((emoji, amount) in message.reactions) { for ((emoji, amount) in message.reactions) {
val emojiWithAmountWrapper = LinearLayout(context) val emojiWithAmountWrapper = LinearLayout(context)
emojiWithAmountWrapper.orientation = LinearLayout.HORIZONTAL emojiWithAmountWrapper.orientation = LinearLayout.HORIZONTAL
@ -71,34 +84,16 @@ class Reaction {
if (isOutgoingMessage) { if (isOutgoingMessage) {
reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.white)) reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.white))
} else { } else {
// reactionAmount.setTextColor(ContextCompat.getColor(context, R.color.nc_message_incoming_reaction_text_color))
/*
reactionAmount.setTextColor( reactionAmount.setTextColor(
ResourcesCompat.getColor( ContextCompat.getColor(binding.root.context, R.color.high_emphasis_text)
context.resources,
R.color.high_emphasis_text,
null
) )
)
*/
reactionAmount.setTextColor(ContextCompat.getColor(binding.root.context, R.color
.high_emphasis_text))
} }
reactionAmount.text = amount.toString() reactionAmount.text = amount.toString()
reactionAmount.layoutParams = amountParams
emojiWithAmountWrapper.addView(reactionAmount) emojiWithAmountWrapper.addView(reactionAmount)
} }
val params = LinearLayout.LayoutParams( emojiWithAmountWrapper.layoutParams = wrapperParams
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT
)
params.setMargins(
DisplayUtils.convertDpToPixel(EMOJI_START_MARGIN, context).toInt(),
0,
DisplayUtils.convertDpToPixel(EMOJI_END_MARGIN, context).toInt(),
0
)
emojiWithAmountWrapper.layoutParams = params
val paddingSide = DisplayUtils.convertDpToPixel(EMOJI_AND_AMOUNT_PADDING_SIDE, context).toInt() val paddingSide = DisplayUtils.convertDpToPixel(EMOJI_AND_AMOUNT_PADDING_SIDE, context).toInt()
emojiWithAmountWrapper.updatePadding(left = paddingSide, right = paddingSide) emojiWithAmountWrapper.updatePadding(left = paddingSide, right = paddingSide)
@ -119,7 +114,7 @@ class Reaction {
companion object { companion object {
const val MAX_EMOJIS_TO_DISPLAY = 4 const val MAX_EMOJIS_TO_DISPLAY = 4
const val EMOJI_START_MARGIN: Float = 2F const val AMOUNT_START_MARGIN: Float = 2F
const val EMOJI_END_MARGIN: Float = 6F const val EMOJI_END_MARGIN: Float = 6F
const val EMOJI_AND_AMOUNT_PADDING_SIDE: Float = 6F const val EMOJI_AND_AMOUNT_PADDING_SIDE: Float = 6F
const val EMOJI_MORE = "…" const val EMOJI_MORE = "…"