Skip to content

Commit

Permalink
feat: Add a setting item that opens the swisstransfer end-user licens…
Browse files Browse the repository at this point in the history
…e agreement EULA (#424)
  • Loading branch information
LunarX authored Feb 21, 2025
2 parents 9238efe + b179afb commit fe1c019
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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,
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<SettingsViewModel>(),
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
<string name="settingsOptionNotifications">Benachrichtigungen</string>
<string name="settingsOptionPassword">Passwort</string>
<string name="settingsOptionShareIdeas">Teile deine Ideen</string>
<string name="settingsOptionTermsAndConditions">Allgemeine Geschäftsbedingungen</string>
<string name="settingsOptionTheme">Design</string>
<string name="settingsOptionThemeDark">Dunkel</string>
<string name="settingsOptionThemeLight">Hell</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
<string name="settingsOptionNotifications">Notificaciones</string>
<string name="settingsOptionPassword">Contraseña</string>
<string name="settingsOptionShareIdeas">Comparte tus ideas</string>
<string name="settingsOptionTermsAndConditions">Términos y condiciones</string>
<string name="settingsOptionTheme">Tema</string>
<string name="settingsOptionThemeDark">Oscuro</string>
<string name="settingsOptionThemeLight">Claro</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
<string name="settingsOptionNotifications">Notifications</string>
<string name="settingsOptionPassword">Mot de passe</string>
<string name="settingsOptionShareIdeas">Partage tes idées</string>
<string name="settingsOptionTermsAndConditions">Conditions générales</string>
<string name="settingsOptionTheme">Thème</string>
<string name="settingsOptionThemeDark">Sombre</string>
<string name="settingsOptionThemeLight">Clair</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
<string name="settingsOptionNotifications">Notifiche</string>
<string name="settingsOptionPassword">Password</string>
<string name="settingsOptionShareIdeas">Condividi le tue idee</string>
<string name="settingsOptionTermsAndConditions">Termini e condizioni</string>
<string name="settingsOptionTheme">Tema</string>
<string name="settingsOptionThemeDark">Scuro</string>
<string name="settingsOptionThemeLight">Chiaro</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
<string name="settingsOptionNotifications">Notifications</string>
<string name="settingsOptionPassword">Password</string>
<string name="settingsOptionShareIdeas">Share your ideas</string>
<string name="settingsOptionTermsAndConditions">Terms and Conditions</string>
<string name="settingsOptionTheme">Theme</string>
<string name="settingsOptionThemeDark">Dark</string>
<string name="settingsOptionThemeLight">Light</string>
Expand Down

0 comments on commit fe1c019

Please sign in to comment.