feat: Add confirmation when trying to leave the new transfer flow

Don't let them escape!
Infomaniak · Dec 16, 2024 · 87feb4a · 87feb4a
1 parent b9cff14
commit 87feb4a
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 28 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferAlertDialog.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferAlertDialog.kt
@@ -31,15 +31,35 @@ import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.core2.R as RCore2
 
+object SwissTransferAlertDialogDefaults {
+    @Composable
+    fun confirmButton(isEnabled: () -> Boolean = { true }, onClick: () -> Unit) {
+        SmallButton(
+            title = stringResource(R.string.buttonConfirm),
+            enabled = isEnabled,
+            onClick = onClick,
+        )
+    }
+
+    @Composable
+    fun cancelButton(onClick: () -> Unit) {
+        SmallButton(
+            style = ButtonType.TERTIARY,
+            title = stringResource(RCore2.string.buttonCancel),
+            onClick = onClick,
+        )
+    }
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SwissTransferAlertDialog(
     modifier: Modifier = Modifier,
     @StringRes titleRes: Int,
     @StringRes descriptionRes: Int,
+    positiveButton: @Composable () -> Unit,
+    negativeButton: @Composable () -> Unit,
     onDismiss: () -> Unit,
-    onConfirmation: () -> Unit,
-    isConfirmButtonEnabled: () -> Boolean = { true },
     content: @Composable (ColumnScope.() -> Unit)? = null,
 ) {
     BasicAlertDialog(
@@ -52,11 +72,10 @@ fun SwissTransferAlertDialog(
             BasicAlertDialogContent(
                 modifier = modifier,
                 titleRes = titleRes,
+                positiveButton = positiveButton,
+                negativeButton = negativeButton,
                 descriptionRes = descriptionRes,
                 additionalContent = content,
-                onDismiss = onDismiss,
-                onConfirmation = onConfirmation,
-                isConfirmButtonEnabled = isConfirmButtonEnabled,
             )
         }
     }
@@ -67,10 +86,9 @@ private fun BasicAlertDialogContent(
     modifier: Modifier,
     @StringRes titleRes: Int,
     @StringRes descriptionRes: Int,
+    positiveButton: @Composable () -> Unit,
+    negativeButton: @Composable () -> Unit,
     additionalContent: @Composable (ColumnScope.() -> Unit)? = null,
-    onDismiss: () -> Unit,
-    onConfirmation: () -> Unit,
-    isConfirmButtonEnabled: () -> Boolean = { true },
 ) {
     Column(modifier.padding(Margin.Large)) {
         TitleAndDescription(titleRes, descriptionRes)
@@ -79,7 +97,7 @@ private fun BasicAlertDialogContent(
             it()
             Spacer(Modifier.height(Margin.Mini))
         }
-        ActionButtons(onDismiss, onConfirmation, isConfirmButtonEnabled)
+        ActionButtons(positiveButton, negativeButton)
     }
 }
 
@@ -99,23 +117,17 @@ private fun TitleAndDescription(titleRes: Int, descriptionRes: Int) {
 }
 
 @Composable
-private fun ActionButtons(onDismissRequest: () -> Unit, onConfirmation: () -> Unit, isEnabled: () -> Boolean) {
+private fun ActionButtons(
+    positiveButton: @Composable () -> Unit,
+    negativeButton: @Composable () -> Unit,
+) {
     Row(
         modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.End,
+        horizontalArrangement = Arrangement.spacedBy(Margin.Micro, Alignment.End),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        SmallButton(
-            style = ButtonType.TERTIARY,
-            title = stringResource(RCore2.string.buttonCancel),
-            onClick = onDismissRequest,
-        )
-        Spacer(Modifier.width(Margin.Micro))
-        SmallButton(
-            title = stringResource(R.string.buttonConfirm),
-            onClick = onConfirmation,
-            enabled = isEnabled
-        )
+        negativeButton()
+        positiveButton()
     }
 }
 
@@ -127,8 +139,9 @@ private fun PreviewAlertDialog() {
             SwissTransferAlertDialog(
                 titleRes = R.string.settingsOptionPassword,
                 descriptionRes = R.string.settingsPasswordDescription,
+                positiveButton = { SwissTransferAlertDialogDefaults.confirmButton { } },
+                negativeButton = { SwissTransferAlertDialogDefaults.cancelButton { } },
                 onDismiss = {},
-                onConfirmation = {},
             )
         }
     }

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferScreen.kt
@@ -18,20 +18,56 @@
 package com.infomaniak.swisstransfer.ui.screen.newtransfer
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.res.stringResource
 import androidx.navigation.compose.rememberNavController
+import com.infomaniak.swisstransfer.R
+import com.infomaniak.swisstransfer.ui.components.ButtonType
+import com.infomaniak.swisstransfer.ui.components.SmallButton
+import com.infomaniak.swisstransfer.ui.components.SwissTransferAlertDialog
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
 
 @Composable
 fun NewTransferScreen(closeActivity: () -> Unit) {
     val navController = rememberNavController()
-    NewTransferNavHost(navController, closeActivity)
+    var displayConfirmationDialog by rememberSaveable { mutableStateOf(false) }
+
+    NewTransferNavHost(navController, closeActivity = { displayConfirmationDialog = true })
+
+    if (displayConfirmationDialog) ConfirmLeavingDialog(onLeave = closeActivity, onCancel = { displayConfirmationDialog = false })
+}
+
+@Composable
+fun ConfirmLeavingDialog(onLeave: () -> Unit, onCancel: () -> Unit) {
+    SwissTransferAlertDialog(
+        titleRes = R.string.newTransferConfirmLeavingDialogTitle,
+        descriptionRes = R.string.newTransferLeavingDialogDescription,
+        positiveButton = {
+            SmallButton(
+                title = stringResource(R.string.newTransferLeavingDialogPositiveButton),
+                style = ButtonType.ERROR,
+                onClick = onLeave,
+            )
+        },
+        negativeButton = {
+            SmallButton(
+                title = stringResource(R.string.newTransferLeavingDialogNegativeButton),
+                style = ButtonType.TERTIARY,
+                onClick = onCancel,
+            )
+        },
+        onDismiss = onCancel,
+    )
 }
 
 @PreviewAllWindows
 @Composable
-private fun NewTransferPreview() {
+private fun Preview() {
     SwissTransferTheme {
-        NewTransferScreen {}
+        ConfirmLeavingDialog({}, {})
     }
 }
diff --git a/...k/swisstransfer/ui/screen/newtransfer/importfiles/components/PasswordOptionAlertDialog.kt b/...k/swisstransfer/ui/screen/newtransfer/importfiles/components/PasswordOptionAlertDialog.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.MatomoSwissTransfer.toFloat
 import com.infomaniak.swisstransfer.ui.components.SwissTransferAlertDialog
+import com.infomaniak.swisstransfer.ui.components.SwissTransferAlertDialogDefaults
 import com.infomaniak.swisstransfer.ui.components.SwissTransferTextField
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.PasswordTransferOption
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.components.WeightOneSpacer
@@ -72,9 +73,14 @@ fun PasswordOptionAlertDialog(
     SwissTransferAlertDialog(
         titleRes = R.string.settingsOptionPassword,
         descriptionRes = R.string.settingsPasswordDescription,
+        positiveButton = {
+            SwissTransferAlertDialogDefaults.confirmButton(
+                isEnabled = { !isPasswordActivated || isPasswordValid() },
+                onClick = ::onConfirmButtonClicked,
+            )
+        },
+        negativeButton = { SwissTransferAlertDialogDefaults.cancelButton(onClick = ::onDismiss) },
         onDismiss = ::onDismiss,
-        onConfirmation = ::onConfirmButtonClicked,
-        isConfirmButtonEnabled = { !isPasswordActivated || isPasswordValid() },
     ) {
         ActivatePasswordSwitch(isChecked = isPasswordActivated, onCheckedChange = { isPasswordActivated = it })
         Spacer(Modifier.height(Margin.Medium))

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -46,6 +46,10 @@
     <string name="messageHeader">Nachricht:</string>
     <string name="myFilesTitle">Meine Dateien</string>
     <string name="networkUnavailable">Auf Netzwerk warten</string>
+    <string name="newTransferConfirmLeavingDialogTitle">Ups, willst du wirklich abbrechen?</string>
+    <string name="newTransferLeavingDialogDescription">Dein Transfer ist fast fertig. Bist du sicher, dass du alles rückgängig machen willst?</string>
+    <string name="newTransferLeavingDialogNegativeButton">Nein, weiter</string>
+    <string name="newTransferLeavingDialogPositiveButton">Ja, abbrechen</string>
     <string name="noFileDescription">Fügt bis zu 50 GB an Dateien hinzu</string>
     <string name="noFileTitle">Keine Datei, keine Übertragung!</string>
     <string name="noSettingsSelectedDescription">Wählt einen Parameter zur Anzeige aus</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -46,6 +46,10 @@
     <string name="messageHeader">Mensaje:</string>
     <string name="myFilesTitle">Mis archivos</string>
     <string name="networkUnavailable">Esperando la red</string>
+    <string name="newTransferConfirmLeavingDialogTitle">Ups, ¿realmente quieres cancelar?</string>
+    <string name="newTransferLeavingDialogDescription">Tu traslado está casi listo. ¿Estás seguro de que quieres cancelarlo?</string>
+    <string name="newTransferLeavingDialogNegativeButton">No, continúe</string>
+    <string name="newTransferLeavingDialogPositiveButton">Sí, cancelar</string>
     <string name="noFileDescription">Añade hasta 50 GB de archivos</string>
     <string name="noFileTitle">Si no hay archivo, no hay transferencia.</string>
     <string name="noSettingsSelectedDescription">Selecciona un parámetro para su visualización</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -47,6 +47,10 @@
     <string name="messageHeader">Message :</string>
     <string name="myFilesTitle">Mes fichiers</string>
     <string name="networkUnavailable">En attente de réseau</string>
+    <string name="newTransferConfirmLeavingDialogTitle">Oups, tu veux vraiment annuler ?</string>
+    <string name="newTransferLeavingDialogDescription">Ton transfert est presque prêt. Es-tu sûr de vouloir tout annuler ?</string>
+    <string name="newTransferLeavingDialogNegativeButton">Non, continuer</string>
+    <string name="newTransferLeavingDialogPositiveButton">Oui, annuler</string>
     <string name="noFileDescription">Ajoute jusqu’à 50 Go de fichiers</string>
     <string name="noFileTitle">Pas de fichier, pas de transfert !</string>
     <string name="noSettingsSelectedDescription">Sélectionne un paramètre pour l’afficher</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -46,6 +46,10 @@
     <string name="messageHeader">Messaggio:</string>
     <string name="myFilesTitle">I miei file</string>
     <string name="networkUnavailable">In attesa della rete</string>
+    <string name="newTransferConfirmLeavingDialogTitle">Ops, vuoi davvero cancellarti?</string>
+    <string name="newTransferLeavingDialogDescription">Il trasferimento è quasi pronto. Sei sicuro di volerlo annullare?</string>
+    <string name="newTransferLeavingDialogNegativeButton">No, continua</string>
+    <string name="newTransferLeavingDialogPositiveButton">Sì, annulla</string>
     <string name="noFileDescription">Aggiungere fino a 50 GB di file</string>
     <string name="noFileTitle">Nessun file, nessun trasferimento!</string>
     <string name="noSettingsSelectedDescription">Seleziona un parametro da visualizzare</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -50,6 +50,10 @@
     <string name="messageHeader">Message:</string>
     <string name="myFilesTitle">My files</string>
     <string name="networkUnavailable">Waiting for network</string>
+    <string name="newTransferConfirmLeavingDialogTitle">Oops, do you really want to cancel?</string>
+    <string name="newTransferLeavingDialogDescription">Your transfer is almost ready. Are you sure you want to cancel it?</string>
+    <string name="newTransferLeavingDialogNegativeButton">No, continue</string>
+    <string name="newTransferLeavingDialogPositiveButton">Yes, cancel</string>
     <string name="noFileDescription">Add up to 50 GB of files</string>
     <string name="noFileTitle">No file, no transfer!</string>
     <string name="noSettingsSelectedDescription">Select a parameter to display it</string>