From 32415827ff60867616c428fcdaaf6baf7d9a0ddc Mon Sep 17 00:00:00 2001 From: Gibran Chevalley Date: Mon, 19 Aug 2024 09:48:26 +0200 Subject: [PATCH] Use correct strings for the transfer upload choice bottom sheet --- .../swisstransfer/ui/components/BottomSheetItem.kt | 3 +-- .../screen/newtransfer/importfiles/ImportFilesScreen.kt | 8 ++++---- app/src/main/res/values-de/strings.xml | 4 ++++ app/src/main/res/values-es/strings.xml | 4 ++++ app/src/main/res/values-fr/strings.xml | 4 ++++ app/src/main/res/values-it/strings.xml | 4 ++++ app/src/main/res/values/strings.xml | 4 ++++ 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt index a5da88037b..346afa6f1c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt @@ -34,7 +34,6 @@ import com.infomaniak.swisstransfer.ui.icons.AppIcons import com.infomaniak.swisstransfer.ui.icons.app.Camera import com.infomaniak.swisstransfer.ui.theme.CustomShapes import com.infomaniak.swisstransfer.ui.theme.Margin -import com.infomaniak.swisstransfer.ui.theme.Shapes import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme @Composable @@ -69,7 +68,7 @@ fun BottomSheetItem(imageVector: ImageVector, @StringRes titleRes: Int, onClick: private fun ChoiceItemPreview() { SwissTransferTheme { Surface { - BottomSheetItem(AppIcons.Camera, R.string.appName) {} + BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) {} } } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt index 089158e4fd..b498c7266b 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt @@ -76,14 +76,14 @@ private fun ImportChoiceBottomSheet( if (showImportChoiceBottomSheet()) { SwissTransferBottomSheet( onDismissRequest = onDismissRequest, - titleRes = R.string.appName, + titleRes = R.string.transferUploadSourceChoiceTitle, content = { Column { - BottomSheetItem(AppIcons.Camera, R.string.appName) { /*TODO*/ } + BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) { /*TODO*/ } HorizontalDivider(Modifier.padding(horizontal = Margin.Medium), color = SwissTransferTheme.colors.divider) - BottomSheetItem(AppIcons.PolaroidLandscape, R.string.appName) { /*TODO*/ } + BottomSheetItem(AppIcons.PolaroidLandscape, R.string.transferUploadSourceChoiceGallery) { /*TODO*/ } HorizontalDivider(Modifier.padding(horizontal = Margin.Medium), color = SwissTransferTheme.colors.divider) - BottomSheetItem(AppIcons.Folder, R.string.appName) { /*TODO*/ } + BottomSheetItem(AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) { /*TODO*/ } } }, ) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8eb23600e4..cdd2b0acfc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -24,4 +24,8 @@ Our story begins here Sent Settings + Camera + Browse files + Photo and video gallery + Upload from diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8eb23600e4..cdd2b0acfc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -24,4 +24,8 @@ Our story begins here Sent Settings + Camera + Browse files + Photo and video gallery + Upload from diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 732cff0fd6..059ad05e76 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -24,4 +24,8 @@ Notre histoire commence ici Envoyé Paramètres + Appareil photo + Parcourir les fichiers + Galerie photos et vidéos + Télécharger à partir de diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8eb23600e4..cdd2b0acfc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -24,4 +24,8 @@ Our story begins here Sent Settings + Camera + Browse files + Photo and video gallery + Upload from diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d5560f4c18..d87d627acb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,4 +27,8 @@ Our story begins here Sent Settings + Camera + Browse files + Photo and video gallery + Upload from