Merge pull request #25 from snuhcs-course/frontend-iter4

Frontend iter4
snuhcs-course · Nov 17, 2023 · d22f90a · d22f90a
2 parents d30bd25 + c0e0072
commit d22f90a
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 101 deletions.
diff --git a/frontend/app/src/main/java/com/team13/fooriend/core/graph/HomeNavGraph.kt b/frontend/app/src/main/java/com/team13/fooriend/core/graph/HomeNavGraph.kt
@@ -1,9 +1,7 @@
 package com.team13.fooriend.core.graph
 
-import android.app.Activity
 import android.content.Context
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -18,7 +16,6 @@ import com.team13.fooriend.ui.screen.RestaurantDetailScreen
 import com.team13.fooriend.ui.screen.ReviewDetailScreen
 import com.team13.fooriend.ui.screen.home.HomeScreen
 import com.team13.fooriend.ui.screen.mypage.ChangePwdScreen
-import com.team13.fooriend.ui.screen.mypage.ChangePwdScreenPreview
 import com.team13.fooriend.ui.screen.mypage.MyInformationScreen
 import com.team13.fooriend.ui.screen.mypage.MyPageScreen
 import com.team13.fooriend.ui.screen.social.SocialScreen
@@ -61,9 +58,12 @@ fun HomeNavGraph(
                 context = context,
                 restaurantPlaceId = it.arguments?.getString("restaurantId")?:"",
                 onBackClick = { navController.navigateUp() }, // 뒤로가기 버튼을 누른 경우
-                onWriteReviewClick = { navController.navigate("writeReview/${it}") }, // 리뷰 작성 버튼을 누른 경우
-                onWriterClick = { navController.navigate("fooriend/${it}") }, // 리뷰에 있는 작성자 프로필 이미지를 누른 경우
-            )
+                onWriteReviewClick = {
+                    restaurantPlaceId, restaurantName ->
+                    navController.navigate("writeReview/$restaurantPlaceId/$restaurantName")
+                     },
+            ) // 리뷰 작성 버튼을 누른 경우
+            { navController.navigate("fooriend/${it}") } // 리뷰에 있는 작성자 프로필 이미지를 누른 경우
         }
         composable("reviewDetail/{reviewId}"){backStackEntry ->
             ReviewDetailScreen(
@@ -83,10 +83,11 @@ fun HomeNavGraph(
                 onReviewClick = { navController.navigate("reviewDetail/${it}") }, // 리뷰 이미지를 클릭한 경우
             )
         }
-        composable(route = "writeReview/{restaurantPlaceId}"){
+        composable(route = "writeReview/{restaurantPlaceId}/{restaurantName}"){
             PostingScreen(
                 context = context,
                 restaurantPlaceId = it.arguments?.getString("restaurantPlaceId")?:"",
+                restaurantName = it.arguments?.getString("restaurantName")?:"",
                 onCloseClick = { navController.navigateUp() },
                 onPostClick = { navController.navigateUp() }, // TODO : Post버튼을 누르면 review가 저장되어야 함
             )