From 2c8296dfcceb971d6adb826e312320e382eb51a0 Mon Sep 17 00:00:00 2001 From: Sol Rubado Date: Mon, 12 Oct 2026 16:21:34 +0200 Subject: [PATCH 1/2] refactor: Add delete button string to common --- Common/src/main/res/values-da/strings.xml | 1 + Common/src/main/res/values-de/strings.xml | 1 + Common/src/main/res/values-el/strings.xml | 1 + Common/src/main/res/values-es/strings.xml | 1 + Common/src/main/res/values-fi/strings.xml | 1 + Common/src/main/res/values-fr/strings.xml | 1 + Common/src/main/res/values-it/strings.xml | 1 + Common/src/main/res/values-nb/strings.xml | 1 + Common/src/main/res/values-nl/strings.xml | 1 + Common/src/main/res/values-pl/strings.xml | 1 + Common/src/main/res/values-pt/strings.xml | 1 + Common/src/main/res/values-sv/strings.xml | 1 + Common/src/main/res/values/strings.xml | 1 + .../compose/contactcard/component/DefaultContactCardDialog.kt | 2 +- .../core/ui/compose/contactcard/component/EditorContent.kt | 3 ++- .../compose/contactcard/component/PreviewActionsBottomSheet.kt | 2 +- Ui/Compose/ContactCard/src/main/res/values-da/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-de/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-el/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-es/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-fi/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-fr/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-it/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-nb/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-nl/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-pl/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-pt/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values-sv/strings.xml | 1 - Ui/Compose/ContactCard/src/main/res/values/strings.xml | 1 - 29 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Common/src/main/res/values-da/strings.xml b/Common/src/main/res/values-da/strings.xml index 3c6991569..b814bc7a2 100644 --- a/Common/src/main/res/values-da/strings.xml +++ b/Common/src/main/res/values-da/strings.xml @@ -36,6 +36,7 @@ Log ud Internetforbindelsesproblem Kontihentning utilgængelig + Slet Rediger Downloadfejl Kan ikke downloade: Utilstrækkelig plads diff --git a/Common/src/main/res/values-de/strings.xml b/Common/src/main/res/values-de/strings.xml index 1a4bc4fce..729cce406 100644 --- a/Common/src/main/res/values-de/strings.xml +++ b/Common/src/main/res/values-de/strings.xml @@ -36,6 +36,7 @@ Abmelden Problem mit der Internetverbindung Kontenabruf nicht verfügbar + Löschen Bearbeiten Fehler beim Download Download nicht möglich: Unzureichender Speicherplatz diff --git a/Common/src/main/res/values-el/strings.xml b/Common/src/main/res/values-el/strings.xml index 20196b219..983a112be 100644 --- a/Common/src/main/res/values-el/strings.xml +++ b/Common/src/main/res/values-el/strings.xml @@ -36,6 +36,7 @@ Αποσύνδεση Πρόβλημα σύνδεσης στο διαδίκτυο Η ανάκτηση λογαριασμών δεν είναι διαθέσιμη + Διαγραφή Επεξεργασία Σφάλμα λήψης Δεν είναι δυνατή η λήψη: Μη επαρκής χώρος diff --git a/Common/src/main/res/values-es/strings.xml b/Common/src/main/res/values-es/strings.xml index 1a50f18b7..868f698ab 100644 --- a/Common/src/main/res/values-es/strings.xml +++ b/Common/src/main/res/values-es/strings.xml @@ -36,6 +36,7 @@ Cerrar sesión Problema de conexión a Internet Recuperación de cuentas no disponible + Eliminar Editar Error al descargar No se puede descargar: espacio insuficiente diff --git a/Common/src/main/res/values-fi/strings.xml b/Common/src/main/res/values-fi/strings.xml index b68ea17db..bbb9ad846 100644 --- a/Common/src/main/res/values-fi/strings.xml +++ b/Common/src/main/res/values-fi/strings.xml @@ -36,6 +36,7 @@ Kirjaudu ulos Internet-yhteysongelma Tilien nouto ei ole käytettävissä + Poista Muokkaa Latausvirhe Ei voida ladata: Tilaa ei ole riittävästi diff --git a/Common/src/main/res/values-fr/strings.xml b/Common/src/main/res/values-fr/strings.xml index 09eb7ca8c..d61d5b5e4 100644 --- a/Common/src/main/res/values-fr/strings.xml +++ b/Common/src/main/res/values-fr/strings.xml @@ -36,6 +36,7 @@ Me déconnecter Problème de connexion internet Récupération des comptes indisponible + Supprimer Modifier Erreur lors du téléchargement Téléchargement impossible : Espace insuffisant diff --git a/Common/src/main/res/values-it/strings.xml b/Common/src/main/res/values-it/strings.xml index 27a28db25..59373d4b6 100644 --- a/Common/src/main/res/values-it/strings.xml +++ b/Common/src/main/res/values-it/strings.xml @@ -36,6 +36,7 @@ Disconnettersi Problema di connessione a Internet Recupero dei conti non disponibile + Elimina Modifica Errore durante il download Impossibile scaricare: spazio insufficiente diff --git a/Common/src/main/res/values-nb/strings.xml b/Common/src/main/res/values-nb/strings.xml index 8596c0178..2152e11ed 100644 --- a/Common/src/main/res/values-nb/strings.xml +++ b/Common/src/main/res/values-nb/strings.xml @@ -36,6 +36,7 @@ Logg ut Internett-tilkoblingsproblem Henting av kontoer utilgjengelig + Slett Rediger Nedlastingsfeil Kan ikke laste ned: Utilstrekkelig plass diff --git a/Common/src/main/res/values-nl/strings.xml b/Common/src/main/res/values-nl/strings.xml index 33ba31a50..2ce3f9def 100644 --- a/Common/src/main/res/values-nl/strings.xml +++ b/Common/src/main/res/values-nl/strings.xml @@ -36,6 +36,7 @@ Afmelden Internetverbindingsprobleem Ophalen van accounts niet beschikbaar + Verwijderen Bewerken Downloadfout Kan niet downloaden: Onvoldoende ruimte diff --git a/Common/src/main/res/values-pl/strings.xml b/Common/src/main/res/values-pl/strings.xml index a8e6f2b21..36df89267 100644 --- a/Common/src/main/res/values-pl/strings.xml +++ b/Common/src/main/res/values-pl/strings.xml @@ -36,6 +36,7 @@ Wyloguj się Problem z połączeniem internetowym Pobieranie kont niedostępne + Usuń Edytuj Błąd pobierania Nie można pobrać: Za mało miejsca diff --git a/Common/src/main/res/values-pt/strings.xml b/Common/src/main/res/values-pt/strings.xml index 1296f41f4..22755077c 100644 --- a/Common/src/main/res/values-pt/strings.xml +++ b/Common/src/main/res/values-pt/strings.xml @@ -36,6 +36,7 @@ Terminar sessão Problema de ligação à Internet Recuperação de contas indisponível + Apagar Editar Erro de descarregamento Não é possível descarregar: Espaço insuficiente diff --git a/Common/src/main/res/values-sv/strings.xml b/Common/src/main/res/values-sv/strings.xml index 27857160a..c9d35fd65 100644 --- a/Common/src/main/res/values-sv/strings.xml +++ b/Common/src/main/res/values-sv/strings.xml @@ -36,6 +36,7 @@ Logga ut Problem med internetanslutning Kontohämtning otillgänglig + Ta bort Redigera Nedladdningsfel Kan inte ladda ner: Otillräckligt utrymme diff --git a/Common/src/main/res/values/strings.xml b/Common/src/main/res/values/strings.xml index 2711cba33..12cb54758 100644 --- a/Common/src/main/res/values/strings.xml +++ b/Common/src/main/res/values/strings.xml @@ -36,6 +36,7 @@ Log out Internet connection problem Accounts retrieval unavailable + Delete Edit Download error Cannot download: Insufficient space diff --git a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/DefaultContactCardDialog.kt b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/DefaultContactCardDialog.kt index 60c482b54..a77cf45eb 100644 --- a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/DefaultContactCardDialog.kt +++ b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/DefaultContactCardDialog.kt @@ -74,7 +74,7 @@ internal fun DefaultDeleteConfirmationDialog( DefaultContactCardDialog( titleRes = R.string.deleteAlertTitle, descriptionRes = R.string.deleteAlertDescription, - confirmButtonRes = R.string.deleteButton, + confirmButtonRes = RCore.string.deleteButton, onConfirm = onConfirm, onDismiss = onDismiss, dismissButtonRes = RCore.string.buttonCancel, diff --git a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt index 4d3cfc25e..63ab449cb 100644 --- a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt +++ b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt @@ -54,6 +54,7 @@ import com.infomaniak.core.ui.compose.contactcard.model.ContactCardCallbacks import com.infomaniak.core.ui.compose.contactcard.model.isValid import com.infomaniak.core.ui.compose.contactcard.EditableUrl import com.infomaniak.core.ui.compose.contactcard.R +import com.infomaniak.core.common.R as RCore import com.infomaniak.core.ui.compose.margin.Margin @Composable @@ -233,7 +234,7 @@ private fun AdditionalUrlItem( ) { Icon( imageVector = ImageVector.vectorResource(R.drawable.ic_bin), - contentDescription = stringResource(R.string.deleteButton), + contentDescription = stringResource(RCore.string.deleteButton), tint = MaterialTheme.colorScheme.primary, ) } diff --git a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/PreviewActionsBottomSheet.kt b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/PreviewActionsBottomSheet.kt index 98ae005f5..71a9bad84 100644 --- a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/PreviewActionsBottomSheet.kt +++ b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/PreviewActionsBottomSheet.kt @@ -81,7 +81,7 @@ internal fun PreviewActionsBottomSheet( ) BottomSheetAction( icon = ImageVector.vectorResource(R.drawable.ic_bin), - label = stringResource(R.string.deleteButton), + label = stringResource(RCommon.string.deleteButton), onClick = { dismissThen(onDelete) }, ) } diff --git a/Ui/Compose/ContactCard/src/main/res/values-da/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-da/strings.xml index 7b35fa826..b3fef9d8b 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-da/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-da/strings.xml @@ -17,7 +17,6 @@ Tilbage Er du sikker på, at du vil slette det kontaktkort, der er knyttet til denne konto? Slet kontaktkortet - Slet E-mail Facebook Fornavn diff --git a/Ui/Compose/ContactCard/src/main/res/values-de/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-de/strings.xml index 690b5d3a2..c943cfac2 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-de/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-de/strings.xml @@ -17,7 +17,6 @@ Zurück Möchten Sie die mit diesem Konto verknüpfte Kontaktkarte wirklich löschen? Die Kontaktkarte löschen - Löschen E-Mail Facebook Vorname diff --git a/Ui/Compose/ContactCard/src/main/res/values-el/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-el/strings.xml index a74af78d3..fdefe93bf 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-el/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-el/strings.xml @@ -17,7 +17,6 @@ Πίσω Είστε σίγουροι ότι θέλετε να διαγράψετε την κάρτα επαφής που σχετίζεται με αυτόν τον λογαριασμό; Διαγραφή της κάρτας επαφής - Διαγραφή Ηλεκτρονικό ταχυδρομείο Facebook Όνομα diff --git a/Ui/Compose/ContactCard/src/main/res/values-es/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-es/strings.xml index bd3e216de..18f5ea44b 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-es/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-es/strings.xml @@ -17,7 +17,6 @@ Atrás ¿Estás seguro de que quieres eliminar la ficha de contacto asociada a esta cuenta? Eliminar la ficha de contacto - Eliminar Correo electrónico Facebook Nombre diff --git a/Ui/Compose/ContactCard/src/main/res/values-fi/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-fi/strings.xml index d6f31ee75..9c46b2b28 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-fi/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-fi/strings.xml @@ -17,7 +17,6 @@ Takaisin Haluatko varmasti poistaa tähän tiliin liitetyn yhteystietokortin? Poista yhteystietokortti - Poista Sähköposti Facebook Etunimi diff --git a/Ui/Compose/ContactCard/src/main/res/values-fr/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-fr/strings.xml index 3d576010b..bb99f35a4 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-fr/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-fr/strings.xml @@ -17,7 +17,6 @@ Retour Êtes-vous sûr de vouloir supprimer la fiche de visite associée à ce compte ? Supprimer la carte de visite - Supprimer E-mail Facebook Prénom diff --git a/Ui/Compose/ContactCard/src/main/res/values-it/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-it/strings.xml index 3eb1443da..d0ce648f0 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-it/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-it/strings.xml @@ -17,7 +17,6 @@ Indietro Sei sicuro di voler eliminare la scheda del contatto associata a questo account? Elimina la scheda del contatto - Elimina E-mail Facebook Nome diff --git a/Ui/Compose/ContactCard/src/main/res/values-nb/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-nb/strings.xml index 1cb1614e1..447054c65 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-nb/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-nb/strings.xml @@ -17,7 +17,6 @@ Tilbake Er du sikker på at du vil slette kontaktkortet som er knyttet til denne kontoen? Slett kontaktkortet - Slett E-post Facebook Fornavn diff --git a/Ui/Compose/ContactCard/src/main/res/values-nl/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-nl/strings.xml index 22315ebff..de1e8fa34 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-nl/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-nl/strings.xml @@ -17,7 +17,6 @@ Terug Weet u zeker dat u de contactkaart die aan dit account is gekoppeld, wilt verwijderen? De contactkaart verwijderen - Verwijderen E-mail Facebook Voornaam diff --git a/Ui/Compose/ContactCard/src/main/res/values-pl/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-pl/strings.xml index e8854fb8d..5a283b563 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-pl/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-pl/strings.xml @@ -17,7 +17,6 @@ Wstecz Czy na pewno chcesz usunąć wizytówkę powiązaną z tym kontem? Usuń wizytówkę - Usuń E-mail Facebook Imię diff --git a/Ui/Compose/ContactCard/src/main/res/values-pt/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-pt/strings.xml index 50f11ff2a..9c6ef8bd5 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-pt/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-pt/strings.xml @@ -17,7 +17,6 @@ Voltar Tem a certeza de que quer eliminar o cartão de contacto associado a esta conta? Apagar o cartão de contacto - Apagar E-mail Facebook Nome próprio diff --git a/Ui/Compose/ContactCard/src/main/res/values-sv/strings.xml b/Ui/Compose/ContactCard/src/main/res/values-sv/strings.xml index 5bb1e9356..74600c1b7 100644 --- a/Ui/Compose/ContactCard/src/main/res/values-sv/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values-sv/strings.xml @@ -17,7 +17,6 @@ Tillbaka Är du säker på att du vill ta bort kontaktkortet som är kopplat till det här kontot? Ta bort kontaktkortet - Ta bort E-post Facebook Förnamn diff --git a/Ui/Compose/ContactCard/src/main/res/values/strings.xml b/Ui/Compose/ContactCard/src/main/res/values/strings.xml index a46942b17..9dd718177 100644 --- a/Ui/Compose/ContactCard/src/main/res/values/strings.xml +++ b/Ui/Compose/ContactCard/src/main/res/values/strings.xml @@ -33,7 +33,6 @@ Back Are you sure you want to delete the contact card associated with this account? Delete the contact card - Delete Email Facebook First Name From 371b93ba625ab710b06a49f06ec578ceb2b81d75 Mon Sep 17 00:00:00 2001 From: Sol Rubado Date: Mon, 12 Oct 2026 16:32:09 +0200 Subject: [PATCH 2/2] refactor: Fix order of imports --- .../ui/compose/contactcard/component/EditorContent.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt index 63ab449cb..035b7a3c7 100644 --- a/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt +++ b/Ui/Compose/ContactCard/src/main/kotlin/com/infomaniak/core/ui/compose/contactcard/component/EditorContent.kt @@ -50,12 +50,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import com.infomaniak.core.ui.compose.contactcard.ContactCardEditorState -import com.infomaniak.core.ui.compose.contactcard.model.ContactCardCallbacks -import com.infomaniak.core.ui.compose.contactcard.model.isValid import com.infomaniak.core.ui.compose.contactcard.EditableUrl import com.infomaniak.core.ui.compose.contactcard.R -import com.infomaniak.core.common.R as RCore +import com.infomaniak.core.ui.compose.contactcard.model.ContactCardCallbacks +import com.infomaniak.core.ui.compose.contactcard.model.isValid import com.infomaniak.core.ui.compose.margin.Margin +import com.infomaniak.core.common.R as RCore @Composable internal fun EditorContent( @@ -201,8 +201,8 @@ private fun LinksAndSocialNetworkSection( editor.copy( additionalUrls = editor.additionalUrls.map { if (it.id == updatedUrl.id) updatedUrl else it - } - ) + }, + ), ) }, onRemove = { onRemoveAdditionalUrl(additionalUrl.id) },