Чат

2026-04-14 10:48:07 +03:00
parent dc051fa9ae
commit d8b0d86534
19 changed files with 504 additions and 184 deletions
@@ -20,6 +20,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import chats.presentation.components.EmojiPicker
 import chats.presentation.components.MessageBubble
+import core.presentation.components.AppAvatar
 import core.utils.VoiceRecorder
 import core.utils.copyUriToFile
 import java.io.File
@@ -67,14 +68,22 @@ fun ChatDetailScreen(
        topBar = {
            TopAppBar(
                title = {
-                    Column {
-                        Text(chatName, style = MaterialTheme.typography.titleMedium)
-                        if (state.isTyping) {
-                            Text(
-                                stringResource(R.string.typing),
-                                style = MaterialTheme.typography.labelSmall,
-                                color = MaterialTheme.colorScheme.primary
-                            )
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        AppAvatar(
+                            url = state.chatAvatar,
+                            name = state.chatName ?: chatName,
+                            size = 36.dp,
+                            modifier = Modifier.padding(end = 8.dp)
+                        )
+                        Column {
+                            Text(state.chatName ?: chatName, style = MaterialTheme.typography.titleMedium)
+                            if (state.isTyping) {
+                                Text(
+                                    stringResource(R.string.typing),
+                                    style = MaterialTheme.typography.labelSmall,
+                                    color = MaterialTheme.colorScheme.primary
+                                )
+                            }
                        }
                    }
                },
@@ -116,9 +125,12 @@ fun ChatDetailScreen(
                    items(state.messages) { message ->
                        MessageBubble(
                            message = message,
-                            isCurrentUser = message.senderId == viewModel.getCurrentUserId()
+                            isCurrentUser = message.senderId == viewModel.getCurrentUserId(),
+                            senderAvatar = if (message.senderId == viewModel.getCurrentUserId()) null else message.senderAvatar,
+                            onReactionClick = { emoji -> viewModel.addReaction(message.id, emoji) }
                        )
                    }
+
                }
                
                if (state.isLoading) {