Skip to content

Remove click lambdas from quoted message parameters #6293

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

Merged
andremion merged 1 commit into from
Mar 25, 2026
Merged

Remove click lambdas from quoted message parameters #6293

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
16 changes: 6 additions & 10 deletions stream-chat-android-compose/api/stream-chat-android-compose.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,7 @@ public final class io/getstream/chat/android/compose/ui/components/messages/Poll
}

public final class io/getstream/chat/android/compose/ui/components/messages/QuotedMessageKt {
public static final fun QuotedMessage (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Lio/getstream/chat/android/models/Message;Landroidx/compose/runtime/Composer;II)V
public static final fun QuotedMessage (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Landroidx/compose/ui/Modifier;Lio/getstream/chat/android/models/Message;Landroidx/compose/runtime/Composer;II)V
}

public final class io/getstream/chat/android/compose/ui/components/moderatedmessage/ComposableSingletons$ModeratedMessageDialogKt {
Expand Down Expand Up @@ -5626,22 +5626,18 @@ public final class io/getstream/chat/android/compose/ui/theme/MessageOptionsThem

public final class io/getstream/chat/android/compose/ui/theme/MessageQuotedContentParams {
public static final field $stable I
public fun <init> (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;)V
public synthetic fun <init> (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Landroidx/compose/ui/Modifier;)V
public synthetic fun <init> (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Landroidx/compose/ui/Modifier;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Lio/getstream/chat/android/models/Message;
public final fun component2 ()Lio/getstream/chat/android/models/User;
public final fun component3 ()Lio/getstream/chat/android/models/Message;
public final fun component4 ()Lkotlin/jvm/functions/Function1;
public final fun component5 ()Lkotlin/jvm/functions/Function1;
public final fun component6 ()Landroidx/compose/ui/Modifier;
public final fun copy (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;)Lio/getstream/chat/android/compose/ui/theme/MessageQuotedContentParams;
public static synthetic fun copy$default (Lio/getstream/chat/android/compose/ui/theme/MessageQuotedContentParams;Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/MessageQuotedContentParams;
public final fun component4 ()Landroidx/compose/ui/Modifier;
public final fun copy (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Landroidx/compose/ui/Modifier;)Lio/getstream/chat/android/compose/ui/theme/MessageQuotedContentParams;
public static synthetic fun copy$default (Lio/getstream/chat/android/compose/ui/theme/MessageQuotedContentParams;Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Message;Landroidx/compose/ui/Modifier;ILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/MessageQuotedContentParams;
Comment thread
gpunto marked this conversation as resolved.
public fun equals (Ljava/lang/Object;)Z
public final fun getCurrentUser ()Lio/getstream/chat/android/models/User;
public final fun getMessage ()Lio/getstream/chat/android/models/Message;
public final fun getModifier ()Landroidx/compose/ui/Modifier;
public final fun getOnLongItemClick ()Lkotlin/jvm/functions/Function1;
public final fun getOnQuotedMessageClick ()Lkotlin/jvm/functions/Function1;
public final fun getReplyMessage ()Lio/getstream/chat/android/models/Message;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
Expand Down
12 changes: 10 additions & 2 deletions .../src/main/java/io/getstream/chat/android/compose/ui/components/messages/MessageContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package io.getstream.chat.android.compose.ui.components.messages

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -171,6 +174,7 @@ internal fun DefaultMessageDeletedContent(
* @param onQuotedMessageClick Handler for quoted message click action.
* @param onLinkClick Handler for clicking on a link in the message.
*/
@OptIn(ExperimentalFoundationApi::class)
@Composable
@Suppress("LongMethod")
internal fun DefaultMessageContent(
Expand All @@ -192,8 +196,12 @@ internal fun DefaultMessageContent(
message = quotedMessage,
currentUser = currentUser,
replyMessage = message,
onLongItemClick = onLongItemClick,
onQuotedMessageClick = onQuotedMessageClick,
modifier = Modifier.combinedClickable(
interactionSource = remember(::MutableInteractionSource),
indication = null,
onLongClick = { onLongItemClick(message) },
onClick = { onQuotedMessageClick(quotedMessage) },
),
),
)
}
Expand Down
16 changes: 0 additions & 16 deletions ...e/src/main/java/io/getstream/chat/android/compose/ui/components/messages/QuotedMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
package io.getstream.chat.android.compose.ui.components.messages

import androidx.annotation.DrawableRes
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -67,31 +64,20 @@ import io.getstream.chat.android.ui.common.utils.extensions.isMine
*
* @param message The quoted message to show.
* @param currentUser The currently logged in user.
* @param onLongItemClick Handler when the item is long clicked.
* @param onQuotedMessageClick Handler for quoted message click action.
* @param modifier Modifier for styling.
* @param replyMessage The message that contains the reply.
*/
@OptIn(ExperimentalFoundationApi::class)
@Composable
public fun QuotedMessage(
message: Message,
currentUser: User?,
onLongItemClick: (Message) -> Unit,
onQuotedMessageClick: (Message) -> Unit,
modifier: Modifier = Modifier,
replyMessage: Message? = null,
) {
val style = MessageStyling.quotedMessageStyle(message, replyMessage, currentUser)

Row(
modifier = modifier
.combinedClickable(
interactionSource = remember(::MutableInteractionSource),
indication = null,
onLongClick = { onLongItemClick(message) },
onClick = { onQuotedMessageClick(message) },
)
.background(style.backgroundColor, RoundedCornerShape(StreamTokens.radiusLg))
.padding(StreamTokens.spacingXs)
.height(IntrinsicSize.Min),
Expand Down Expand Up @@ -134,8 +120,6 @@ internal fun MessageComposerQuotedMessage(
QuotedMessage(
message = message,
currentUser = currentUser,
onLongItemClick = {},
onQuotedMessageClick = {},
replyMessage = null,
)

Expand Down
2 changes: 0 additions & 2 deletions ...-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatComponentFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,8 +1116,6 @@ public interface ChatComponentFactory {
message = params.message,
currentUser = params.currentUser,
replyMessage = params.replyMessage,
onLongItemClick = params.onLongItemClick,
onQuotedMessageClick = params.onQuotedMessageClick,
)
}

Expand Down
4 changes: 0 additions & 4 deletions ...se/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatComponentFactoryParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,16 +828,12 @@ public data class MessageTextContentParams(
* @param message The message that contains the quote.
* @param currentUser The currently logged in user.
* @param replyMessage The quoted message.
* @param onLongItemClick Action invoked when a message is long-clicked.
* @param onQuotedMessageClick Action invoked when the quoted message is clicked.
* @param modifier Modifier for styling.
*/
public data class MessageQuotedContentParams(
val message: Message,
val currentUser: User?,
val replyMessage: Message,
val onLongItemClick: (Message) -> Unit,
val onQuotedMessageClick: (Message) -> Unit,
val modifier: Modifier = Modifier,
)

Expand Down
Loading