From e684d21504906aa9dc4ff682a9a1ec7a5e2d712a Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 30 Oct 2024 00:01:33 +0100 Subject: [PATCH] Reconnect dialog: adapt for horizontal displays --- .../ui/composables/ReconnectUsbDriveDialog.kt | 72 +++++++++++-------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/composables/ReconnectUsbDriveDialog.kt b/app/src/main/java/eu/depau/etchdroid/ui/composables/ReconnectUsbDriveDialog.kt index 493ccc5..bd1d697 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/composables/ReconnectUsbDriveDialog.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/composables/ReconnectUsbDriveDialog.kt @@ -2,9 +2,12 @@ package eu.depau.etchdroid.ui.composables import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialogDefaults import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api @@ -30,56 +33,63 @@ import eu.depau.etchdroid.utils.exception.base.RecoverableException @Composable fun ReconnectUsbDriveDialog(exception: RecoverableException) { BasicAlertDialog( - onDismissRequest = { }, + onDismissRequest = { }, ) { Surface( - shape = AlertDialogDefaults.shape, - color = AlertDialogDefaults.containerColor, - tonalElevation = AlertDialogDefaults.TonalElevation, + shape = AlertDialogDefaults.shape, + color = AlertDialogDefaults.containerColor, + tonalElevation = AlertDialogDefaults.TonalElevation, ) { Column( - modifier = Modifier.Companion.padding(all = 24.dp) + modifier = Modifier.Companion + .padding(all = 24.dp) + .verticalScroll( + rememberScrollState() + ) ) { val context = LocalContext.current Text( - text = exception.getUiMessage(context), - modifier = Modifier.Companion - .padding(bottom = 16.dp) - .align(Alignment.Companion.CenterHorizontally), - textAlign = TextAlign.Companion.Center, - style = MaterialTheme.typography.headlineSmall + text = exception.getUiMessage(context), + modifier = Modifier.Companion + .padding(bottom = 16.dp) + .align(Alignment.Companion.CenterHorizontally), + textAlign = TextAlign.Companion.Center, + style = MaterialTheme.typography.headlineSmall ) Text( - text = stringResource(R.string.to_recover_unplug), - modifier = Modifier.Companion - .padding(bottom = 24.dp) - .align(Alignment.Companion.CenterHorizontally) - .weight(weight = 1f, fill = false), - textAlign = TextAlign.Companion.Center, - style = MaterialTheme.typography.bodyMedium + text = stringResource(R.string.to_recover_unplug), + modifier = Modifier.Companion + .padding(bottom = 24.dp) + .align(Alignment.Companion.CenterHorizontally) + .weight(weight = 1f, fill = false), + textAlign = TextAlign.Companion.Center, + style = MaterialTheme.typography.bodyMedium ) val vectorRes = ImageVector.Companion.vectorResource(R.drawable.unplug_reconnect_accept) Image( - imageVector = vectorRes, - contentDescription = stringResource( - R.string.representation_of_the_required_steps - ), - contentScale = ContentScale.Companion.Fit, - colorFilter = ColorFilter.Companion.tint(AlertDialogDefaults.iconContentColor), - modifier = Modifier.Companion - .fillMaxWidth() - .aspectRatio(vectorRes.defaultWidth / vectorRes.defaultHeight) - .padding(horizontal = 32.dp) + imageVector = vectorRes, + contentDescription = stringResource( + R.string.representation_of_the_required_steps + ), + contentScale = ContentScale.Companion.Fit, + colorFilter = ColorFilter.Companion.tint(AlertDialogDefaults.iconContentColor), + modifier = Modifier.Companion + .fillMaxWidth() + .aspectRatio(vectorRes.defaultWidth / vectorRes.defaultHeight) + .padding(horizontal = 32.dp) ) LinearProgressIndicator( - modifier = Modifier.Companion - .fillMaxWidth() - .padding(vertical = 32.dp) + modifier = Modifier.Companion + .fillMaxWidth() + .padding(vertical = 32.dp) ) RecoverableExceptionExplanationCard(exception = exception) + + // Add a little bit of space so the vertical scroll doesn't clip the shadow + Spacer(modifier = Modifier.Companion.padding(bottom = 4.dp)) } } }