diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt index 91a06540b..cf4a10b2f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt @@ -145,6 +145,12 @@ fun SettingsScreen( SettingDivider() SettingTitle(R.string.settingsCategoryAbout) + SettingItem( + titleRes = R.string.settingsOptionTermsAndConditions, + isSelected = { selectedSetting == EULA }, + endIcon = OPEN_OUTSIDE, + onClick = { onItemClick(EULA) }, + ) SettingItem( titleRes = R.string.settingsOptionDiscoverInfomaniak, isSelected = { selectedSetting == DISCOVER_INFOMANIAK }, @@ -208,7 +214,7 @@ private fun EmailLanguage?.getString(): String { enum class SettingsOptionScreens { THEME, NOTIFICATIONS, VALIDITY_PERIOD, DOWNLOAD_LIMIT, EMAIL_LANGUAGE, - DISCOVER_INFOMANIAK, SHARE_IDEAS, GIVE_FEEDBACK, + EULA, DISCOVER_INFOMANIAK, SHARE_IDEAS, GIVE_FEEDBACK, DATA_MANAGEMENT, DATA_MANAGEMENT_MATOMO, DATA_MANAGEMENT_SENTRY, } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt index d449bfebf..cd6037c4d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt @@ -44,6 +44,8 @@ import com.infomaniak.swisstransfer.ui.theme.LocalWindowAdaptiveInfo import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.* +private const val EULA_URL = "https://www.swisstransfer.com/?cgu" + @Composable fun SettingsScreenWrapper( settingsViewModel: SettingsViewModel = hiltViewModel(), @@ -99,6 +101,7 @@ private fun ListPane( onItemClick = { item -> when (item) { NOTIFICATIONS -> context.openAppNotificationSettings() + EULA -> context.openUrl(EULA_URL) DISCOVER_INFOMANIAK -> context.openUrl(aboutURL) SHARE_IDEAS -> context.openUrl(userReportURL) GIVE_FEEDBACK -> context.openReviewBottomSheet() @@ -155,6 +158,7 @@ private fun DetailPane( DATA_MANAGEMENT_MATOMO -> SettingsDataManagementMatomoScreen(navigateBack) DATA_MANAGEMENT_SENTRY -> SettingsDataManagementSentryScreen(navigateBack) NOTIFICATIONS, + EULA, DISCOVER_INFOMANIAK, SHARE_IDEAS, GIVE_FEEDBACK, diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d1e4d1315..417a64083 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -123,6 +123,7 @@ Benachrichtigungen Passwort Teile deine Ideen + Allgemeine Geschäftsbedingungen Design Dunkel Hell diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0b4c222e3..e7fa3b4ac 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -123,6 +123,7 @@ Notificaciones Contraseña Comparte tus ideas + Términos y condiciones Tema Oscuro Claro diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f5b622f09..8286089c5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -124,6 +124,7 @@ Notifications Mot de passe Partage tes idées + Conditions générales Thème Sombre Clair diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d357bd412..46391220a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -123,6 +123,7 @@ Notifiche Password Condividi le tue idee + Termini e condizioni Tema Scuro Chiaro diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f1b9448d..5aec50975 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -128,6 +128,7 @@ Notifications Password Share your ideas + Terms and Conditions Theme Dark Light