From 686713a532ce7bdc6fd8b05786c421717a7b8ee0 Mon Sep 17 00:00:00 2001
From: Vincent TE <vincent.te@infomaniak.com>
Date: Thu, 29 Aug 2024 16:13:53 +0200
Subject: [PATCH] Clean code

---
 .../screen/main/components/AppNavigationSuiteScaffold.kt | 4 ++--
 .../main/settings/SettingsDurationValidityScreen.kt      | 5 ++++-
 .../screen/main/settings/SettingsEmailLanguageScreen.kt  | 6 +++++-
 .../ui/screen/main/settings/SettingsScreen.kt            | 9 +++------
 4 files changed, 14 insertions(+), 10 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<NavigationItem>,
     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 = {}
+            )
         }
     }
 }
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 68926ce33a..88c12dd1cd 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
@@ -156,12 +156,9 @@ private fun Theme?.getString(): String {
 
 @Composable
 private fun ValidityPeriod?.getString(): String {
-    return if (this == null) {
-        ""
-    } else {
-        val validityPeriodValue = value.toInt()
-        pluralStringResource(R.plurals.settingsValidityPeriodValue, validityPeriodValue, validityPeriodValue)
-    }
+    return this?.value?.toInt()?.let {
+        pluralStringResource(R.plurals.settingsValidityPeriodValue, it, it)
+    } ?: ""
 }
 
 @Composable