From 5e55fd0e1fb7edc1896170282bb3ee189b866411 Mon Sep 17 00:00:00 2001 From: Joris Bodin Date: Thu, 26 Dec 2024 16:19:16 +0100 Subject: [PATCH] chore(SettingsScreen): Move Data Privacy --- .../ui/screen/main/settings/SettingsScreen.kt | 18 +++++++++--------- .../main/settings/SettingsScreenWrapper.kt | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) 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 fafc20eca..3882bdf7c 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 @@ -122,6 +122,15 @@ fun SettingsScreen( ) SettingDivider() + SettingTitle(R.string.settingsCategoryDataManagement) + SettingItem( + titleRes = R.string.settingsOptionDataManagement, + isSelected = { selectedSetting == DATA_MANAGEMENT }, + endIcon = CHEVRON, + onClick = { onItemClick(DATA_MANAGEMENT) }, + ) + SettingDivider() + SettingTitle(R.string.settingsCategoryAbout) SettingItem( titleRes = R.string.settingsOptionDiscoverInfomaniak, @@ -147,15 +156,6 @@ fun SettingsScreen( description = BuildConfig.VERSION_NAME, onClick = null, ) - SettingDivider() - - SettingTitle(R.string.settingsCategoryDataManagement) - SettingItem( - titleRes = R.string.settingsOptionDataManagement, - isSelected = { selectedSetting == DATA_MANAGEMENT }, - endIcon = CHEVRON, - onClick = { onItemClick(DATA_MANAGEMENT) }, - ) } } } 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 461e8c930..0a18caa24 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 @@ -146,7 +146,6 @@ private fun DetailPane( DATA_MANAGEMENT -> SettingsDataManagementScreen( navigateBack = navigateBack, onItemClick = { item -> - // Navigate to the detail pane with the passed item navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, item) }, )