feat: Mail validation screen

Core2/src/main/res/values-de/strings.xml

@@ -16,6 +16,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+    <string name="anErrorHasOccurred">Ein Fehler ist aufgetreten</string>
     <string name="buttonCancel">Abbrechen</string>
     <string name="buttonNext">Weiter</string>
     <string name="buttonRetry">Wiederholen</string>

Core2/src/main/res/values-es/strings.xml

@@ -16,6 +16,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+    <string name="anErrorHasOccurred">Se ha producido un error</string>
     <string name="buttonCancel">Cancelar</string>
     <string name="buttonNext">Siguiente</string>
     <string name="buttonRetry">Reintentar</string>

Core2/src/main/res/values-fr/strings.xml

@@ -16,6 +16,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+    <string name="anErrorHasOccurred">Une erreur est survenue</string>
     <string name="buttonCancel">Annuler</string>
     <string name="buttonNext">Suivant</string>
     <string name="buttonRetry">Réessayer</string>

Core2/src/main/res/values-it/strings.xml

@@ -16,6 +16,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+    <string name="anErrorHasOccurred">Si è verificato un errore</string>
     <string name="buttonCancel">Annulla</string>
     <string name="buttonNext">Avanti</string>
     <string name="buttonRetry">Riprova</string>

Core2/src/main/res/values/strings.xml

@@ -16,6 +16,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+    <string name="anErrorHasOccurred">An error has occurred</string>
     <string name="buttonCancel">Cancel</string>
     <string name="buttonNext">Next</string>
     <string name="buttonRetry">Retry</string>

app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt

@@ -57,7 +57,7 @@ sealed class NewTransferNavigation : NavigationDestination() {
     @Serializable
     data object TransferTypeDestination : NewTransferNavigation()
     @Serializable
-    data object ValidateUserEmailDestination : NewTransferNavigation()
+    data class ValidateUserEmailDestination(val userEmail: String) : NewTransferNavigation()
 
     @Serializable
     data class UploadProgressDestination(val transferType: TransferTypeUi, val totalSize: Long) : NewTransferNavigation()

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt

@@ -31,6 +31,7 @@ import com.infomaniak.multiplatform_swisstransfer.common.utils.mapToList
 import com.infomaniak.multiplatform_swisstransfer.data.NewUploadSession
 import com.infomaniak.multiplatform_swisstransfer.managers.AppSettingsManager
 import com.infomaniak.multiplatform_swisstransfer.managers.UploadManager
+import com.infomaniak.multiplatform_swisstransfer.network.exceptions.ContainerErrorsException
 import com.infomaniak.sentry.SentryLog
 import com.infomaniak.swisstransfer.di.IoDispatcher
 import com.infomaniak.swisstransfer.ui.screen.main.settings.DownloadLimitOption
@@ -141,11 +142,19 @@ class ImportFilesViewModel @Inject constructor(
                 }
             }.onFailure { exception ->
                 SentryLog.e(TAG, "Failed to start the upload", exception)
-                _sendActionResult.update { SendActionResult.Failure }
+                val result = when (exception) {
+                    is ContainerErrorsException.EmailValidationRequired -> SendActionResult.RequireEmailValidation
+                    else -> SendActionResult.Failure
+                }
+                _sendActionResult.update { result }
             }
         }
     }
 
