Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,11 @@ public final class io/getstream/chat/android/compose/ui/components/messages/Comp
public final class io/getstream/chat/android/compose/ui/components/messages/ComposableSingletons$MessageTextKt {
public static final field INSTANCE Lio/getstream/chat/android/compose/ui/components/messages/ComposableSingletons$MessageTextKt;
public fun <init> ()V
public final fun getLambda$-1569101361$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-261803629$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-399958751$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$1734337819$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$1973807821$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$552887520$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
}

public final class io/getstream/chat/android/compose/ui/components/messages/ComposableSingletons$PollMessageContentKt {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Text
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -111,7 +112,7 @@ public fun FileAttachmentContent(
.background(color, fileAttachmentShape)
}
.combinedClickable(
indication = null,
indication = ripple(),
interactionSource = remember { MutableInteractionSource() },
onClick = { onItemClick(previewHandlers, attachment) },
onLongClick = { attachmentState.onLongItemClick(message) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Text
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.remember
Expand Down Expand Up @@ -123,7 +124,7 @@ public fun GiphyAttachmentContent(
.clip(RoundedCornerShape(StreamTokens.radiusLg))
}
.combinedClickable(
indication = null,
indication = ripple(),
interactionSource = remember { MutableInteractionSource() },
onClick = {
onItemClick(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.remember
Expand Down Expand Up @@ -111,7 +112,7 @@ public fun LinkAttachmentContent(
.clip(RoundedCornerShape(StreamTokens.radiusLg))
.background(MessageStyling.attachmentBackgroundColor(state.isMine))
.combinedClickable(
indication = null,
indication = ripple(),
interactionSource = remember { MutableInteractionSource() },
onClick = {
onItemClick(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -61,6 +64,7 @@ import io.getstream.chat.android.compose.ui.theme.MessageRegularContentParams
import io.getstream.chat.android.compose.ui.theme.MessageStyling
import io.getstream.chat.android.compose.ui.theme.MessageTextContentParams
import io.getstream.chat.android.compose.ui.theme.StreamTokens
import io.getstream.chat.android.compose.ui.util.passiveRipple
import io.getstream.chat.android.compose.ui.util.shouldBeDisplayedAsFullSizeAttachment
import io.getstream.chat.android.models.Message
import io.getstream.chat.android.models.User
Expand Down Expand Up @@ -179,20 +183,25 @@ internal fun DefaultMessageRegularContent(
) {
val componentFactory = ChatTheme.componentFactory

Column(horizontalAlignment = messageAlignment.contentAlignment) {
Column(
modifier = Modifier.passiveRipple(),
horizontalAlignment = messageAlignment.contentAlignment,
) {
val quotedMessage = message.replyTo
if (quotedMessage != null) {
componentFactory.MessageQuotedContent(
params = MessageQuotedContentParams(
message = quotedMessage,
currentUser = currentUser,
replyMessage = message,
modifier = Modifier.combinedClickable(
interactionSource = remember(::MutableInteractionSource),
indication = null,
onLongClick = { onLongItemClick(message) },
onClick = { onQuotedMessageClick(quotedMessage) },
),
modifier = Modifier
.clip(RoundedCornerShape(StreamTokens.radiusLg))
.combinedClickable(
interactionSource = remember(::MutableInteractionSource),
indication = ripple(),
onLongClick = { onLongItemClick(message) },
onClick = { onQuotedMessageClick(quotedMessage) },
),
),
)
}
Expand Down
Loading
Loading