From 5a05c3bc3c980a59e226b415b61682c5bf9a6d49 Mon Sep 17 00:00:00 2001 From: Vincent TE Date: Thu, 29 Aug 2024 16:13:53 +0200 Subject: [PATCH] Clean code --- .../ui/screen/main/components/AppNavigationSuiteScaffold.kt | 4 ++-- .../screen/main/settings/SettingsDurationValidityScreen.kt | 5 ++++- .../ui/screen/main/settings/SettingsEmailLanguageScreen.kt | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt index c33fb1bfc4..62550053ae 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt @@ -60,7 +60,7 @@ fun AppNavigationSuiteScaffold( navigationItems: List, currentDestination: MainNavigation, navigateToSelectedItem: (MainNavigation) -> Unit, - content: @Composable (Boolean) -> Unit, + content: @Composable () -> Unit, ) { Surface(color = SwissTransferTheme.materialColors.background) { NavigationSuiteScaffoldLayout( @@ -88,7 +88,7 @@ fun AppNavigationSuiteScaffold( } ) ) { - content(layoutType == NavigationSuiteType.NavigationBar) + content() } } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt index 785ad96a08..e844af943c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt @@ -85,7 +85,10 @@ enum class ValidityPeriodOption( private fun SettingsThemeScreenPreview() { SwissTransferTheme { Surface { - SettingsValidityPeriodScreen(navigateBack = {}, onValidityPeriodChange = {}) + SettingsValidityPeriodScreen( + navigateBack = {}, + onValidityPeriodChange = {} + ) } } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt index 3a1a79f035..799751fcca 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt @@ -86,7 +86,11 @@ enum class EmailLanguageOption( private fun SettingsThemeScreenPreview() { SwissTransferTheme { Surface { - SettingsEmailLanguageScreen(emailLanguage = EmailLanguage.FRENCH, navigateBack = {}, onEmailLanguageChange = {}) + SettingsEmailLanguageScreen( + emailLanguage = EmailLanguage.FRENCH, + navigateBack = {}, + onEmailLanguageChange = {} + ) } } }