moved navArguments to Screen class constructor

android · Nov 17, 2023 · 84c29e0 · 84c29e0
1 parent 7a5ed9a
commit 84c29e0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/app/src/main/java/com/google/samples/apps/sunflower/compose/SunflowerApp.kt b/app/src/main/java/com/google/samples/apps/sunflower/compose/SunflowerApp.kt
@@ -50,7 +50,7 @@ fun SunFlowerNavHost(
             HomeScreen(
                 onPlantClick = {
                     navController.navigate(
-                        Screen.PlantDetail.passPlantId(
+                        Screen.PlantDetail.createRoute(
                             plantId = it.plantId
                         )
                     )
@@ -59,7 +59,7 @@ fun SunFlowerNavHost(
         }
         composable(
             route = Screen.PlantDetail.route,
-            arguments = Screen.PlantDetail.arguments
+            arguments = Screen.PlantDetail.navArguments
         ) {
             PlantDetailsScreen(
                 onBackClick = { navController.navigateUp() },
@@ -68,7 +68,7 @@ fun SunFlowerNavHost(
                 },
                 onGalleryClick = {
                     navController.navigate(
-                        Screen.Gallery.passPlantName(
+                        Screen.Gallery.createRoute(
                             plantName = it.name
                         )
                     )
@@ -77,7 +77,7 @@ fun SunFlowerNavHost(
         }
         composable(
             route = Screen.Gallery.route,
-            arguments = Screen.Gallery.arguments
+            arguments = Screen.Gallery.navArguments
         ) {
             GalleryScreen(
                 onPhotoClick = {

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/utilities/Screen.kt b/app/src/main/java/com/google/samples/apps/sunflower/utilities/Screen.kt
@@ -16,24 +16,32 @@
 
 package com.google.samples.apps.sunflower.utilities
 
+import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
 
-sealed class Screen(val route: String) {
+sealed class Screen(
+    val route: String,
+    val navArguments: List<NamedNavArgument> = emptyList()
+) {
     data object Home : Screen("home")
-    data object PlantDetail : Screen("plantDetail/{plantId}") {
-        fun passPlantId(plantId: String) = "plantDetail/${plantId}"
-        val arguments = listOf(navArgument("plantId") {
+
+    data object PlantDetail : Screen(
+        route = "plantDetail/{plantId}",
+        navArguments = listOf(navArgument("plantId") {
             type = NavType.StringType
         })
-
+    ) {
+        fun createRoute(plantId: String) = "plantDetail/${plantId}"
     }
 
-    data object Gallery : Screen("gallery/{plantName}") {
-        fun passPlantName(plantName: String) = "gallery/${plantName}"
-        val arguments = listOf(navArgument("plantName") {
+    data object Gallery : Screen(
+        route = "gallery/{plantName}",
+        navArguments = listOf(navArgument("plantName") {
             type = NavType.StringType
         })
+    ) {
+        fun createRoute(plantName: String) = "gallery/${plantName}"
 
     }
 }