Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -170,11 +170,6 @@ class MessagesActivity : ComponentActivity() {
allowUIAutomationTest = true,
messageComposerTheme = messageComposerTheme.let {
it.copy(
attachmentCancelIcon = it.attachmentCancelIcon.copy(
painter = painterResource(id = R.drawable.stream_compose_ic_clear),
tint = colors.overlayDark,
backgroundColor = colors.appBackground,
),
audioRecording = it.audioRecording.copy(
enabled = true,
showRecordButtonOverSend = false,
Expand Down Expand Up @@ -396,6 +391,7 @@ class MessagesActivity : ComponentActivity() {
messageComposerState = inputState,
onValueChange = { composerViewModel.setMessageInput(it) },
onAttachmentRemoved = { composerViewModel.removeSelectedAttachment(it) },
onLinkPreviewClick = null,
label = {
Row(
Modifier.wrapContentWidth(),
Expand Down
134 changes: 37 additions & 97 deletions stream-chat-android-compose/api/stream-chat-android-compose.api

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LifecycleEventEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
import io.getstream.chat.android.compose.ui.components.CancelIcon
import io.getstream.chat.android.compose.ui.components.ComposerCancelIcon
import io.getstream.chat.android.compose.ui.theme.ChatPreviewTheme
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.viewmodel.messages.AudioPlayerViewModel
Expand Down Expand Up @@ -114,7 +114,7 @@ public fun AudioRecordAttachmentPreviewContentItem(
onThumbDragStart = onThumbDragStart,
onThumbDragStop = onThumbDragStop,
tailContent = {
CancelIcon(
ComposerCancelIcon(
modifier = Modifier
.padding(4.dp),
onClick = { onAttachmentRemoved(currentAttachment) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import io.getstream.chat.android.compose.ui.components.CancelIcon
import io.getstream.chat.android.compose.ui.components.ComposerCancelIcon
import io.getstream.chat.android.compose.ui.components.composer.MessageInput
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.models.Attachment
Expand Down Expand Up @@ -111,7 +111,7 @@ public fun FileAttachmentPreviewContent(
}
}

CancelIcon(
ComposerCancelIcon(
modifier = Modifier.padding(4.dp).testTag("Stream_AttachmentCancelIcon"),
onClick = { onAttachmentRemoved(attachment) },
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import coil3.ColorImage
import coil3.compose.LocalAsyncImagePreviewHandler
import io.getstream.chat.android.compose.ui.components.CancelIcon
import io.getstream.chat.android.compose.ui.components.ComposerCancelIcon
import io.getstream.chat.android.compose.ui.components.composer.MessageInput
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.ui.util.AsyncImagePreviewHandler
Expand Down Expand Up @@ -90,7 +90,7 @@ private fun ImageAttachmentPreviewContentItem(
contentScale = ContentScale.Crop,
)

CancelIcon(
ComposerCancelIcon(
modifier = Modifier
.align(Alignment.TopEnd)
.padding(4.dp),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import androidx.compose.ui.unit.dp
import coil3.ColorImage
import coil3.compose.LocalAsyncImagePreviewHandler
import io.getstream.chat.android.compose.ui.attachments.factory.DefaultPreviewItemOverlayContent
import io.getstream.chat.android.compose.ui.components.CancelIcon
import io.getstream.chat.android.compose.ui.components.ComposerCancelIcon
import io.getstream.chat.android.compose.ui.components.composer.MessageInput
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.ui.util.AsyncImagePreviewHandler
Expand Down Expand Up @@ -116,7 +116,7 @@ private fun MediaAttachmentPreviewItem(

overlayContent(mediaAttachment.type)

CancelIcon(
ComposerCancelIcon(
modifier = Modifier
.align(Alignment.TopEnd)
.padding(4.dp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,17 @@
package io.getstream.chat.android.compose.ui.components

import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Icon
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import io.getstream.chat.android.compose.R
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.ui.util.clickable
Expand All @@ -32,22 +39,29 @@ import io.getstream.chat.android.compose.ui.util.clickable
* @param onClick Handler when the user clicks on the icon.
*/
@Composable
public fun CancelIcon(
public fun ComposerCancelIcon(
modifier: Modifier = Modifier,
onClick: () -> Unit,
) {
val colors = ChatTheme.colors

Icon(
modifier = modifier
.background(
shape = ChatTheme.messageComposerTheme.attachmentCancelIcon.backgroundShape,
color = ChatTheme.messageComposerTheme.attachmentCancelIcon.backgroundColor,
)
.clickable(
bounded = false,
onClick = onClick,
),
painter = ChatTheme.messageComposerTheme.attachmentCancelIcon.painter,
contentDescription = stringResource(id = R.string.stream_compose_cancel),
tint = ChatTheme.messageComposerTheme.attachmentCancelIcon.tint,
.border(2.dp, colors.controlRemoveBorder, CircleShape)
.padding(2.dp)
.background(color = colors.controlRemoveBg, shape = CircleShape)
.size(20.dp)
.clickable(bounded = false, onClick = onClick),
painter = painterResource(R.drawable.stream_compose_ic_cross),
contentDescription = stringResource(R.string.stream_compose_cancel),
tint = colors.controlRemoveIcon,
)
}

@Preview
@Composable
private fun ComposerCancelIconPreview() {
ChatTheme {
ComposerCancelIcon {}
}
}
Loading
Loading