Skip to content

Pin reactions to the bottom of the message bubble #5674

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
AndyScherzinger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pin reactions to the bottom of the message bubble #5674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public void onBind(@NonNull ChatMessage message) {
&& !Objects.equals(message.getMessage(), "{file}")
) {
Spanned processedMessageText = null;
binding.incomingPreviewMessageBubble.setBackgroundResource(R.drawable.shape_grouped_incoming_message);
binding.bubble.setBackgroundResource(R.drawable.shape_grouped_incoming_message);
if (viewThemeUtils != null ) {
processedMessageText = messageUtils.enrichChatMessageText(
binding.messageCaption.getContext(),
message,
true,
viewThemeUtils);
viewThemeUtils.talk.themeIncomingMessageBubble(binding.incomingPreviewMessageBubble, true, false,
viewThemeUtils.talk.themeIncomingMessageBubble(binding.bubble, true, false,
false);
}

Expand All @@ -61,9 +61,9 @@ public void onBind(@NonNull ChatMessage message) {
viewThemeUtils,
processedMessageText,
message,
binding.incomingPreviewMessageBubble);
binding.bubble);
}
binding.incomingPreviewMessageBubble.setOnClickListener(null);
binding.bubble.setOnClickListener(null);

float textSize = 0;
if (context != null) {
Expand All @@ -81,7 +81,7 @@ public void onBind(@NonNull ChatMessage message) {
binding.messageCaption.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
binding.messageCaption.setText(processedMessageText);
} else {
binding.incomingPreviewMessageBubble.setBackground(null);
binding.bubble.setBackground(null);
binding.messageCaption.setVisibility(View.GONE);
}
binding.messageAuthor.setText(message.getActorDisplayName());
Expand Down
10 changes: 5 additions & 5 deletions ...src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public void onBind(@NonNull ChatMessage message) {
&& !Objects.equals(message.getMessage(), "{file}")
) {
Spanned processedMessageText = null;
binding.outgoingPreviewMessageBubble.setBackgroundResource(R.drawable.shape_grouped_outcoming_message);
binding.bubble.setBackgroundResource(R.drawable.shape_grouped_outcoming_message);
if (viewThemeUtils != null) {
processedMessageText = messageUtils.enrichChatMessageText(
binding.messageCaption.getContext(),
message,
false,
viewThemeUtils);
viewThemeUtils.talk.themeOutgoingMessageBubble(binding.outgoingPreviewMessageBubble, true, false,
viewThemeUtils.talk.themeOutgoingMessageBubble(binding.bubble, true, false,
false);
}

Expand All @@ -61,9 +61,9 @@ public void onBind(@NonNull ChatMessage message) {
viewThemeUtils,
processedMessageText,
message,
binding.outgoingPreviewMessageBubble);
binding.bubble);
}
binding.outgoingPreviewMessageBubble.setOnClickListener(null);
binding.bubble.setOnClickListener(null);

float textSize = 0;
if (context != null) {
Expand All @@ -81,7 +81,7 @@ public void onBind(@NonNull ChatMessage message) {
binding.messageCaption.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
binding.messageCaption.setText(processedMessageText);
} else {
binding.outgoingPreviewMessageBubble.setBackground(null);
binding.bubble.setBackground(null);
binding.messageCaption.setVisibility(View.GONE);
}

Expand Down
58 changes: 37 additions & 21 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,6 +11,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.TextView
import com.google.android.material.card.MaterialCardView
import com.nextcloud.talk.chat.data.model.ChatMessage
import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
import com.nextcloud.talk.ui.theme.ViewThemeUtils
Expand Down Expand Up @@ -39,9 +40,6 @@ class Reaction {
true
}

val amountParams = getAmountLayoutParams(context)
val wrapperParams = getWrapperLayoutParams(context)

val paddingSide = DisplayUtils.convertDpToPixel(EMOJI_AND_AMOUNT_PADDING_SIDE, context).toInt()
val paddingTop = DisplayUtils.convertDpToPixel(WRAPPER_PADDING_TOP, context).toInt()
val paddingBottom = DisplayUtils.convertDpToPixel(WRAPPER_PADDING_BOTTOM, context).toInt()
Expand All @@ -57,8 +55,6 @@ class Reaction {
amount,
EmojiWithAmountWrapperLayoutInfo(
textColor,
amountParams,
wrapperParams,
paddingSide,
paddingTop,
paddingBottom,
Expand Down Expand Up @@ -90,18 +86,23 @@ class Reaction {
amount: Int,
layoutInfo: EmojiWithAmountWrapperLayoutInfo,
isBubbled: Boolean
): LinearLayout {
): MaterialCardView {
val amountParams = getAmountLayoutParams(context)
val wrapperParams = getWrapperLayoutParams(context)

val emojiContainer = MaterialCardView(context)
val emojiWithAmountWrapper = LinearLayout(context)
emojiWithAmountWrapper.orientation = LinearLayout.HORIZONTAL

emojiWithAmountWrapper.addView(getEmojiTextView(context, emoji))
emojiWithAmountWrapper.addView(getReactionCount(context, layoutInfo.textColor, amount, layoutInfo.amountParams))
emojiWithAmountWrapper.layoutParams = layoutInfo.wrapperParams
emojiWithAmountWrapper.addView(getEmojiTextView(context, emoji, amountParams))
emojiWithAmountWrapper.addView(getReactionCount(context, layoutInfo.textColor, amount, amountParams))
emojiWithAmountWrapper.layoutParams = wrapperParams

layoutInfo.viewThemeUtils.talk.setReactionsBackground(
emojiWithAmountWrapper,
emojiContainer,
layoutInfo.isOutgoingMessage,
layoutInfo.isSelfReaction
layoutInfo.isSelfReaction,
isBubbled
)

emojiWithAmountWrapper.setPaddingRelative(
Expand All @@ -111,34 +112,49 @@ class Reaction {
layoutInfo.paddingBottom
)

return emojiWithAmountWrapper
emojiContainer.addView(emojiWithAmountWrapper)
val containerParams = getWrapperLayoutParams(context, REACTION_END_MARGIN)
containerParams.marginStart = 0
emojiContainer.layoutParams = containerParams
emojiContainer.setStrokeWidth(DisplayUtils.convertDpToPixel(EMOJI_CONTAINER_STROKE_WIDTH, context).toInt())

return emojiContainer
}

private fun getEmojiTextView(context: Context, emoji: String): EmojiTextView {
private fun getEmojiTextView(
context: Context,
emoji: String,
layoutParams: LinearLayout.LayoutParams
): EmojiTextView {
val reactionEmoji = EmojiTextView(context)
reactionEmoji.text = emoji
reactionEmoji.layoutParams = layoutParams
return reactionEmoji
}

private fun getReactionCount(
context: Context,
textColor: Int,
amount: Int,
amountParams: LinearLayout.LayoutParams
layoutParams: LinearLayout.LayoutParams
): TextView {
val reactionAmount = TextView(context)
reactionAmount.setTextColor(textColor)
reactionAmount.text = amount.toString()
reactionAmount.layoutParams = amountParams
reactionAmount.layoutParams = layoutParams
return reactionAmount
}

private fun getWrapperLayoutParams(context: Context): LinearLayout.LayoutParams {
private fun getWrapperLayoutParams(
context: Context,
endMarginInDp: Float = EMOJI_END_MARGIN
): LinearLayout
.LayoutParams {
val wrapperParams = LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT
)
wrapperParams.marginEnd = DisplayUtils.convertDpToPixel(EMOJI_END_MARGIN, context).toInt()
wrapperParams.marginEnd = DisplayUtils.convertDpToPixel(endMarginInDp, context).toInt()
return wrapperParams
}

Expand All @@ -153,8 +169,6 @@ class Reaction {

private data class EmojiWithAmountWrapperLayoutInfo(
val textColor: Int,
val amountParams: LinearLayout.LayoutParams,
val wrapperParams: LinearLayout.LayoutParams,
val paddingSide: Int,
val paddingTop: Int,
val paddingBottom: Int,
Expand All @@ -164,10 +178,12 @@ class Reaction {
)

companion object {
const val AMOUNT_START_MARGIN: Float = 2F
const val EMOJI_END_MARGIN: Float = 6F
const val AMOUNT_START_MARGIN: Float = 4F
const val EMOJI_END_MARGIN: Float = 4F
const val REACTION_END_MARGIN: Float = 6F
const val EMOJI_AND_AMOUNT_PADDING_SIDE: Float = 4F
const val WRAPPER_PADDING_TOP: Float = 2F
const val WRAPPER_PADDING_BOTTOM: Float = 3F
const val EMOJI_CONTAINER_STROKE_WIDTH: Float = 1.5F
}
}
15 changes: 7 additions & 8 deletions app/src/main/java/com/nextcloud/talk/adapters/messages/ThreadButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.pluralStringResource
Expand All @@ -43,14 +42,14 @@ fun ThreadButtonComposable(replyAmount: Int = 0, onButtonClick: () -> Unit = {})
OutlinedButton(
onClick = onButtonClick,
modifier = Modifier
.padding(8.dp)
.padding(0.dp)
.height(24.dp),
shape = RoundedCornerShape(9.dp),
border = BorderStroke(1.dp, colorResource(R.color.grey_600)),
shape = RoundedCornerShape(12.dp),
border = BorderStroke(1.dp, colorResource(R.color.nc_incoming_text_default)),
contentPadding = PaddingValues(0.dp),
colors = ButtonDefaults.outlinedButtonColors(
containerColor = Color.Transparent,
contentColor = colorResource(R.color.grey_600)
containerColor = colorResource(R.color.bg_message_list_incoming_bubble),
contentColor = colorResource(R.color.nc_incoming_text_default)
)
) {
Icon(
Expand All @@ -59,12 +58,12 @@ fun ThreadButtonComposable(replyAmount: Int = 0, onButtonClick: () -> Unit = {})
modifier = Modifier
.size(20.dp)
.padding(start = 5.dp, end = 2.dp),
tint = colorResource(R.color.grey_600)
tint = colorResource(R.color.nc_incoming_text_default)
)
Text(
text = replyAmountText,
modifier = Modifier
.padding(end = 5.dp)
.padding(end = 6.dp)
)
}
}
Expand Down
25 changes: 25 additions & 0 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 @@ -202,6 +202,31 @@ class TalkSpecificViewThemeUtils @Inject constructor(
}
}

fun setReactionsBackground(card: MaterialCardView, outgoing: Boolean, isSelfReaction: Boolean, isBubbled: Boolean) {
withScheme(card) { scheme ->
if (isSelfReaction) {
card.setCardBackgroundColor(dynamicColor.primaryContainer().getArgb(scheme))
card.strokeColor = dynamicColor.primary().getArgb(scheme)
} else {
if (isBubbled) {
card.setCardBackgroundColor(
ContextCompat.getColor(
card.context,
R.color.bg_message_list_incoming_bubble
)
)
card.strokeColor = dynamicColor.surface().getArgb(scheme)
} else {
card.setCardBackgroundColor(dynamicColor.surface().getArgb(scheme))
card.strokeColor = ContextCompat.getColor(
card.context,
R.color.bg_message_list_incoming_bubble
)
}
}
}
}

fun getPlaceholderImage(context: Context, mimetype: String?): Drawable? {
val drawableResourceId = DrawableUtils.getDrawableResourceIdForMimeType(mimetype)
val drawable = AppCompatResources.getDrawable(
Expand Down
Loading
Loading