From 39458bd76ce44c6cf13f275b459d205ebc4f914f Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Sat, 23 Mar 2024 14:06:51 +0100 Subject: [PATCH] fix: Improve design Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com> --- .../organisms/VideoRecordingStatus.kt | 106 +++++++++--------- 1 file changed, 52 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/VideoRecordingStatus.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/VideoRecordingStatus.kt index 9ddcad3..9009a99 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/VideoRecordingStatus.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/VideoRecordingStatus.kt @@ -54,64 +54,31 @@ fun VideoRecordingStatus( when (orientation) { Configuration.ORIENTATION_LANDSCAPE -> { - Box { - Row( - modifier = Modifier.fillMaxSize(), - horizontalArrangement = Arrangement.SpaceEvenly, - verticalAlignment = Alignment.CenterVertically, + Row( + modifier = Modifier.fillMaxSize(), + horizontalArrangement = Arrangement.SpaceEvenly, + verticalAlignment = Alignment.CenterVertically, + ) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement + .spacedBy(32.dp), + modifier = Modifier + .weight(1f) + .fillMaxWidth(0.9f) + .align(Alignment.CenterVertically), + ) { + _VideoGeneralInfo(videoRecorder) + _VideoRecordingStatus(videoRecorder) + } + Box( + modifier = Modifier + .weight(1f) + .fillMaxWidth(0.9f) ) { Column( - horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement .spacedBy(32.dp), - modifier = Modifier - .weight(1f) - .fillMaxWidth(0.9f) - .align(Alignment.CenterVertically), - ) { - _VideoGeneralInfo(videoRecorder) - _VideoRecordingStatus(videoRecorder) - } - Box( - modifier = Modifier - .weight(1f) - .fillMaxWidth(0.9f) - ) { - Column( - verticalArrangement = Arrangement - .spacedBy(32.dp), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - _VideoControls(videoRecorder) - HorizontalDivider() - _PrimitiveControls(videoRecorder) - } - } - } - } - } - - else -> { - Box { - Column( - modifier = Modifier - .fillMaxSize() - .padding(bottom = 32.dp), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.SpaceBetween, - ) { - Column( - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement - .spacedBy(16.dp), - ) { - _VideoGeneralInfo(videoRecorder) - _VideoRecordingStatus(videoRecorder) - } - - Column( - verticalArrangement = Arrangement - .spacedBy(16.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { _VideoControls(videoRecorder) @@ -121,6 +88,37 @@ fun VideoRecordingStatus( } } } + + else -> { + Column( + modifier = Modifier + .fillMaxSize() + .padding(bottom = 32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.SpaceBetween, + ) { + Box {} + + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement + .spacedBy(16.dp), + ) { + _VideoGeneralInfo(videoRecorder) + _VideoRecordingStatus(videoRecorder) + } + + Column( + verticalArrangement = Arrangement + .spacedBy(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + _VideoControls(videoRecorder) + HorizontalDivider() + _PrimitiveControls(videoRecorder) + } + } + } } }