From df0bb35672ef38fe97ff74803708d6cae06c57bc Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Sat, 16 Dec 2023 23:44:28 +0100 Subject: [PATCH] feat: Don't show RecordingControl until recording ready --- .../organisms/VideoRecordingStatus.kt | 48 ++++++++++--------- .../alibi/ui/models/VideoRecorderModel.kt | 1 - 2 files changed, 26 insertions(+), 23 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 d34ad62..8c7eb91 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 @@ -140,31 +140,35 @@ fun VideoRecordingStatus( Divider() - RecordingControl( - isPaused = videoRecorder.isPaused, - recordingTime = videoRecorder.recordingTime, - onDelete = { - scope.launch { - runCatching { - videoRecorder.stopRecording(context) + if (!videoRecorder.isStartingRecording) { + RecordingControl( + isPaused = videoRecorder.isPaused, + recordingTime = videoRecorder.recordingTime, + onDelete = { + scope.launch { + runCatching { + videoRecorder.stopRecording(context) + } + runCatching { + videoRecorder.destroyService(context) + } + videoRecorder.batchesFolder!!.deleteRecordings() } - runCatching { - videoRecorder.destroyService(context) + }, + onPauseResume = { + if (videoRecorder.isPaused) { + videoRecorder.resumeRecording() + } else { + videoRecorder.pauseRecording() } - videoRecorder.batchesFolder!!.deleteRecordings() + }, + onSave = { + videoRecorder.onRecordingSave(false) } - }, - onPauseResume = { - if (videoRecorder.isPaused) { - videoRecorder.resumeRecording() - } else { - videoRecorder.pauseRecording() - } - }, - onSave = { - videoRecorder.onRecordingSave(false) - } - ) + ) + } else { + Box {} + } } } } \ No newline at end of file diff --git a/app/src/main/java/app/myzel394/alibi/ui/models/VideoRecorderModel.kt b/app/src/main/java/app/myzel394/alibi/ui/models/VideoRecorderModel.kt index 9868527..701faf9 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/models/VideoRecorderModel.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/models/VideoRecorderModel.kt @@ -8,7 +8,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import app.myzel394.alibi.db.AppSettings import app.myzel394.alibi.db.RecordingInformation import app.myzel394.alibi.enums.RecorderState import app.myzel394.alibi.helpers.VideoBatchesFolder