Clean code

Infomaniak · Sep 16, 2024 · a71ef27 · a71ef27
1 parent 55b2025
commit a71ef27
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt
@@ -47,10 +47,10 @@ fun MainNavHost(
         exitTransition = { if (currentDestination.enableTransition) fadeOut() else ExitTransition.None },
     ) {
         composable<SentDestination> {
-            SentScreen(navigateToDetails = { navController.navigate(::TransferDetailsDestination) })
+            SentScreen(navigateToDetails = { navController.navigate(TransferDetailsDestination(it)) })
         }
         composable<ReceivedDestination> {
-            ReceivedScreen(navigateToDetails = { navController.navigate(::TransferDetailsDestination) })
+            ReceivedScreen(navigateToDetails = { navController.navigate(TransferDetailsDestination(it)) })
         }
         composable<TransferDetailsDestination> {
             val transferDetails: TransferDetailsDestination = it.toRoute()

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt
@@ -62,9 +62,7 @@ private fun MainScaffold(
             content()
         } else {
             Column {
-                Box(modifier = Modifier.weight(1.0f)) {
-                    content()
-                }
+                Box(modifier = Modifier.weight(1.0f)) { content() }
                 HorizontalDivider()
             }
         }
@@ -111,7 +109,7 @@ private fun NavHostController.navigateToSelectedItem(destination: MainNavigation
 
 @PreviewMobile
 @Composable
-private fun NavigationPreviewMobile() {
+private fun NavigationMobilePreview() {
     SwissTransferTheme {
         MainScaffold(
             currentDestination = MainNavigation.SentDestination,
@@ -124,7 +122,7 @@ private fun NavigationPreviewMobile() {
 
 @PreviewTablet
 @Composable
-private fun NavigationPreviewTablet() {
+private fun NavigationTabletPreview() {
     SwissTransferTheme {
         MainScaffold(
             currentDestination = MainNavigation.SentDestination,

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt
@@ -38,9 +38,7 @@ fun MainScreen() {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
 
     val currentDestination by remember(navBackStackEntry) {
-        derivedStateOf {
-            navBackStackEntry?.toDestination<MainNavigation>() ?: MainNavigation.startDestination
-        }
+        derivedStateOf { navBackStackEntry?.toDestination<MainNavigation>() ?: MainNavigation.startDestination }
     }
 
     MainScaffold(navController, currentDestination, windowAdaptiveInfo) {

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt
@@ -79,10 +79,8 @@ fun AppNavigationSuiteScaffold(
             Box(
                 modifier = Modifier.consumeWindowInsets(
                     when (layoutType) {
-                        NavigationSuiteType.NavigationBar ->
-                            NavigationBarDefaults.windowInsets.only(WindowInsetsSides.Bottom)
-                        NavigationSuiteType.NavigationRail ->
-                            NavigationRailDefaults.windowInsets.only(WindowInsetsSides.Start)
+                        NavigationSuiteType.NavigationBar -> NavigationBarDefaults.windowInsets.only(WindowInsetsSides.Bottom)
+                        NavigationSuiteType.NavigationRail -> NavigationRailDefaults.windowInsets.only(WindowInsetsSides.Start)
                         else -> WindowInsets(0, 0, 0, 0)
                     },
                 ),