Merge pull request #313 from Nexters/refactor/253

Refactor/253 Navigation 2.8.x Safe Args 적용
Nexters · Jan 1, 2025 · 8c09242 · 8c09242
2 parents 49acd12 + a5c5217
commit 8c09242
Show file tree

Hide file tree

Showing 52 changed files with 780 additions and 847 deletions.
diff --git a/domain/src/main/java/com/nexters/boolti/domain/model/Sns.kt b/domain/src/main/java/com/nexters/boolti/domain/model/Sns.kt
@@ -1,10 +1,13 @@
 package com.nexters.boolti.domain.model
 
+import kotlinx.serialization.Serializable
+
 data class Sns(
     val id: String,
     val type: SnsType,
     val username: String,
 ) {
+    @Serializable
     enum class SnsType {
         INSTAGRAM, YOUTUBE;
 

diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.hilt)
+    alias(libs.plugins.kotlin.serialization)
     id("kotlin-kapt")
     id("kotlin-parcelize")
 }
@@ -78,6 +79,7 @@ dependencies {
 
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.androidx.material3.android)
     implementation(libs.zoomable)
     kapt(libs.hilt.compiler)

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/extension/NavController.kt b/presentation/src/main/java/com/nexters/boolti/presentation/extension/NavController.kt
@@ -1,12 +1,12 @@
 package com.nexters.boolti.presentation.extension
 
 import androidx.navigation.NavController
-import com.nexters.boolti.presentation.screen.MainDestination
+import com.nexters.boolti.presentation.screen.navigation.MainRoute
 
 fun NavController.navigateToHome() {
     popBackStack(graph.startDestinationId, true)
     try {
-        navigate(MainDestination.Home.route)
+        navigate(MainRoute.Home)
     } catch (e: IllegalArgumentException) {
         navigate(graph.startDestinationId)
     }

diff --git a/...ain/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailNavigation.kt b/...ain/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailNavigation.kt
@@ -2,20 +2,16 @@ package com.nexters.boolti.presentation.reservationdetail
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import com.nexters.boolti.presentation.screen.MainDestination
+import com.nexters.boolti.presentation.screen.LocalNavController
+import com.nexters.boolti.presentation.screen.navigation.MainRoute
 
-fun NavGraphBuilder.ReservationDetailScreen(
-    navigateTo: (String) -> Unit,
-    popBackStack: () -> Unit,
-) {
-    composable(
-        route = MainDestination.ReservationDetail.route,
-        arguments = MainDestination.ReservationDetail.arguments,
-    ) {
+fun NavGraphBuilder.reservationDetailScreen() {
+    composable<MainRoute.ReservationDetail> {
+        val navController = LocalNavController.current
         ReservationDetailScreen(
-            onBackPressed = popBackStack,
+            onBackPressed = navController::popBackStack,
             navigateToRefund = { id, isGift ->
-                navigateTo(MainDestination.Refund.createRoute(id = id, isGift = isGift))
+                navController.navigate(MainRoute.Refund(reservationId = id, isGift = isGift))
             },
         )
     }