Чат, правки

2026-04-14 12:52:03 +03:00
parent d7e75797ef
commit 2d0bc0d75c
12 changed files with 89 additions and 34 deletions
@@ -21,6 +21,7 @@ import androidx.compose.ui.unit.dp
 import chats.presentation.components.EmojiPicker
 import chats.presentation.components.MessageBubble
 import core.presentation.components.AppAvatar
+import core.presentation.components.AppMediaLightbox
 import core.utils.VoiceRecorder
 import core.utils.copyUriToFile
 import java.io.File
@@ -46,6 +47,9 @@ fun ChatDetailScreen(
    
    var autoPlayingMessageId by remember { mutableStateOf<String?>(null) }
    var currentPlaybackSpeed by remember { mutableFloatStateOf(1.0f) }
+    
+    var selectedMediaList by remember { mutableStateOf<List<chats.domain.model.Media>?>(null) }
+    var initialMediaIndex by remember { mutableIntStateOf(0) }

    val playNextVoiceMessage = { currentId: String, speed: Float ->
        val currentIndex = state.messages.indexOfFirst { it.id == currentId }
@@ -150,14 +154,27 @@ fun ChatDetailScreen(
                    contentPadding = PaddingValues(16.dp),
                    verticalArrangement = Arrangement.spacedBy(8.dp)
                ) {
-                    items(state.messages) { message ->
+                    val allChatMedia = state.messages.flatMap { msg -> 
+                        msg.media.filter { 
+                            it.type.startsWith("image") || 
+                            it.type.startsWith("video") || 
+                            it.filename?.endsWith(".gif", true) == true
+                        }.map { it to msg.id } 
+                    }.reversed()
+
+                    items(state.messages, key = { it.id }) { message ->
                        MessageBubble(
                            message = message,
                            isCurrentUser = message.senderId == viewModel.getCurrentUserId(),
                            autoPlay = message.id == autoPlayingMessageId,
                            initialPlaybackSpeed = if (message.id == autoPlayingMessageId) currentPlaybackSpeed else 1.0f,
                            onVoiceFinished = { speed -> playNextVoiceMessage(message.id, speed) },
-                            onReactionClick = { emoji -> viewModel.addReaction(message.id, emoji) }
+                            onReactionClick = { emoji -> viewModel.addReaction(message.id, emoji) },
+                            onMediaClick = { clickedMedia ->
+                                val initialIndex = allChatMedia.indexOfFirst { it.first.url == clickedMedia.url }
+                                selectedMediaList = allChatMedia.map { it.first }
+                                initialMediaIndex = if (initialIndex != -1) initialIndex else 0
+                            }
                        )
                    }

@@ -233,5 +250,14 @@ fun ChatDetailScreen(
                }
            }
        }
+
+        // Просмотрщик медиа
+        selectedMediaList?.let { list ->
+            AppMediaLightbox(
+                mediaList = list,
+                initialIndex = initialMediaIndex,
+                onClose = { selectedMediaList = null }
+            )
+        }
    }
 }