Чат

2026-04-14 10:48:07 +03:00
parent dc051fa9ae
commit d8b0d86534
19 changed files with 504 additions and 184 deletions
@@ -1,8 +1,10 @@
 package core.presentation.components

 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Pause
 import androidx.compose.material.icons.filled.PlayArrow
@@ -21,12 +23,16 @@ import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
 import kotlinx.coroutines.delay

+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.GraphicEq
+import androidx.compose.ui.text.font.FontWeight
+
@Composable
 fun AppAudioPlayer(
    url: String,
    isVoiceMessage: Boolean = false,
    modifier: Modifier = Modifier,
-    contentColor: Color = MaterialTheme.colorScheme.onSurfaceVariant
+    contentColor: Color = Color.White
 ) {
    val context = LocalContext.current
    val exoPlayer = remember {
@@ -42,6 +48,8 @@ fun AppAudioPlayer(
    var duration by remember { mutableLongStateOf(0L) }
    var playbackSpeed by remember { mutableFloatStateOf(1.0f) }

+    val fileName = remember(url) { url.substringAfterLast("/") }
+
    DisposableEffect(Unit) {
        val listener = object : Player.Listener {
            override fun onIsPlayingChanged(playing: Boolean) {
@@ -60,7 +68,6 @@ fun AppAudioPlayer(
        }
    }

-    // Обновление прогресса
    LaunchedEffect(isPlaying) {
        while (isPlaying) {
            currentPosition = exoPlayer.currentPosition
@@ -68,81 +75,129 @@ fun AppAudioPlayer(
        }
    }

-    Row(
+    Column(
        modifier = modifier
            .fillMaxWidth()
-            .padding(vertical = 4.dp),
-        verticalAlignment = Alignment.CenterVertically
+            .clip(RoundedCornerShape(12.dp))
+            .background(Color.Black.copy(alpha = 0.2f))
+            .padding(8.dp)
    ) {
-        IconButton(
-            onClick = {
-                if (isPlaying) exoPlayer.pause() else exoPlayer.play()
-            },
-            modifier = Modifier.size(32.dp)
-        ) {
-            Icon(
-                imageVector = if (isPlaying) Icons.Default.Pause else Icons.Default.PlayArrow,
-                contentDescription = null,
-                tint = contentColor
-            )
-        }
-
-        Column(modifier = Modifier.weight(1f).padding(horizontal = 8.dp)) {
-            Slider(
-                value = if (duration > 0) currentPosition.toFloat() / duration.toFloat() else 0f,
-                onValueChange = {
-                    val newPos = (it * duration).toLong()
-                    exoPlayer.seekTo(newPos)
-                    currentPosition = newPos
-                },
-                modifier = Modifier.height(24.dp),
-                colors = SliderDefaults.colors(
-                    thumbColor = contentColor,
-                    activeTrackColor = contentColor,
-                    inactiveTrackColor = contentColor.copy(alpha = 0.3f)
-                )
-            )
+        if (!isVoiceMessage) {
            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.padding(bottom = 4.dp)
            ) {
-                Text(
-                    text = formatDuration(currentPosition),
-                    fontSize = 10.sp,
-                    color = contentColor.copy(alpha = 0.7f)
+                Icon(
+                    Icons.Default.GraphicEq,
+                    contentDescription = null,
+                    tint = contentColor.copy(alpha = 0.7f),
+                    modifier = Modifier.size(16.dp)
                )
+                Spacer(modifier = Modifier.width(4.dp))
                Text(
-                    text = formatDuration(duration),
-                    fontSize = 10.sp,
-                    color = contentColor.copy(alpha = 0.7f)
+                    text = fileName,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = contentColor,
+                    maxLines = 1,
+                    modifier = Modifier.weight(1f)
                )
            }
        }

-        if (isVoiceMessage) {
-            TextButton(
-                onClick = {
-                    playbackSpeed = when (playbackSpeed) {
-                        1.0f -> 1.5f
-                        1.5f -> 2.0f
-                        else -> 1.0f
-                    }
-                    exoPlayer.playbackParameters = PlaybackParameters(playbackSpeed)
-                },
-                contentPadding = PaddingValues(0.dp),
-                modifier = Modifier.width(40.dp)
+        Row(
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(36.dp)
+                    .clip(CircleShape)
+                    .background(Color.White)
+                    .clickable { if (isPlaying) exoPlayer.pause() else exoPlayer.play() },
+                contentAlignment = Alignment.Center
            ) {
-                Text(
-                    text = "${playbackSpeed}x",
-                    fontSize = 12.sp,
-                    color = contentColor,
-                    style = MaterialTheme.typography.labelSmall
+                Icon(
+                    imageVector = if (isPlaying) Icons.Default.Pause else Icons.Default.PlayArrow,
+                    contentDescription = null,
+                    tint = Color(0xFF3390EC),
+                    modifier = Modifier.size(24.dp)
                )
            }
+
+            Column(
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(horizontal = 12.dp)
+            ) {
+                Slider(
+                    value = if (duration > 0) currentPosition.toFloat() / duration.toFloat() else 0f,
+                    onValueChange = {
+                        val newPos = (it * duration).toLong()
+                        exoPlayer.seekTo(newPos)
+                        currentPosition = newPos
+                    },
+                    modifier = Modifier.height(16.dp),
+                    colors = SliderDefaults.colors(
+                        thumbColor = Color.White,
+                        activeTrackColor = Color.White,
+                        inactiveTrackColor = Color.White.copy(alpha = 0.3f)
+                    )
+                )
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween
+                ) {
+                    Text(
+                        text = formatDuration(currentPosition),
+                        fontSize = 10.sp,
+                        color = contentColor.copy(alpha = 0.7f)
+                    )
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text(
+                            text = "3.3 MB", // Mock size
+                            fontSize = 10.sp,
+                            color = contentColor.copy(alpha = 0.7f)
+                        )
+                        Spacer(modifier = Modifier.width(4.dp))
+                        Icon(
+                            Icons.Default.Download,
+                            contentDescription = null,
+                            tint = contentColor.copy(alpha = 0.7f),
+                            modifier = Modifier.size(12.dp)
+                        )
+                    }
+                }
+            }
+
+            if (isVoiceMessage) {
+                Surface(
+                    onClick = {
+                        playbackSpeed = when (playbackSpeed) {
+                            1.0f -> 1.5f
+                            1.5f -> 2.0f
+                            else -> 1.0f
+                        }
+                        exoPlayer.playbackParameters = PlaybackParameters(playbackSpeed)
+                    },
+                    color = Color.White.copy(alpha = 0.2f),
+                    shape = CircleShape,
+                    modifier = Modifier.size(32.dp)
+                ) {
+                    Box(contentAlignment = Alignment.Center) {
+                        Text(
+                            text = "${if (playbackSpeed % 1.0f == 0.0f) playbackSpeed.toInt() else playbackSpeed}x",
+                            fontSize = 10.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = Color.White
+                        )
+                    }
+                }
+            }
        }
    }
 }

+
 private fun formatDuration(durationMs: Long): String {
    val totalSeconds = durationMs / 1000
    val minutes = totalSeconds / 60
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.*
 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
@@ -23,14 +24,25 @@ fun AppAvatar(
    size: Dp = 48.dp,
    modifier: Modifier = Modifier
 ) {
+    val initials = remember(name) {
+        val words = name.trim().split("\\s+".toRegex())
+        if (words.size >= 2) {
+            (words[0].take(1) + words[1].take(1)).uppercase()
+        } else if (name.length >= 2) {
+            name.take(2).uppercase()
+        } else {
+            name.take(1).uppercase()
+        }
+    }
+
    Box(
        modifier = modifier
            .size(size)
-            .clip(SoftSquareShape) // Тот самый "мягкий квадрат"
-            .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.1f)),
+            .clip(SoftSquareShape)
+            .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.2f)),
        contentAlignment = Alignment.Center
    ) {
-        if (url != null) {
+        if (!url.isNullOrBlank()) {
            AsyncImage(
                model = url,
                contentDescription = name,
@@ -38,13 +50,14 @@ fun AppAvatar(
                contentScale = ContentScale.Crop
            )
        } else {
-            // Заглушка, если нет аватара (первая буква имени)
            Text(
-                text = name.take(1).uppercase(),
+                text = initials,
                color = MaterialTheme.colorScheme.primary,
                fontSize = (size.value * 0.4).sp,
+                fontWeight = androidx.compose.ui.text.font.FontWeight.Bold,
                style = MaterialTheme.typography.titleMedium
            )
        }
    }
 }
+