Use real wording for Settings theme

Infomaniak · Aug 21, 2024 · 214a6c2 · 214a6c2
1 parent 40befcb
commit 214a6c2
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 7 deletions.
diff --git a/...src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt b/...src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt
@@ -18,7 +18,6 @@
 
 package com.infomaniak.swisstransfer.ui.screen.main.settings
 
-import android.util.Log
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -30,7 +29,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.icons.AppIcons
-import com.infomaniak.swisstransfer.ui.icons.app.Add
 import com.infomaniak.swisstransfer.ui.icons.app.BlackAndWhiteCircle
 import com.infomaniak.swisstransfer.ui.icons.app.BlackCircle
 import com.infomaniak.swisstransfer.ui.icons.app.WhiteCircle
@@ -44,18 +42,17 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
 @Composable
 fun SettingsThemeScreen() {
     Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
-        SettingTitle(titleRes = R.string.appName)
+        SettingTitle(titleRes = R.string.settingsThemeTitle)
 
         val (selectedItem, setSelectedItem) = rememberSaveable { mutableIntStateOf(0) } // TODO: Use DataStore or Realm
-        Log.e("vincent", "SettingsThemeScreen: selectedItem=${ThemeOption.entries[selectedItem]}")
         MutuallyExclusiveOptions(ThemeOption.entries, selectedItem, setSelectedItem)
     }
 }
 
 enum class ThemeOption(override val title: Int, override val icon: ImageVector) : SettingOption {
-    SYSTEM(R.string.appName, AppIcons.BlackAndWhiteCircle),
-    LIGHT(R.string.appName, AppIcons.WhiteCircle),
-    DARK(R.string.appName, AppIcons.BlackCircle),
+    SYSTEM(R.string.settingsOptionThemeSystem, AppIcons.BlackAndWhiteCircle),
+    LIGHT(R.string.settingsOptionThemeLight, AppIcons.WhiteCircle),
+    DARK(R.string.settingsOptionThemeDark, AppIcons.BlackCircle),
 }
 
 @PreviewMobile

diff --git a/...main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingTitle.kt b/...main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingTitle.kt
@@ -19,11 +19,16 @@
 package com.infomaniak.swisstransfer.ui.screen.main.settings.components
 
 import androidx.annotation.StringRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.theme.Dimens
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 
@@ -36,3 +41,11 @@ fun SettingTitle(@StringRes titleRes: Int) {
         color = SwissTransferTheme.colors.secondaryTextColor,
     )
 }
+
+@Preview
+@Composable
+private fun SettingTitlePreview() {
+    Box(Modifier.background(color = Color.White)) {
+        SettingTitle(titleRes = R.string.appName)
+    }
+}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -19,8 +19,16 @@
     <string name="buttonAddFiles">Dateien hinzufügen</string>
     <string name="buttonNext">Weiter zu</string>
     <string name="contentDescriptionCreateNewTransferButton">Neuer Transfer</string>
+    <string name="downloadedTransferLabel">Heruntergeladene Übertragung : %d/%d</string>
+    <string name="expiresIn">Verfällt in %d Tagen</string>
     <string name="firstTransferDescription">Mache deine erste Überweisung!</string>
+    <string name="fromHeader">Von:</string>
+    <string name="messageHeader">Nachricht :</string>
     <string name="receivedTitle">Empfangen</string>
+    <plurals name="recipientHeader">
+        <item quantity="one">Empfänger :</item>
+        <item quantity="other">Adressaten:</item>
+    </plurals>
     <string name="sentEmptyTitle">Unsere Geschichte beginnt hier</string>
     <string name="sentTitle">Gesendet</string>
     <string name="settingsCategoryAbout">Über</string>
@@ -33,8 +41,19 @@
     <string name="settingsOptionNotifications">Benachrichtigungen</string>
     <string name="settingsOptionShareIdeas">Teile deine Ideen</string>
     <string name="settingsOptionTheme">Thema</string>
+    <string name="settingsOptionThemeDark">Sombre</string>
+    <string name="settingsOptionThemeLight">Clair</string>
+    <string name="settingsOptionThemeSystem">Système</string>
     <string name="settingsOptionValidityPeriod">Dauer der Gültigkeit</string>
+    <string name="settingsThemeTitle">Wähle ein Thema aus</string>
     <string name="settingsTitle">Einstellungen</string>
