Fixed waveforms, they are now drawn in bounds

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>

Author: rapterjet2004

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -924,10 +924,12 @@ class ChatActivity :
                                 //  mediaController logic to viewModel, the goal is to avoid launching coroutines in
                                 //  the ChatActivity. I want to clean up the whole syncVoice thing with Player.Listener
                                 onVoicePlayPauseClick = { onVoiceClick(it) },
-                                onVoiceSeek = { _, progress ->
+                                onVoiceSeek = { id, progress ->
                                     mediaController?.let { controller ->
-                                        val pos = controller.duration * progress / 100f
-                                        controller.seekTo(pos.toLong())
+                                        if (id.toString() == controller.currentMediaItem?.mediaId) {
+                                            val pos = controller.duration * progress / 100f
+                                            controller.seekTo(pos.toLong())
+                                        }
                                     }},
                                 onVoiceSpeedClick = { onVoiceSpeedClickCompose(it) },
 
@@ -1131,16 +1133,20 @@ class ChatActivity :
             message: ChatMessage
         ): Boolean {
             val currentMessageId = message.jsonMessageId.toString()
-            if (controller.currentMediaItem?.mediaId != currentMessageId) {
-                val filename = message.fileParameters.name
-                if (filename.isEmpty()) {
-                    return true
-                }
+            val filename = message.fileParameters.name
+            if (filename.isEmpty()) {
+                return true
+            }
+
+            val file = FileUtils.resolveSharedAttachmentFile(context.cacheDir, filename) ?: return true
+            val fileURI = file.toUri()
+            val filePath = fileURI.toString()
 
-                val file = FileUtils.resolveSharedAttachmentFile(context.cacheDir, filename) ?: return true
-                val fileURI = file.toUri()
-                val filePath = fileURI.toString()
+            chatViewModel.syncVoiceMessageUiState(message.apply {
+                voiceMessageDuration = getAudioDuration(filePath).toInt()
+            })
 
+            if (controller.currentMediaItem?.mediaId != currentMessageId) {
                 if (!file.exists()) {
                     downloadFileToCache(message, true) {
                         setupAndPlay(controller, message, filePath)
@@ -1160,6 +1166,10 @@ class ChatActivity :
             val message = chatViewModel.getMessageById(messageId.toLong()).first()
 
             mediaController?.let { controller ->
+                // If a message is still playing, it must be paused first before another can be loaded
+                val currentMessageId = message.jsonMessageId.toString()
+                if (controller.isPlaying && controller.currentMediaItem?.mediaId != currentMessageId) return@launch
+
                 chatViewModel.currentVoiceMessage = message
 
                 // If the controller is playing a new voice message, initialize

app/src/main/java/com/nextcloud/talk/ui/ComposeWaveformSeekbar.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -50,16 +51,18 @@ fun ComposeWaveformSeekBar(value: Float, onValueChange: (Float) -> Unit, modifie
                     .drawWithCache {
                         onDrawBehind {
                             val height = this.size.height
-                            val width = this.size.width
+                            val width = this.size.width + 8.dp.value
                             val midpoint = (this.size.height / 2f)
 
                             val barGap = (width - waveData.size * barWidth) / (waveData.size - 1).toFloat() + 1
                             for (i in waveData.indices) {
                                 val x: Float = i * (barWidth + barGap)
-                                val y: Float = waveData[i] * height
 
-                                // TODO - figure out why the thumb is offset early on and fix this
-                                val isXBeforeThumb = (x / this.size.width) <= value + 0.08
+                                if (x < 0f || x > size.width) continue
+
+                                val y: Float = (waveData[i] * height).coerceIn(0f, midpoint)
+
+                                val isXBeforeThumb = x <= value * width
 
                                 drawLine(
                                     if (isXBeforeThumb) inversePrimary else onPrimaryContainer,
@@ -94,7 +97,8 @@ fun Preview() {
         {},
         modifier = Modifier
             .height(MAX_HEIGHT.dp)
-            .fillMaxWidth(),
+            .fillMaxWidth()
+            .padding(8.dp),
         waveData,
         true
     )

app/src/main/java/com/nextcloud/talk/ui/chat/VoiceMessage.kt

@@ -68,7 +68,7 @@ fun VoiceMessage(
             remember(inversePrimaryColor) { inversePrimaryColor.toArgb() }
             val onPrimaryContainerColor = colorScheme.onPrimaryContainer
             remember(onPrimaryContainerColor) { onPrimaryContainerColor.toArgb() }
-            val remainingSeconds = (typeContent.playedSeconds) // FIXME - make this to count down eventually
+            val remainingSeconds = (typeContent.durationSeconds - typeContent.playedSeconds)
             val waveformData = remember(typeContent.waveform) {
                 val floatArr = typeContent.waveform.toFloatArray()
                 if (floatArr.size < WAVEFORM_SIZE) {
@@ -119,7 +119,7 @@ fun VoiceMessage(
                             .fillMaxWidth()
                             .padding(8.dp), // or weight(1f),
                         waveformData,
-                        enabled = typeContent.isPlaying,
+                        enabled = true,
                     )
 
                     TextButton(