From 69bf195674fbc4aa7cd034c978cc1a55911381be Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Mon, 3 Mar 2025 15:37:40 +0100 Subject: [PATCH] chore: Move files --- app/proguard-rules.pro | 2 +- .../infomaniak/swisstransfer/ui/LaunchActivity.kt | 2 +- .../swisstransfer/ui/NewTransferActivity.kt | 2 +- .../main/transferdetails/TransferDetailsScreen.kt | 2 +- .../EmailTextFieldCallbacks.kt | 2 +- .../PasswordTransferOption.kt | 2 +- .../newtransfer/pickfiles/PickFilesScreen.kt | 15 +++++++-------- .../newtransfer/pickfiles/PickFilesViewModel.kt | 8 ++------ .../TransferOptionState.kt | 4 ++-- .../TransferOptionsBottomSheets.kt | 4 ++-- .../TransferOptionsCallbacks.kt | 2 +- .../components/BringIntoViewRow.kt | 2 +- .../components/EmailAddressTextField.kt | 2 +- .../components/ImportedFilesCard.kt | 2 +- .../components/PasswordAlertDialogs.kt | 4 ++-- .../components/TransferOptionType.kt | 2 +- .../components/TransferOptionsTypes.kt | 6 +++--- .../components/TransferTypeButton.kt | 2 +- .../components/TransferTypeButtons.kt | 4 ++-- .../newtransfer/upload/UploadOngoingScreen.kt | 2 +- .../newtransfer/upload/UploadRetryScreen.kt | 2 +- .../upload/UploadSuccessEmailScreen.kt | 2 +- .../newtransfer/upload/UploadSuccessQrScreen.kt | 2 +- .../newtransfer/upload/UploadSuccessScreen.kt | 2 +- .../swisstransfer/ui/utils/NotificationsUtils.kt | 2 +- .../swisstransfer/upload/NewTransferParams.kt | 2 +- .../swisstransfer/upload/UploadState.kt | 2 +- 27 files changed, 40 insertions(+), 45 deletions(-) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/EmailTextFieldCallbacks.kt (95%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/PasswordTransferOption.kt (94%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/TransferOptionState.kt (84%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/TransferOptionsBottomSheets.kt (97%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/TransferOptionsCallbacks.kt (94%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/BringIntoViewRow.kt (96%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/EmailAddressTextField.kt (99%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/ImportedFilesCard.kt (98%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/PasswordAlertDialogs.kt (97%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/TransferOptionType.kt (97%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/TransferOptionsTypes.kt (94%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/TransferTypeButton.kt (97%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/{importfiles => pickfiles}/components/TransferTypeButtons.kt (95%) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 96356f816..21d8e8ea1 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -21,4 +21,4 @@ #-renamesourcefileattribute SourceFile # The TransferTypeUi class is removed when minifying, we don't want that. --keep class com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi{*;} +-keep class com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi{*;} diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt index e72d4804a..306b97c8f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt @@ -28,7 +28,7 @@ import com.infomaniak.multiplatform_swisstransfer.SharedApiUrlCreator import com.infomaniak.multiplatform_swisstransfer.managers.AppSettingsManager import com.infomaniak.multiplatform_swisstransfer.managers.UploadManager import com.infomaniak.swisstransfer.ui.navigation.* -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi.Companion.toTransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi.Companion.toTransferTypeUi import com.infomaniak.swisstransfer.ui.utils.* import com.infomaniak.swisstransfer.upload.UploadForegroundService import com.infomaniak.swisstransfer.upload.UploadState diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt index c6915f0c1..9fbf16871 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt @@ -31,7 +31,7 @@ import com.infomaniak.core.utils.enumValueOfOrNull import com.infomaniak.swisstransfer.ui.navigation.* import com.infomaniak.swisstransfer.ui.screen.newtransfer.NewTransferOpenManager import com.infomaniak.swisstransfer.ui.screen.newtransfer.NewTransferScreen -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt index 288649223..2a54c05b4 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt @@ -62,7 +62,7 @@ import com.infomaniak.swisstransfer.ui.screen.main.transferdetails.components.Pa import com.infomaniak.swisstransfer.ui.screen.main.transferdetails.components.QrCodeBottomSheet import com.infomaniak.swisstransfer.ui.screen.main.transferdetails.components.TransferInfo import com.infomaniak.swisstransfer.ui.screen.main.transfers.NoSelectionEmptyState -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.DeeplinkPasswordAlertDialog +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.DeeplinkPasswordAlertDialog import com.infomaniak.swisstransfer.ui.theme.LocalWindowAdaptiveInfo import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/EmailTextFieldCallbacks.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/EmailTextFieldCallbacks.kt similarity index 95% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/EmailTextFieldCallbacks.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/EmailTextFieldCallbacks.kt index 2fe0a752f..465c09b0a 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/EmailTextFieldCallbacks.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/EmailTextFieldCallbacks.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/PasswordTransferOption.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PasswordTransferOption.kt similarity index 94% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/PasswordTransferOption.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PasswordTransferOption.kt index f4c89f428..2fe7d095c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/PasswordTransferOption.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PasswordTransferOption.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesScreen.kt index 63907029e..7e92f241d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesScreen.kt @@ -48,14 +48,13 @@ import com.infomaniak.swisstransfer.ui.previewparameter.FileUiListPreviewParamet import com.infomaniak.swisstransfer.ui.screen.main.settings.DownloadLimitOption import com.infomaniak.swisstransfer.ui.screen.main.settings.EmailLanguageOption import com.infomaniak.swisstransfer.ui.screen.main.settings.ValidityPeriodOption -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.DownloadLimitBottomSheet -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.EmailLanguageBottomSheet -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.EmailTextFieldCallbacks -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.ValidityPeriodBottomSheet -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.* +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.EmailAddressTextField +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.ImportedFilesCard +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.PasswordOptionAlertDialog +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferOptionType +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferOptionsTypes +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeButtons +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesViewModel.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesViewModel.kt index b7b9e27e1..10b4b72c1 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesViewModel.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/PickFilesViewModel.kt @@ -49,12 +49,8 @@ import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOp import com.infomaniak.swisstransfer.ui.screen.newtransfer.NewTransferOpenManager import com.infomaniak.swisstransfer.ui.screen.newtransfer.PickedFile import com.infomaniak.swisstransfer.ui.screen.newtransfer.ThumbnailsLocalStorage -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.EmailTextFieldCallbacks -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.TransferTypeUi -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi.Companion.toTransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi.Companion.toTransferTypeUi import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.PickFilesViewModel.CanSendStatus.No.EmailIssue import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks import com.infomaniak.swisstransfer.upload.NewTransferParams diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionState.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionState.kt similarity index 84% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionState.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionState.kt index 4d1e5e68e..2287261ca 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionState.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionState.kt @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferOptionType +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferOptionType data class TransferOptionState( val transferOptionType: TransferOptionType, diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionsBottomSheets.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionsBottomSheets.kt similarity index 97% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionsBottomSheets.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionsBottomSheets.kt index 989435b5f..d0675d2a3 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionsBottomSheets.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionsBottomSheets.kt @@ -1,6 +1,6 @@ /* * Infomaniak SwissTransfer - Android - * Copyright (C) 2024 Infomaniak Network SA + * Copyright (C) 2024-2025 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Surface diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionsCallbacks.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionsCallbacks.kt similarity index 94% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionsCallbacks.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionsCallbacks.kt index c8f470bb4..d4fc36b7b 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferOptionsCallbacks.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/TransferOptionsCallbacks.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/BringIntoViewRow.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/BringIntoViewRow.kt similarity index 96% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/BringIntoViewRow.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/BringIntoViewRow.kt index 5dd25f918..c90d93ce6 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/BringIntoViewRow.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/BringIntoViewRow.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/EmailAddressTextField.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/EmailAddressTextField.kt similarity index 99% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/EmailAddressTextField.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/EmailAddressTextField.kt index 164630a21..d9976d4ba 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/EmailAddressTextField.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/EmailAddressTextField.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import androidx.compose.animation.animateColorAsState import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/ImportedFilesCard.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/ImportedFilesCard.kt similarity index 98% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/ImportedFilesCard.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/ImportedFilesCard.kt index 8dc1dffda..c187cb63a 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/ImportedFilesCard.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/ImportedFilesCard.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import android.os.Parcelable import androidx.compose.foundation.layout.* diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/PasswordAlertDialogs.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/PasswordAlertDialogs.kt similarity index 97% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/PasswordAlertDialogs.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/PasswordAlertDialogs.kt index 1ed26c7de..f23a517ef 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/PasswordAlertDialogs.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/PasswordAlertDialogs.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import androidx.annotation.StringRes import androidx.compose.animation.AnimatedVisibility @@ -37,7 +37,7 @@ 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.pickfiles.PasswordTransferOption import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.components.WeightOneSpacer import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferOptionType.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferOptionType.kt similarity index 97% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferOptionType.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferOptionType.kt index 91475b991..685de93ad 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferOptionType.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferOptionType.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferOptionsTypes.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferOptionsTypes.kt similarity index 94% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferOptionsTypes.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferOptionsTypes.kt index c627ffdff..e61395b23 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferOptionsTypes.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferOptionsTypes.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import androidx.annotation.StringRes import androidx.compose.foundation.layout.padding @@ -36,8 +36,8 @@ import com.infomaniak.swisstransfer.ui.images.icons.SpeechBubble import com.infomaniak.swisstransfer.ui.screen.main.settings.DownloadLimitOption import com.infomaniak.swisstransfer.ui.screen.main.settings.EmailLanguageOption import com.infomaniak.swisstransfer.ui.screen.main.settings.ValidityPeriodOption -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.pickfiles.PasswordTransferOption +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.TransferOptionState import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButton.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferTypeButton.kt similarity index 97% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButton.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferTypeButton.kt index 67ba31e08..b5fffb0e5 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButton.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferTypeButton.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import androidx.compose.foundation.border import androidx.compose.foundation.layout.* diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferTypeButtons.kt similarity index 95% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferTypeButtons.kt index 8cd48df7b..17be0509d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/pickfiles/components/TransferTypeButtons.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components +package com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components import androidx.annotation.PluralsRes import androidx.annotation.StringRes @@ -32,7 +32,7 @@ import com.infomaniak.swisstransfer.ui.images.icons.Chain import com.infomaniak.swisstransfer.ui.images.icons.Envelope import com.infomaniak.swisstransfer.ui.images.icons.QrCode import com.infomaniak.swisstransfer.ui.images.icons.WifiWave -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi.Companion.toTransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi.Companion.toTransferTypeUi import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.GetSetCallbacks diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadOngoingScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadOngoingScreen.kt index bab69c14f..b90606a3a 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadOngoingScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadOngoingScreen.kt @@ -47,7 +47,7 @@ import com.infomaniak.swisstransfer.ui.components.SwissTransferBottomSheet import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import com.infomaniak.swisstransfer.ui.images.illus.mascotSearching.MascotSearching import com.infomaniak.swisstransfer.ui.images.illus.uploadCancelBottomSheet.RedCrossPaperPlanes -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.components.AdHeader import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.components.NetworkUnavailable import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.components.Progress diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt index 5e5810e1e..76894347d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt @@ -33,7 +33,7 @@ import com.infomaniak.swisstransfer.ui.components.EmptyState import com.infomaniak.swisstransfer.ui.components.LargeButton import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import com.infomaniak.swisstransfer.ui.images.illus.uploadError.GhostMagnifyingGlassQuestionMark -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi import com.infomaniak.swisstransfer.ui.screen.newtransfer.validateemail.ValidateUserEmailScreen import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessEmailScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessEmailScreen.kt index ca5c5beb5..ddc454dda 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessEmailScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessEmailScreen.kt @@ -38,7 +38,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.EmailsPreviewParameter -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessQrScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessQrScreen.kt index 1c2fbb274..ea4a389b5 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessQrScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessQrScreen.kt @@ -34,7 +34,7 @@ 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.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.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 diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessScreen.kt index c78a753e9..f15926932 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessScreen.kt @@ -23,7 +23,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.platform.LocalContext import androidx.datastore.preferences.core.edit -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows import com.infomaniak.swisstransfer.ui.utils.lastTransferDataStore diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/NotificationsUtils.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/NotificationsUtils.kt index e4ef485c2..e09b24397 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/NotificationsUtils.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/NotificationsUtils.kt @@ -36,7 +36,7 @@ import com.infomaniak.swisstransfer.ui.navigation.TRANSFER_TOTAL_SIZE_KEY import com.infomaniak.swisstransfer.ui.navigation.TRANSFER_TYPE_KEY import com.infomaniak.swisstransfer.ui.navigation.TRANSFER_URL_KEY import com.infomaniak.swisstransfer.ui.navigation.TRANSFER_UUID_KEY -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi import com.infomaniak.swisstransfer.ui.theme.notificationIconColor import dagger.hilt.android.qualifiers.ApplicationContext import splitties.init.appCtx diff --git a/app/src/main/java/com/infomaniak/swisstransfer/upload/NewTransferParams.kt b/app/src/main/java/com/infomaniak/swisstransfer/upload/NewTransferParams.kt index 603857f55..3c0f56e34 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/upload/NewTransferParams.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/upload/NewTransferParams.kt @@ -20,7 +20,7 @@ package com.infomaniak.swisstransfer.upload import com.infomaniak.multiplatform_swisstransfer.common.models.DownloadLimit import com.infomaniak.multiplatform_swisstransfer.common.models.EmailLanguage import com.infomaniak.multiplatform_swisstransfer.common.models.ValidityPeriod -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi data class NewTransferParams( val validityPeriod: ValidityPeriod, diff --git a/app/src/main/java/com/infomaniak/swisstransfer/upload/UploadState.kt b/app/src/main/java/com/infomaniak/swisstransfer/upload/UploadState.kt index b7e2e0bb6..deffb9ba4 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/upload/UploadState.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/upload/UploadState.kt @@ -17,7 +17,7 @@ */ package com.infomaniak.swisstransfer.upload -import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeUi +import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.TransferTypeUi sealed interface UploadState {