+    fun setDefaultActionResult() {
+        _sendActionResult.value = SendActionResult.NotStarted
+    }
+
     private suspend fun removeOldData() {
         importationFilesManager.removeLocalCopyFolder()
         uploadManager.removeAllUploadSession()
@@ -262,6 +271,7 @@ class ImportFilesViewModel @Inject constructor(
         data object Pending : SendActionResult()
         data class Success(val totalSize: Long) : SendActionResult()
         data object Failure : SendActionResult()
+        data object RequireEmailValidation : SendActionResult()
     }
 
     companion object {

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt

@@ -25,10 +25,10 @@ import androidx.navigation.toRoute
 import com.infomaniak.swisstransfer.ui.navigation.NewTransferNavigation
 import com.infomaniak.swisstransfer.ui.navigation.NewTransferNavigation.*
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.ImportFilesScreen
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.ValidateUserEmailScreen
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadErrorScreen
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadProgressScreen
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadSuccessScreen
+import com.infomaniak.swisstransfer.ui.screen.newtransfer.validateemail.ValidateUserEmailScreen
 
 @Composable
 fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Unit) {
@@ -40,10 +40,18 @@ fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Un
                 navigateToUploadProgress = { transferType, totalSize ->
                     navController.navigate(UploadProgressDestination(transferType, totalSize))
                 },
+                navigateToEmailValidation = { email ->
+                    navController.navigate(ValidateUserEmailDestination(email))
+                }
             )
         }
         composable<ValidateUserEmailDestination> {
-            ValidateUserEmailScreen()
+            val args = it.toRoute<ValidateUserEmailDestination>()
+            ValidateUserEmailScreen(
+                closeActivity = closeActivity,
+                navigateBack = { navController.popBackStack() },
+                emailToValidate = args.userEmail,
+            )
         }
         composable<UploadProgressDestination> {
             val args = it.toRoute<UploadProgressDestination>()

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt

@@ -59,6 +59,7 @@ fun ImportFilesScreen(
     importFilesViewModel: ImportFilesViewModel = hiltViewModel<ImportFilesViewModel>(),
     closeActivity: () -> Unit,
     navigateToUploadProgress: (transferType: TransferTypeUi, totalSize: Long) -> Unit,
+    navigateToEmailValidation: (email: String) -> Unit,
 ) {
     val files by importFilesViewModel.importedFilesDebounced.collectAsStateWithLifecycle()
     val filesToImportCount by importFilesViewModel.filesToImportCount.collectAsStateWithLifecycle()
@@ -73,7 +74,13 @@ fun ImportFilesScreen(
 
     val sendActionResult by importFilesViewModel.sendActionResult.collectAsStateWithLifecycle()
 
-    HandleSendActionResult({ sendActionResult }, { selectedTransferType }, navigateToUploadProgress)
+    HandleSendActionResult(
+        getSendActionResult = { sendActionResult },
+        setDefaultActionResult = { importFilesViewModel.setDefaultActionResult() },
+        transferType = { selectedTransferType },
+        navigateToUploadProgress = navigateToUploadProgress,
+        navigateToEmailValidation = { navigateToEmailValidation(importFilesViewModel.transferAuthorEmail.get()) },
+    )
 
     LaunchedEffect(Unit) { importFilesViewModel.initTransferOptionsValues() }
 
@@ -133,13 +140,22 @@ fun ImportFilesScreen(
 @Composable
 private fun HandleSendActionResult(
     getSendActionResult: () -> SendActionResult?,
+    setDefaultActionResult: () -> Unit,
     transferType: () -> TransferTypeUi,
     navigateToUploadProgress: (transferType: TransferTypeUi, totalSize: Long) -> Unit,
+    navigateToEmailValidation: () -> Unit,
 ) {
     LaunchedEffect(getSendActionResult()) {
         when (val actionResult = getSendActionResult()) {
-            is SendActionResult.Success -> navigateToUploadProgress(transferType(), actionResult.totalSize)
+            is SendActionResult.Success -> {
+                navigateToUploadProgress(transferType(), actionResult.totalSize)
+                setDefaultActionResult()
+            }
             is SendActionResult.Failure -> Unit // TODO: Show error
+            is SendActionResult.RequireEmailValidation -> {
+                navigateToEmailValidation()
+                setDefaultActionResult()
+            }
             else -> Unit
         }
     }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadProgressAdType.kt

@@ -21,15 +21,13 @@ import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontWeight
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.images.AppImages
 import com.infomaniak.swisstransfer.ui.images.ThemedImage
 import com.infomaniak.swisstransfer.ui.images.illus.uploadAd.MetallicSafe
 import com.infomaniak.swisstransfer.ui.images.illus.uploadAd.MountainGondola
 import com.infomaniak.swisstransfer.ui.images.illus.uploadAd.SwissWithFlag
+import com.infomaniak.swisstransfer.ui.utils.TextUtils
 
 enum class UploadProgressAdType(
     @StringRes private val descriptionTemplate: Int,
@@ -54,17 +52,6 @@ enum class UploadProgressAdType(
 
     @Composable
     fun description(): AnnotatedString {
-        val template = stringResource(descriptionTemplate)
-        val templateArgument = stringResource(descriptionAccentuatedPart)
-
-        val description = String.format(template, templateArgument)
-
-        val startIndex = description.indexOf(templateArgument)
-        val endIndex = startIndex + templateArgument.length
-
-        return buildAnnotatedString {
-            append(description)
-            addStyle(style = SpanStyle(fontWeight = FontWeight.Bold), start = startIndex, end = endIndex)
-        }
+        return TextUtils.assembleWithBoldArgument(stringResource(descriptionTemplate), stringResource(descriptionAccentuatedPart))
     }
 }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/validateemail/HideSelectAllTextToolbar.kt

@@ -0,0 +1,64 @@
+/*
+ * Infomaniak SwissTransfer - Android
+ * Copyright (C) 2024 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.swisstransfer.ui.screen.newtransfer.validateemail
+
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.platform.TextToolbar
+import androidx.compose.ui.platform.TextToolbarStatus
+
+class HideSelectAllTextToolbar(private val previousToolbar: TextToolbar) : TextToolbar {
+    override val status: TextToolbarStatus get() = previousToolbar.status
+
+    override fun showMenu(
+        rect: Rect,
+        onCopyRequested: (() -> Unit)?,
+        onPasteRequested: (() -> Unit)?,
+        onCutRequested: (() -> Unit)?,
+        onSelectAllRequested: (() -> Unit)?,
+        onAutofillRequested: (() -> Unit)?,
+    ) {
+        previousToolbar.showMenu(
+            rect,
+            onCopyRequested,
+            onPasteRequested,
+            onCutRequested,
+            null, // Disable "Select All"
+            onAutofillRequested,
+        )
+    }
+
+    override fun showMenu(
+        rect: Rect,
+        onCopyRequested: (() -> Unit)?,
+        onPasteRequested: (() -> Unit)?,
+        onCutRequested: (() -> Unit)?,
+        onSelectAllRequested: (() -> Unit)?
+    ) {
+        previousToolbar.showMenu(
+            rect,
+            onCopyRequested,
+            onPasteRequested,
+            onCutRequested,
+            null, // Disable "Select All"
+        )
+    }
+
+    override fun hide() {
+        previousToolbar.hide()
+    }
+}