[fix] #76 지도에서 기프티콘 상세 네비게이션 등록 및 변경 시 자동 갱신되도록 수정

Team-BuddyCon · May 19, 2024 · 9a89c59 · 9a89c59
1 parent 7a79e66
commit 9a89c59
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/...rc/main/java/com/yapp/buddycon/designsystem/component/modal/GifticonInfoListModalSheet.kt b/...rc/main/java/com/yapp/buddycon/designsystem/component/modal/GifticonInfoListModalSheet.kt
@@ -1,6 +1,7 @@
 package com.yapp.buddycon.designsystem.component.modal
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -65,7 +66,8 @@ fun GifticonInfoListModalSheet(
     countOfUsableGifticon: Int,
     countOfImminetGifticon: Int,
     gifticonInfos: LazyPagingItems<AvailableGifticon.AvailableGifticonInfo>,
-    gifticonStore: GifticonStore
+    gifticonStore: GifticonStore,
+    onClick: (Int) -> Unit = {}
 ) {
     Column(
         modifier = modifier
@@ -123,7 +125,11 @@ fun GifticonInfoListModalSheet(
         ) {
             items(gifticonInfos.itemCount) { index ->
                 gifticonInfos[index]?.let { gifticonInfo ->
-                    Column {
+                    Column(
+                        modifier = Modifier.clickable {
+                            onClick(gifticonInfo.gifticonId)
+                        }
+                    ) {
                         Box(
                             modifier = Modifier
                                 .fillMaxWidth()

diff --git a/core/navigation/src/main/java/com/yapp/buddycon/navigation/map/MapGraph.kt b/core/navigation/src/main/java/com/yapp/buddycon/navigation/map/MapGraph.kt
@@ -5,6 +5,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import androidx.navigation.navigation
 import com.yapp.buddycon.map.MapScreen
+import com.yapp.buddycon.navigation.gifticon.GifticonDestination
 
 private const val MAP_GRAPH = "map_graph"
 
@@ -16,7 +17,10 @@ internal fun NavGraphBuilder.mapGraph(
         route = MAP_GRAPH
     ) {
         composable(MapDestination.Map.route) {
-            MapScreen()
+            MapScreen { id ->
+                val fromRegister = false
+                navHostController.navigate("${GifticonDestination.Detail.route}/$id/$fromRegister")
+            }
         }
     }
 }
diff --git a/feature/map/src/main/java/com/yapp/buddycon/map/MapScreen.kt b/feature/map/src/main/java/com/yapp/buddycon/map/MapScreen.kt
@@ -85,7 +85,8 @@ private const val MapBarSize = 184f
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MapScreen(
-    mapViewModel: MapViewModel = hiltViewModel()
+    mapViewModel: MapViewModel = hiltViewModel(),
+    onNavigateToGifticonDetail: (Int) -> Unit = {}
 ) {
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
@@ -139,6 +140,10 @@ fun MapScreen(
             }
         }
     }
+
+    LaunchedEffect(Unit) {
+        mapViewModel.fetchAvailableGifticon()
+    }
 
     // 최초 시스템 위치 권한 요청
     RequestLocationPermission(
@@ -158,7 +163,8 @@ fun MapScreen(
     BottomSheetScaffold(
         sheetContent = {
             MapBottomSheet(
-                mapHeightDp = mapHeightDp
+                mapHeightDp = mapHeightDp,
+                onNavigateToGifticonDetail = onNavigateToGifticonDetail
             )
         },
         sheetPeekHeight = mapUiState.heightDp.dp,
@@ -196,7 +202,8 @@ fun MapScreen(
 private fun MapBottomSheet(
     modifier: Modifier = Modifier,
     mapViewModel: MapViewModel = hiltViewModel(),
-    mapHeightDp: Float
+    mapHeightDp: Float,
+    onNavigateToGifticonDetail: (Int) -> Unit = {}
 ) {
     val context = LocalContext.current
     val density = context.resources.displayMetrics.density
@@ -248,7 +255,8 @@ private fun MapBottomSheet(
                     countOfUsableGifticon = mapUiState.totalCount,
                     countOfImminetGifticon = mapUiState.deadLineCount,
                     gifticonInfos = gifticonInfos,
-                    gifticonStore = mapUiState.store
+                    gifticonStore = mapUiState.store,
+                    onClick = onNavigateToGifticonDetail
                 )
             }
 

diff --git a/feature/map/src/main/java/com/yapp/buddycon/map/MapViewModel.kt b/feature/map/src/main/java/com/yapp/buddycon/map/MapViewModel.kt
@@ -44,11 +44,10 @@ class MapViewModel @Inject constructor(
     val placeLabels = _placeLabels.asStateFlow()
 
     init {
-        fetchAvailableGifticon()
         getGifticonCount()
     }
 
-    private fun fetchAvailableGifticon() {
+    fun fetchAvailableGifticon() {
         gifticonRepository.fetchAvailableGifticon(
             gifticonStore = mapUiState.value.store,
             gifticonSortType = SortType.EXPIRATION_DATE