+    <string name="sharedFilesTitle">Geteilte Dateien</string>
+    <string name="transferContentHeader">Inhalt der Übertragung :</string>
+    <string name="transferTypeEmail">E-Mail</string>
+    <string name="transferTypeLink">Link</string>
+    <string name="transferTypeProximity">In der Nähe</string>
+    <string name="transferTypeQrCode">QR-Code</string>
+    <string name="transferTypeTitle">Schicke deine Dateien per</string>
     <string name="transferUploadSourceChoiceCamera">Kamera</string>
     <string name="transferUploadSourceChoiceFiles">Dateien durchsuchen</string>
     <string name="transferUploadSourceChoiceGallery">Foto- und Videogalerie</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -19,8 +19,16 @@
     <string name="buttonAddFiles">Añadir archivos</string>
     <string name="buttonNext">Siguiente</string>
     <string name="contentDescriptionCreateNewTransferButton">Nueva transferencia</string>
+    <string name="downloadedTransferLabel">Transferencia descargada : %d/%d</string>
+    <string name="expiresIn">Caduca en %d días</string>
     <string name="firstTransferDescription">Realice su primera transferencia</string>
+    <string name="fromHeader">De :</string>
+    <string name="messageHeader">Mensaje:</string>
     <string name="receivedTitle">Recibido</string>
+    <plurals name="recipientHeader">
+        <item quantity="one">Destinatario :</item>
+        <item quantity="other">Para :</item>
+    </plurals>
     <string name="sentEmptyTitle">Nuestra historia comienza aquí</string>
     <string name="sentTitle">Enviado a</string>
     <string name="settingsCategoryAbout">Quiénes somos</string>
@@ -33,8 +41,19 @@
     <string name="settingsOptionNotifications">Notificaciones</string>
     <string name="settingsOptionShareIdeas">Comparte tus ideas</string>
     <string name="settingsOptionTheme">Tema</string>
+    <string name="settingsOptionThemeDark">Sombre</string>
+    <string name="settingsOptionThemeLight">Clair</string>
+    <string name="settingsOptionThemeSystem">Système</string>
     <string name="settingsOptionValidityPeriod">Periodo de validez</string>
+    <string name="settingsThemeTitle">Seleccione un tema</string>
     <string name="settingsTitle">Parámetros</string>
+    <string name="sharedFilesTitle">Archivos compartidos</string>
+    <string name="transferContentHeader">Contenido de la transferencia :</string>
+    <string name="transferTypeEmail">Correo electrónico</string>
+    <string name="transferTypeLink">Enlace</string>
+    <string name="transferTypeProximity">Proximidad</string>
+    <string name="transferTypeQrCode">Código QR</string>
+    <string name="transferTypeTitle">Envía tus archivos por</string>
     <string name="transferUploadSourceChoiceCamera">Cámara</string>
     <string name="transferUploadSourceChoiceFiles">Examinar archivos</string>
     <string name="transferUploadSourceChoiceGallery">Galería de fotos y vídeos</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -19,8 +19,16 @@
     <string name="buttonAddFiles">Ajouter des fichiers</string>
     <string name="buttonNext">Suivant</string>
     <string name="contentDescriptionCreateNewTransferButton">Nouveau transfert</string>
+    <string name="downloadedTransferLabel">Transfert téléchargé : %d/%d\u0020</string>
+    <string name="expiresIn">Expire dans %d jours</string>
     <string name="firstTransferDescription">Fais ton premier transfert !</string>
+    <string name="fromHeader">De :</string>
+    <string name="messageHeader">Message :</string>
     <string name="receivedTitle">Recu</string>
+    <plurals name="recipientHeader">
+        <item quantity="one">Destinataire :</item>
+        <item quantity="other">Destinataires :</item>
+    </plurals>
     <string name="sentEmptyTitle">Notre histoire commence ici</string>
     <string name="sentTitle">Envoyé</string>
     <string name="settingsCategoryAbout">A propos</string>
@@ -33,8 +41,19 @@
     <string name="settingsOptionNotifications">Notifications</string>
     <string name="settingsOptionShareIdeas">Partage tes idées</string>
     <string name="settingsOptionTheme">Thème</string>
+    <string name="settingsOptionThemeDark">Sombre</string>
+    <string name="settingsOptionThemeLight">Clair</string>
+    <string name="settingsOptionThemeSystem">Système</string>
     <string name="settingsOptionValidityPeriod">Durée de validité</string>
+    <string name="settingsThemeTitle">Sélectionne un thème</string>
     <string name="settingsTitle">Paramètres</string>
