diff --git a/app/src/main/java/app/myzel394/alibi/ui/Constants.kt b/app/src/main/java/app/myzel394/alibi/ui/Constants.kt index 462cba7..5c4615e 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/Constants.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/Constants.kt @@ -5,7 +5,6 @@ import androidx.compose.ui.unit.dp val BIG_PRIMARY_BUTTON_SIZE = 64.dp -// TODO: Add everywhere val SHEET_BOTTOM_OFFSET = 56.dp val MAX_AMPLITUDE = 20000 val SUPPORTS_DARK_MODE_NATIVELY = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneSelection.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneSelection.kt index 2c45de8..1ec4915 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneSelection.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/MicrophoneSelection.kt @@ -36,6 +36,7 @@ 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.SHEET_BOTTOM_OFFSET 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 @@ -91,7 +92,7 @@ fun MicrophoneSelection( Column( modifier = Modifier .padding(horizontal = 16.dp) - .padding(bottom = 24.dp), + .padding(bottom = SHEET_BOTTOM_OFFSET), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(48.dp), ) { diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/QuickMaxDurationSelector.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/QuickMaxDurationSelector.kt index 4d7695e..bc3ddc2 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/QuickMaxDurationSelector.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/QuickMaxDurationSelector.kt @@ -27,6 +27,7 @@ import app.myzel394.alibi.R import app.myzel394.alibi.dataStore import app.myzel394.alibi.db.AppSettings import app.myzel394.alibi.db.AudioRecorderSettings.Companion.EXAMPLE_MAX_DURATIONS +import app.myzel394.alibi.ui.SHEET_BOTTOM_OFFSET import app.myzel394.alibi.ui.utils.formatDuration import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -52,7 +53,8 @@ fun QuickMaxDurationSelector( Box( modifier = Modifier .widthIn(max = 400.dp) - .padding(16.dp), + .padding(horizontal = 16.dp) + .padding(bottom = SHEET_BOTTOM_OFFSET), ) { Text( stringResource(R.string.ui_recorder_action_changeMaxDuration_title), diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecorderPreparationSheet.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecorderPreparationSheet.kt index 062a8ab..5fb96e8 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecorderPreparationSheet.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecorderPreparationSheet.kt @@ -51,6 +51,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.SHEET_BOTTOM_OFFSET import app.myzel394.alibi.ui.components.RecorderScreen.atoms.CameraPreview import app.myzel394.alibi.ui.components.atoms.GlobalSwitch import app.myzel394.alibi.ui.components.atoms.PermissionRequester @@ -113,7 +114,8 @@ fun VideoRecorderPreparationSheet( } else Column( modifier = Modifier - .padding(horizontal = 16.dp, vertical = 24.dp), + .padding(horizontal = 16.dp) + .padding(bottom = SHEET_BOTTOM_OFFSET, top = 24.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(30.dp), ) {