feat(TransferType): Keep transfer type in the DB when at user's choice

Infomaniak · Nov 13, 2024 · 44070f8 · 44070f8
1 parent 6d1c9c2
commit 44070f8
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 38 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt
@@ -19,7 +19,7 @@ package com.infomaniak.swisstransfer.ui.navigation
 
 import android.os.Bundle
 import androidx.navigation.NavBackStackEntry
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferType
+import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi
 import kotlinx.serialization.Serializable
 import kotlin.reflect.KClass
 import kotlin.reflect.full.primaryConstructor
@@ -60,9 +60,9 @@ sealed class NewTransferNavigation : NavigationDestination() {
     data object ValidateUserEmailDestination : NewTransferNavigation()
 
     @Serializable
-    data class UploadProgressDestination(val transferType: TransferType, val totalSize: Long) : NewTransferNavigation()
+    data class UploadProgressDestination(val transferType: TransferTypeUi, val totalSize: Long) : NewTransferNavigation()
     @Serializable
-    data class UploadSuccessDestination(val transferType: TransferType, val transferUrl: String) : NewTransferNavigation()
+    data class UploadSuccessDestination(val transferType: TransferTypeUi, val transferUrl: String) : NewTransferNavigation()
     @Serializable
     data object UploadErrorDestination : NewTransferNavigation()
 

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt
@@ -43,7 +43,8 @@ import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOp
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.PasswordTransferOption
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.TransferOptionState
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.TransferOptionsCallbacks
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferType
+import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi
+import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi.Companion.toTransferTypeUi
 import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks
 import com.infomaniak.swisstransfer.workers.UploadWorker
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -155,10 +156,11 @@ class ImportFilesViewModel @Inject constructor(
     }
 
     //region Transfer Type
-    val selectedTransferType = savedStateHandle.getStateFlow(SELECTED_TRANSFER_TYPE, TransferType.LINK)
+    val selectedTransferType = savedStateHandle.getStateFlow(SELECTED_TRANSFER_TYPE, TransferTypeUi.QR_CODE)
 
-    fun selectTransferType(type: TransferType) {
+    fun selectTransferType(type: TransferTypeUi) {
         savedStateHandle[SELECTED_TRANSFER_TYPE] = type
+        viewModelScope.launch(ioDispatcher) { appSettingsManager.setLastTransferType(type.dbValue) }
     }
     //endregion
 
@@ -205,6 +207,7 @@ class ImportFilesViewModel @Inject constructor(
                 selectTransferValidityPeriod(it.validityPeriod.toTransferOption())
                 selectTransferDownloadLimit(it.downloadLimit.toTransferOption())
                 selectTransferLanguage(it.emailLanguage.toTransferOption())
+                selectTransferType(it.lastTransferType.toTransferTypeUi())
             } ?: run {
                 SentryLog.e(TAG, "AppSettings is null in ImportFilesScreen, it should not happened")
                 selectTransferValidityPeriod(ValidityPeriodOption.THIRTY)

diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
@@ -58,7 +58,7 @@ private const val TOTAL_FILE_SIZE: Long = 50_000_000_000L
 fun ImportFilesScreen(
     importFilesViewModel: ImportFilesViewModel = hiltViewModel<ImportFilesViewModel>(),
     closeActivity: () -> Unit,
-    navigateToUploadProgress: (transferType: TransferType, totalSize: Long) -> Unit,
+    navigateToUploadProgress: (transferType: TransferTypeUi, totalSize: Long) -> Unit,
 ) {
     val files by importFilesViewModel.importedFilesDebounced.collectAsStateWithLifecycle()
     val filesToImportCount by importFilesViewModel.filesToImportCount.collectAsStateWithLifecycle()
@@ -120,8 +120,8 @@ fun ImportFilesScreen(
 @Composable
 private fun HandleSendActionResult(
     getSendActionResult: () -> SendActionResult?,
-    transferType: () -> TransferType,
-    navigateToUploadProgress: (transferType: TransferType, totalSize: Long) -> Unit,
+    transferType: () -> TransferTypeUi,
+    navigateToUploadProgress: (transferType: TransferTypeUi, totalSize: Long) -> Unit,
 ) {
     LaunchedEffect(getSendActionResult()) {
         when (val actionResult = getSendActionResult()) {
@@ -137,7 +137,7 @@ private fun ImportFilesScreen(
     files: () -> List<FileUi>,
     filesToImportCount: () -> Int,
     currentSessionFilesCount: () -> Int,
-    selectedTransferType: GetSetCallbacks<TransferType>,
+    selectedTransferType: GetSetCallbacks<TransferTypeUi>,
     transferOptionsCallbacks: TransferOptionsCallbacks,
     removeFileByUid: (uid: String) -> Unit,
     addFiles: (List<Uri>) -> Unit,
@@ -213,7 +213,7 @@ private fun ImportFilesScreen(
 }
 
 @Composable
-private fun ColumnScope.ImportTextFields(selectedTransferType: () -> TransferType) {
+private fun ColumnScope.ImportTextFields(selectedTransferType: () -> TransferTypeUi) {
 
     EmailAddressesTextFields(selectedTransferType)
 
@@ -226,9 +226,9 @@ private fun ColumnScope.ImportTextFields(selectedTransferType: () -> TransferTyp
 }
 
 @Composable
-private fun ColumnScope.EmailAddressesTextFields(selectedTransferType: () -> TransferType) {
+private fun ColumnScope.EmailAddressesTextFields(selectedTransferType: () -> TransferTypeUi) {
 
-    val shouldShowEmailAddressesFields by remember { derivedStateOf { selectedTransferType() == TransferType.MAIL } }
+    val shouldShowEmailAddressesFields by remember { derivedStateOf { selectedTransferType() == TransferTypeUi.MAIL } }
 
     AnimatedVisibility(visible = shouldShowEmailAddressesFields) {
         Column {
@@ -375,7 +375,7 @@ private fun Preview(@PreviewParameter(FileUiListPreviewParameter::class) files:
             files = { files },
             filesToImportCount = { 0 },
             currentSessionFilesCount = { 0 },
-            selectedTransferType = GetSetCallbacks(get = { TransferType.QR_CODE }, set = {}),
+            selectedTransferType = GetSetCallbacks(get = { TransferTypeUi.QR_CODE }, set = {}),
             transferOptionsCallbacks = transferOptionsCallbacks,
             removeFileByUid = {},
             addFiles = {},

diff --git a/...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButton.kt b/...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButton.kt
@@ -32,7 +32,7 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark
 
 @Composable
 fun TransferTypeButton(
-    transferType: TransferType,
+    transferType: TransferTypeUi,
     isActive: () -> Boolean,
     onClick: () -> Unit,
 ) {
@@ -63,7 +63,7 @@ private fun TransferTypeButtonPreview() {
     SwissTransferTheme {
         Surface {
             Column {
-                TransferType.entries.forEach { entry ->
+                TransferTypeUi.entries.forEach { entry ->
                     TransferTypeButton(
                         transferType = entry,
                         isActive = { entry.ordinal == 0 },

diff --git a/...omaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt b/...omaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt
@@ -27,6 +27,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import com.infomaniak.multiplatform_swisstransfer.common.models.TransferType
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
 import com.infomaniak.swisstransfer.ui.images.icons.Chain
@@ -39,12 +40,12 @@ import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks
 import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark
 
 @Composable
-fun TransferTypeButtons(transferType: GetSetCallbacks<TransferType>) {
+fun TransferTypeButtons(transferType: GetSetCallbacks<TransferTypeUi>) {
     Row(
         modifier = Modifier.horizontalScroll(rememberScrollState()),
         horizontalArrangement = Arrangement.spacedBy(Margin.Mini),
     ) {
-        for (transferTypeEntry in TransferType.entries) {
+        for (transferTypeEntry in TransferTypeUi.entries) {
             TransferTypeButton(
                 transferType = transferTypeEntry,
                 isActive = { transferTypeEntry == transferType.get() },
@@ -54,44 +55,58 @@ fun TransferTypeButtons(transferType: GetSetCallbacks<TransferType>) {
     }
 }
 
-enum class TransferType(
+enum class TransferTypeUi(
     val buttonIcon: ImageVector,
     @StringRes val buttonTextRes: Int,
     @StringRes val titleRes: Int,
     @StringRes @PluralsRes val descriptionRes: Int?,
+    val dbValue: TransferType,
 ) {
-    LINK(
-        buttonIcon = AppIcons.Chain,
-        buttonTextRes = R.string.transferTypeLink,
-        titleRes = R.string.uploadSuccessLinkTitle,
-        descriptionRes = R.string.uploadSuccessLinkDescription,
-    ),
     QR_CODE(
         buttonIcon = AppIcons.QrCode,
         buttonTextRes = R.string.transferTypeQrCode,
         titleRes = R.string.uploadSuccessQrTitle,
         descriptionRes = null,
+        dbValue = TransferType.QR_CODE,
+    ),
+    LINK(
+        buttonIcon = AppIcons.Chain,
+        buttonTextRes = R.string.transferTypeLink,
+        titleRes = R.string.uploadSuccessLinkTitle,
+        descriptionRes = R.string.uploadSuccessLinkDescription,
+        dbValue = TransferType.LINK,
     ),
     PROXIMITY(
         buttonIcon = AppIcons.WifiWave,
         buttonTextRes = R.string.transferTypeProximity,
         titleRes = R.string.uploadSuccessLinkTitle,
         descriptionRes = R.string.uploadSuccessLinkDescription,
+        dbValue = TransferType.PROXIMITY,
     ),
     MAIL(
         buttonIcon = AppIcons.Envelope,
         buttonTextRes = R.string.transferTypeEmail,
         titleRes = R.string.uploadSuccessEmailTitle,
         descriptionRes = R.plurals.uploadSuccessEmailDescription,
-    ),
+        dbValue = TransferType.MAIL,
+    );
+
+    companion object {
+        fun TransferType.toTransferTypeUi() = when(this) {
+            TransferType.LINK -> LINK
+            TransferType.QR_CODE -> QR_CODE
+            TransferType.PROXIMITY -> PROXIMITY
+            TransferType.MAIL -> MAIL
+        }
+    }
 }
 
 @PreviewLightAndDark
 @Composable
 private fun TransferTypeButtonsPreview() {
     SwissTransferTheme {
         Surface {
-            TransferTypeButtons(GetSetCallbacks(get = { TransferType.QR_CODE }, set = {}))
+            TransferTypeButtons(GetSetCallbacks(get = { TransferTypeUi.QR_CODE }, set = {}))
         }
     }
 }
diff --git a/...ava/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessEmailScreen.kt b/...ava/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessEmailScreen.kt
@@ -31,7 +31,7 @@ import com.infomaniak.swisstransfer.ui.components.*
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus
 import com.infomaniak.swisstransfer.ui.images.illus.beers.Beers
 import com.infomaniak.swisstransfer.ui.previewparameter.emailsPreviewData
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferType
+import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
@@ -62,8 +62,8 @@ fun UploadSuccessEmailScreen(
 
             IllustratedMessageBlock(
                 icon = AppIllus.Beers.image(),
-                title = TransferType.MAIL.titleRes,
-                description = pluralStringResource(TransferType.MAIL.descriptionRes!!, emails.count()),
+                title = TransferTypeUi.MAIL.titleRes,
+                description = pluralStringResource(TransferTypeUi.MAIL.descriptionRes!!, emails.count()),
             )
 
             Spacer(modifier = Modifier.height(Margin.Medium))

diff --git a/...n/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessQrScreen.kt b/...n/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessQrScreen.kt
@@ -34,15 +34,15 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.components.*
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus
 import com.infomaniak.swisstransfer.ui.images.illus.beers.Beers
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferType
+import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.components.ShareAndCopyButtons
 import com.infomaniak.swisstransfer.ui.theme.Dimens
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
 
 @Composable
-fun UploadSuccessQrScreen(transferType: TransferType, transferUrl: String, closeActivity: () -> Unit) {
+fun UploadSuccessQrScreen(transferType: TransferTypeUi, transferUrl: String, closeActivity: () -> Unit) {
     val snackbarHostState = remember { SnackbarHostState() }
 
     BottomStickyButtonScaffold(
@@ -70,7 +70,7 @@ fun UploadSuccessQrScreen(transferType: TransferType, transferUrl: String, close
 }
 
 @Composable
-private fun ColumnScope.SuccessMessage(transferType: TransferType, transferUrl: String) {
+private fun ColumnScope.SuccessMessage(transferType: TransferTypeUi, transferUrl: String) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
@@ -115,7 +115,7 @@ private fun UploadSuccessQrScreenPreview() {
     SwissTransferTheme {
         Surface {
             UploadSuccessQrScreen(
-                transferType = TransferType.LINK,
+                transferType = TransferTypeUi.QR_CODE,
                 transferUrl = "https://chk.me/83azQOl",
                 closeActivity = {}
             )

diff --git a/...ain/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessScreen.kt b/...ain/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessScreen.kt
@@ -20,19 +20,19 @@ package com.infomaniak.swisstransfer.ui.screen.newtransfer.upload
 import androidx.activity.compose.BackHandler
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferType
+import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
 
 @Composable
 fun UploadSuccessScreen(
-    transferType: TransferType,
+    transferType: TransferTypeUi,
     transferUrl: String,
     closeActivity: () -> Unit,
 ) {
     BackHandler(onBack = closeActivity)
 
-    if (transferType == TransferType.MAIL) {
+    if (transferType == TransferTypeUi.MAIL) {
         UploadSuccessEmailScreen(closeActivity = closeActivity)
     } else {
         UploadSuccessQrScreen(transferType, transferUrl, closeActivity)
@@ -45,7 +45,7 @@ private fun UploadSuccessScreenPreview() {
     SwissTransferTheme {
         Surface {
             UploadSuccessScreen(
-                transferType = TransferType.QR_CODE,
+                transferType = TransferTypeUi.QR_CODE,
                 transferUrl = "https://chk.me/83azQOl",
                 closeActivity = {}
             )