diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt index a43d8320f0..f1a53a1803 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt +++ b/app/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/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingTitle.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingTitle.kt index 1c523c5bdb..2d04bd648f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingTitle.kt +++ b/app/src/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 index aa5b427437..998ef976b5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -19,8 +19,16 @@ Dateien hinzufügen Weiter zu Neuer Transfer + Heruntergeladene Übertragung : %d/%d + Verfällt in %d Tagen Mache deine erste Überweisung! + Von: + Nachricht : Empfangen + + Empfänger : + Adressaten: + Unsere Geschichte beginnt hier Gesendet Über @@ -33,8 +41,19 @@ Benachrichtigungen Teile deine Ideen Thema + Sombre + Clair + Système Dauer der Gültigkeit + Wähle ein Thema aus Einstellungen + Geteilte Dateien + Inhalt der Übertragung : + E-Mail + Link + In der Nähe + QR-Code + Schicke deine Dateien per Kamera Dateien durchsuchen Foto- und Videogalerie diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7882db19ef..ae6ec4f99d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -19,8 +19,16 @@ Añadir archivos Siguiente Nueva transferencia + Transferencia descargada : %d/%d + Caduca en %d días Realice su primera transferencia + De : + Mensaje: Recibido + + Destinatario : + Para : + Nuestra historia comienza aquí Enviado a Quiénes somos @@ -33,8 +41,19 @@ Notificaciones Comparte tus ideas Tema + Sombre + Clair + Système Periodo de validez + Seleccione un tema Parámetros + Archivos compartidos + Contenido de la transferencia : + Correo electrónico + Enlace + Proximidad + Código QR + Envía tus archivos por Cámara Examinar archivos Galería de fotos y vídeos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ac5185aeee..7e1472ff08 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -19,8 +19,16 @@ Ajouter des fichiers Suivant Nouveau transfert + Transfert téléchargé : %d/%d\u0020 + Expire dans %d jours Fais ton premier transfert ! + De : + Message : Recu + + Destinataire : + Destinataires : + Notre histoire commence ici Envoyé A propos @@ -33,8 +41,19 @@ Notifications Partage tes idées Thème + Sombre + Clair + Système Durée de validité + Sélectionne un thème Paramètres + Fichiers partagés + Contenu du transfert : + E-mail + Lien + A proximité + QR Code + Envoie tes fichiers par Appareil photo Parcourir les fichiers Galerie photos et vidéos diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6b540844df..fd2df147bc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -19,8 +19,16 @@ Aggiunta di file Avanti Nuovo trasferimento + Trasferimento scaricato : %d/%d + Scade tra %d giorni Effettuate il vostro primo trasferimento! + Da : + Messaggio: Ricevuto + + A: + A : + La nostra storia inizia qui Inviato a Chi siamo @@ -33,8 +41,19 @@ Notifiche Condividete le vostre idee Tema + Sombre + Clair + Système Periodo di validità + Selezionare un tema Parametri + File condivisi + Contenuto del trasferimento : + Email + Link + Vicino + Codice QR + Inviate i vostri file tramite Macchina fotografica Sfogliare i file Galleria di foto e video diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 11fd8a0156..e3c115a6c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,8 +22,16 @@ Add files Next New transfer + Downloaded transfer: %d/%d\u0020 + Expires in %d days Make your first transfer! + From: + Message: Received + + Recipient: + Recipients: + Our story begins here Sent About @@ -36,8 +44,19 @@ Notifications Share your ideas Theme + Sombre + Clair + Système Validity period + Select a theme Settings + Shared files + Transfer content: + Email + Link + Proximity + QR Code + Send your files by Camera Browse files Photo and video gallery