diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/AudioVisualizer.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/AudioVisualizer.kt similarity index 92% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/AudioVisualizer.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/AudioVisualizer.kt index 6ec7f0c..771c5ac 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/AudioVisualizer.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/AudioVisualizer.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.fillMaxWidth @@ -29,7 +29,7 @@ fun AudioVisualizer( val width = this.size.width val boxWidth = width / amplitudes.size - amplitudes.forEachIndexed {index, amplitude -> + amplitudes.forEachIndexed { index, amplitude -> val x = boxWidth * index val amplitudePercentage = (amplitude.toFloat() / MAX_AMPLITUDE).coerceAtMost(1f) val boxHeight = height * amplitudePercentage diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/CameraPreview.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/CameraPreview.kt similarity index 95% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/CameraPreview.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/CameraPreview.kt index 494db91..d0530ac 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/CameraPreview.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/CameraPreview.kt @@ -1,6 +1,5 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms -import android.view.MotionEvent import android.view.ViewGroup import androidx.camera.core.CameraSelector import androidx.camera.core.Preview diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/CameraSelectionButton.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/CameraSelectionButton.kt similarity index 96% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/CameraSelectionButton.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/CameraSelectionButton.kt index d8a332a..7a13c3c 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/CameraSelectionButton.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/CameraSelectionButton.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.Spring @@ -25,9 +25,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import app.myzel394.alibi.R import app.myzel394.alibi.ui.utils.CameraInfo @Composable diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/ConfirmDeletionDialog.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/ConfirmDeletionDialog.kt similarity index 97% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/ConfirmDeletionDialog.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/ConfirmDeletionDialog.kt index e57ae51..f43a657 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/ConfirmDeletionDialog.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/ConfirmDeletionDialog.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/DeleteButton.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/DeleteButton.kt similarity index 81% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/DeleteButton.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/DeleteButton.kt index 9c4b4df..24e5463 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/DeleteButton.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/DeleteButton.kt @@ -1,13 +1,7 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneDisconnectedDialog.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneDisconnectedDialog.kt similarity index 96% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneDisconnectedDialog.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneDisconnectedDialog.kt index e15cba5..a844b0f 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneDisconnectedDialog.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneDisconnectedDialog.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.MicOff diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneReconnectedDialog.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneReconnectedDialog.kt similarity index 94% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneReconnectedDialog.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneReconnectedDialog.kt index b8825ac..ab30290 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneReconnectedDialog.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneReconnectedDialog.kt @@ -1,7 +1,6 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.MicOff import androidx.compose.material.icons.filled.Star import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneSelectionButton.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneSelectionButton.kt similarity index 90% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneSelectionButton.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneSelectionButton.kt index 47b0ca2..3550013 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneSelectionButton.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneSelectionButton.kt @@ -1,20 +1,14 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import android.os.Build -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer 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.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.MicExternalOn -import androidx.compose.material.icons.filled.Warning import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Icon diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneTypeIcon.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneTypeIcon.kt similarity index 80% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneTypeIcon.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneTypeIcon.kt index e54a5a1..76042bd 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/MicrophoneTypeIcon.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/MicrophoneTypeIcon.kt @@ -1,14 +1,10 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms -import android.R import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.BluetoothAudio -import androidx.compose.material.icons.filled.Memory import androidx.compose.material.icons.filled.Mic import androidx.compose.material.icons.filled.MicExternalOn -import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Smartphone -import androidx.compose.material.icons.filled.Warning import androidx.compose.material3.Icon import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/PauseResumeButton.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/PauseResumeButton.kt similarity index 86% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/PauseResumeButton.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/PauseResumeButton.kt index 653645c..b7ef237 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/PauseResumeButton.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/PauseResumeButton.kt @@ -1,12 +1,10 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Pause import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon -import androidx.compose.material3.LargeFloatingActionButton -import androidx.compose.material3.SmallFloatingActionButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/RealTimeAudioVisualizer.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RealTimeAudioVisualizer.kt similarity index 97% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/RealTimeAudioVisualizer.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RealTimeAudioVisualizer.kt index 7e9a2f7..52cb542 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/RealTimeAudioVisualizer.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RealTimeAudioVisualizer.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.LinearEasing @@ -19,7 +19,6 @@ import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp -import app.myzel394.alibi.services.RecorderService import app.myzel394.alibi.ui.MAX_AMPLITUDE import app.myzel394.alibi.ui.models.AudioRecorderModel import app.myzel394.alibi.ui.utils.clamp diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/RecordingTime.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RecordingTime.kt similarity index 92% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/RecordingTime.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RecordingTime.kt index 3e3a21f..8bf5e16 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/RecordingTime.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RecordingTime.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -17,7 +17,6 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import app.myzel394.alibi.ui.components.atoms.Pulsating -import app.myzel394.alibi.ui.models.AudioRecorderModel import app.myzel394.alibi.ui.utils.formatDuration @Composable diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/SaveButton.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/SaveButton.kt similarity index 82% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/SaveButton.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/SaveButton.kt index 0a65bcc..7304bf9 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/SaveButton.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/SaveButton.kt @@ -1,9 +1,6 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.atoms +package app.myzel394.alibi.ui.components.RecorderScreen.atoms import androidx.compose.foundation.layout.Spacer -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.layout.width import androidx.compose.material.icons.Icons @@ -18,9 +15,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.unit.dp import app.myzel394.alibi.R -import app.myzel394.alibi.ui.BIG_PRIMARY_BUTTON_SIZE @Composable fun SaveButton( diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/AudioRecordingStart.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/AudioRecordingStart.kt similarity index 97% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/AudioRecordingStart.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/AudioRecordingStart.kt index 7528c1e..6eebedd 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/AudioRecordingStart.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/AudioRecordingStart.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.molecules +package app.myzel394.alibi.ui.components.RecorderScreen.molecules import android.Manifest import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/CamerasSelection.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/CamerasSelection.kt similarity index 72% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/CamerasSelection.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/CamerasSelection.kt index 527da47..764498e 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/CamerasSelection.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/CamerasSelection.kt @@ -1,26 +1,10 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.molecules +package app.myzel394.alibi.ui.components.RecorderScreen.molecules -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Camera -import androidx.compose.material.icons.filled.Person -import androidx.compose.material.icons.filled.Videocam -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.RadioButton -import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp import app.myzel394.alibi.R -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.CameraSelectionButton +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.CameraSelectionButton import app.myzel394.alibi.ui.models.VideoRecorderSettingsModel import app.myzel394.alibi.ui.utils.CameraInfo diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/MicrophoneSelection.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneSelection.kt similarity index 95% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/MicrophoneSelection.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneSelection.kt index df055ce..9250e07 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/MicrophoneSelection.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneSelection.kt @@ -1,13 +1,10 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.molecules +package app.myzel394.alibi.ui.components.RecorderScreen.molecules import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize -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.layout.width @@ -38,8 +35,8 @@ import androidx.compose.ui.unit.dp import app.myzel394.alibi.R import app.myzel394.alibi.dataStore import app.myzel394.alibi.db.AppSettings -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.MicrophoneSelectionButton -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.MicrophoneTypeInfo +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.MicrophoneSelectionButton +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.MicrophoneTypeInfo import app.myzel394.alibi.ui.components.atoms.MessageBox import app.myzel394.alibi.ui.components.atoms.MessageType import app.myzel394.alibi.ui.models.AudioRecorderModel diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/MicrophoneStatus.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneStatus.kt similarity index 78% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/MicrophoneStatus.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneStatus.kt index 8966224..11513bb 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/MicrophoneStatus.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneStatus.kt @@ -1,21 +1,15 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.molecules +package app.myzel394.alibi.ui.components.RecorderScreen.molecules -import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.compose.ui.platform.LocalContext -import app.myzel394.alibi.dataStore -import app.myzel394.alibi.db.AppSettings -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.MicrophoneDisconnectedDialog -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.MicrophoneReconnectedDialog +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.MicrophoneDisconnectedDialog +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.MicrophoneReconnectedDialog import app.myzel394.alibi.ui.effects.rememberPrevious import app.myzel394.alibi.ui.models.AudioRecorderModel -import app.myzel394.alibi.ui.utils.MicrophoneInfo @Composable fun MicrophoneStatus( diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/VideoRecorderPreparationSheet.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecorderPreparationSheet.kt similarity index 84% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/VideoRecorderPreparationSheet.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecorderPreparationSheet.kt index 46bdb18..5826aa0 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/VideoRecorderPreparationSheet.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecorderPreparationSheet.kt @@ -1,55 +1,34 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.molecules +package app.myzel394.alibi.ui.components.RecorderScreen.molecules -import android.graphics.Point import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background -import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.detectTapGestures -import androidx.compose.foundation.gestures.forEachGesture -import androidx.compose.foundation.gestures.waitForUpOrCancellation -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxSize 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.layout.width import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Camera import androidx.compose.material.icons.filled.CameraAlt -import androidx.compose.material.icons.filled.Person -import androidx.compose.material.icons.filled.Videocam -import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.RadioButton import androidx.compose.material3.Text import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip -import androidx.compose.ui.input.pointer.PointerEvent -import androidx.compose.ui.input.pointer.PointerInputChange import androidx.compose.ui.input.pointer.pointerInput -import androidx.compose.ui.input.pointer.pointerInteropFilter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription @@ -60,7 +39,7 @@ import androidx.compose.ui.window.Popup import androidx.lifecycle.viewmodel.compose.viewModel import app.myzel394.alibi.R import app.myzel394.alibi.ui.BIG_PRIMARY_BUTTON_SIZE -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.CameraPreview +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.CameraPreview import app.myzel394.alibi.ui.components.atoms.GlobalSwitch import app.myzel394.alibi.ui.models.VideoRecorderSettingsModel import app.myzel394.alibi.ui.utils.CameraInfo diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/VideoRecordingStart.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecordingStart.kt similarity index 97% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/VideoRecordingStart.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecordingStart.kt index 6abb1d9..897ae27 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/molecules/VideoRecordingStart.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecordingStart.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.molecules +package app.myzel394.alibi.ui.components.RecorderScreen.molecules import android.Manifest import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/organisms/RecordingStatus.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecordingStatus.kt similarity index 81% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/organisms/RecordingStatus.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecordingStatus.kt index d76154d..dd973a7 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/organisms/RecordingStatus.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecordingStatus.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.organisms +package app.myzel394.alibi.ui.components.RecorderScreen.organisms import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.material3.LinearProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -24,21 +23,14 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import app.myzel394.alibi.dataStore -import app.myzel394.alibi.db.AppSettings -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.DeleteButton -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.MicrophoneDisconnectedDialog -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.MicrophoneReconnectedDialog -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.PauseResumeButton -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.RealtimeAudioVisualizer -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.RecordingTime -import app.myzel394.alibi.ui.components.AudioRecorder.atoms.SaveButton -import app.myzel394.alibi.ui.components.AudioRecorder.molecules.MicrophoneSelection -import app.myzel394.alibi.ui.components.AudioRecorder.molecules.MicrophoneStatus -import app.myzel394.alibi.ui.effects.rememberPrevious +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.DeleteButton +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.PauseResumeButton +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.RealtimeAudioVisualizer +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.RecordingTime +import app.myzel394.alibi.ui.components.RecorderScreen.atoms.SaveButton +import app.myzel394.alibi.ui.components.RecorderScreen.molecules.MicrophoneStatus import app.myzel394.alibi.ui.models.AudioRecorderModel import app.myzel394.alibi.ui.utils.KeepScreenOn -import app.myzel394.alibi.ui.utils.MicrophoneInfo import kotlinx.coroutines.delay import java.time.LocalDateTime diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/organisms/StartRecording.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/StartRecording.kt similarity index 95% rename from app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/organisms/StartRecording.kt rename to app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/StartRecording.kt index 77c1b30..e6f7f50 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/organisms/StartRecording.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/StartRecording.kt @@ -1,4 +1,4 @@ -package app.myzel394.alibi.ui.components.AudioRecorder.organisms +package app.myzel394.alibi.ui.components.RecorderScreen.organisms import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,8 +29,8 @@ import androidx.compose.ui.unit.dp import app.myzel394.alibi.R import app.myzel394.alibi.db.AppSettings import app.myzel394.alibi.ui.BIG_PRIMARY_BUTTON_SIZE -import app.myzel394.alibi.ui.components.AudioRecorder.molecules.AudioRecordingStart -import app.myzel394.alibi.ui.components.AudioRecorder.molecules.VideoRecordingStart +import app.myzel394.alibi.ui.components.RecorderScreen.molecules.AudioRecordingStart +import app.myzel394.alibi.ui.components.RecorderScreen.molecules.VideoRecordingStart import app.myzel394.alibi.ui.effects.rememberForceUpdateOnLifeCycleChange import app.myzel394.alibi.ui.models.AudioRecorderModel import app.myzel394.alibi.ui.models.VideoRecorderModel diff --git a/app/src/main/java/app/myzel394/alibi/ui/screens/RecorderScreen.kt b/app/src/main/java/app/myzel394/alibi/ui/screens/RecorderScreen.kt index 69dc3b1..36e4b25 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/screens/RecorderScreen.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/screens/RecorderScreen.kt @@ -37,8 +37,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import app.myzel394.alibi.ui.components.AudioRecorder.organisms.RecordingStatus -import app.myzel394.alibi.ui.components.AudioRecorder.organisms.StartRecording +import app.myzel394.alibi.ui.components.RecorderScreen.organisms.RecordingStatus +import app.myzel394.alibi.ui.components.RecorderScreen.organisms.StartRecording import app.myzel394.alibi.ui.enums.Screen import app.myzel394.alibi.ui.utils.rememberFileSaverDialog import app.myzel394.alibi.R