Clean code

Infomaniak · Aug 30, 2024 · 686713a · 686713a
1 parent 614ba7a
commit 686713a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt b/...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/...va/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt b/...va/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/.../java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/.../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
@@ -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