+    <string name="sharedFilesTitle">Fichiers partagés</string>
+    <string name="transferContentHeader">Contenu du transfert :</string>
+    <string name="transferTypeEmail">E-mail</string>
+    <string name="transferTypeLink">Lien</string>
+    <string name="transferTypeProximity">A proximité</string>
+    <string name="transferTypeQrCode">QR Code</string>
+    <string name="transferTypeTitle">Envoie tes fichiers par</string>
     <string name="transferUploadSourceChoiceCamera">Appareil photo</string>
     <string name="transferUploadSourceChoiceFiles">Parcourir les fichiers</string>
     <string name="transferUploadSourceChoiceGallery">Galerie photos et vidéos</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -19,8 +19,16 @@
     <string name="buttonAddFiles">Aggiunta di file</string>
     <string name="buttonNext">Avanti</string>
     <string name="contentDescriptionCreateNewTransferButton">Nuovo trasferimento</string>
+    <string name="downloadedTransferLabel">Trasferimento scaricato : %d/%d</string>
+    <string name="expiresIn">Scade tra %d giorni</string>
     <string name="firstTransferDescription">Effettuate il vostro primo trasferimento!</string>
+    <string name="fromHeader">Da :</string>
+    <string name="messageHeader">Messaggio:</string>
     <string name="receivedTitle">Ricevuto</string>
+    <plurals name="recipientHeader">
+        <item quantity="one">A:</item>
+        <item quantity="other">A :</item>
+    </plurals>
     <string name="sentEmptyTitle">La nostra storia inizia qui</string>
     <string name="sentTitle">Inviato a</string>
     <string name="settingsCategoryAbout">Chi siamo</string>
@@ -33,8 +41,19 @@
     <string name="settingsOptionNotifications">Notifiche</string>
     <string name="settingsOptionShareIdeas">Condividete le vostre idee</string>
     <string name="settingsOptionTheme">Tema</string>
+    <string name="settingsOptionThemeDark">Sombre</string>
+    <string name="settingsOptionThemeLight">Clair</string>
+    <string name="settingsOptionThemeSystem">Système</string>
     <string name="settingsOptionValidityPeriod">Periodo di validità</string>
+    <string name="settingsThemeTitle">Selezionare un tema</string>
     <string name="settingsTitle">Parametri</string>
+    <string name="sharedFilesTitle">File condivisi</string>
+    <string name="transferContentHeader">Contenuto del trasferimento :</string>
+    <string name="transferTypeEmail">Email</string>
+    <string name="transferTypeLink">Link</string>
+    <string name="transferTypeProximity">Vicino</string>
+    <string name="transferTypeQrCode">Codice QR</string>
+    <string name="transferTypeTitle">Inviate i vostri file tramite</string>
     <string name="transferUploadSourceChoiceCamera">Macchina fotografica</string>
     <string name="transferUploadSourceChoiceFiles">Sfogliare i file</string>
     <string name="transferUploadSourceChoiceGallery">Galleria di foto e video</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -22,8 +22,16 @@
     <string name="buttonAddFiles">Add files</string>
     <string name="buttonNext">Next</string>
     <string name="contentDescriptionCreateNewTransferButton">New transfer</string>
+    <string name="downloadedTransferLabel">Downloaded transfer: %d/%d\u0020</string>
+    <string name="expiresIn">Expires in %d days</string>
     <string name="firstTransferDescription">Make your first transfer!</string>
+    <string name="fromHeader">From:</string>
+    <string name="messageHeader">Message:</string>
     <string name="receivedTitle">Received</string>
+    <plurals name="recipientHeader">
+        <item quantity="one">Recipient:</item>
+        <item quantity="other">Recipients:</item>
+    </plurals>
     <string name="sentEmptyTitle">Our story begins here</string>
     <string name="sentTitle">Sent</string>
     <string name="settingsCategoryAbout">About</string>
@@ -36,8 +44,19 @@
     <string name="settingsOptionNotifications">Notifications</string>
     <string name="settingsOptionShareIdeas">Share your ideas</string>
     <string name="settingsOptionTheme">Theme</string>
+    <string name="settingsOptionThemeDark">Sombre</string>
+    <string name="settingsOptionThemeLight">Clair</string>
+    <string name="settingsOptionThemeSystem">Système</string>
     <string name="settingsOptionValidityPeriod">Validity period</string>
+    <string name="settingsThemeTitle">Select a theme</string>
     <string name="settingsTitle">Settings</string>
+    <string name="sharedFilesTitle">Shared files</string>
+    <string name="transferContentHeader">Transfer content:</string>
+    <string name="transferTypeEmail">Email</string>
+    <string name="transferTypeLink">Link</string>
+    <string name="transferTypeProximity">Proximity</string>
+    <string name="transferTypeQrCode">QR Code</string>
+    <string name="transferTypeTitle">Send your files by</string>
     <string name="transferUploadSourceChoiceCamera">Camera</string>
     <string name="transferUploadSourceChoiceFiles">Browse files</string>
     <string name="transferUploadSourceChoiceGallery">Photo and video gallery</string>