From e8aa6ccc950fe475fefac92c6856819ae7e8ce3d Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Sat, 6 Jan 2024 17:39:24 +0100 Subject: [PATCH] fix: Make RealtimeAudioVisualizer size more adaptive --- .../RecorderScreen/atoms/RealTimeAudioVisualizer.kt | 9 ++------- .../RecorderScreen/organisms/AudioRecordingStatus.kt | 9 ++++++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RealTimeAudioVisualizer.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RealTimeAudioVisualizer.kt index 52cb542..e1bd20f 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RealTimeAudioVisualizer.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RealTimeAudioVisualizer.kt @@ -4,8 +4,6 @@ import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.tween import androidx.compose.foundation.Canvas -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -34,6 +32,7 @@ private const val GROW_END = BOX_DIFF * 4 @Composable fun RealtimeAudioVisualizer( + modifier: Modifier = Modifier, audioRecorder: AudioRecorderModel, ) { val scope = rememberCoroutineScope() @@ -69,11 +68,7 @@ fun RealtimeAudioVisualizer( audioRecorder.setMaxAmplitudesAmount(ceil(screenWidth.toInt() / BOX_DIFF).toInt() + 1) } - Canvas( - modifier = Modifier - .fillMaxWidth() - .height(300.dp), - ) { + Canvas(modifier = modifier) { val height = this.size.height / 2f val width = this.size.width diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt index eb93d46..3ca5f4d 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.widthIn import androidx.compose.material3.Divider import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -53,7 +54,13 @@ fun AudioRecordingStatus( verticalArrangement = Arrangement.SpaceBetween, ) { Box {} - RealtimeAudioVisualizer(audioRecorder = audioRecorder) + RealtimeAudioVisualizer( + audioRecorder = audioRecorder, + modifier = Modifier + .fillMaxSize() + .widthIn(max = 300.dp) + .weight(1f), + ) RecordingStatus( recordingTime = audioRecorder.recordingTime,