[fix] #76 기타 브랜드 마커 그대로 표시되는 이슈 수정

Team-BuddyCon · May 18, 2024 · 7a79e66 · 7a79e66
1 parent 13b8dba
commit 7a79e66
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
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
@@ -220,7 +220,8 @@ private fun MapBottomSheet(
             .heightIn(
                 min = BottomSheetValue.Collapsed.sheetPeekHeightDp.dp,
                 max = BottomSheetValue.Expanded.sheetPeekHeightDp.dp
-            ).fillMaxSize()
+            )
+            .fillMaxSize()
             .background(BuddyConTheme.colors.background)
             .pointerInput(Unit) {
                 detectVerticalDragGestures(
@@ -254,7 +255,7 @@ private fun MapBottomSheet(
             else -> {
                 GifticonInfoModalSheetContent(
                     countOfUsableGifticon = mapUiState.totalCount,
-                    countOfImminetGifticon = mapUiState.deadLineCount,
+                    countOfImminetGifticon = mapUiState.deadLineCount
                 )
             }
         }
@@ -498,7 +499,7 @@ private fun transitionBottomSheet(
     current: BottomSheetValue,
     offset: Float
 ): BottomSheetValue {
-    val value = if (offset > 0f) {
+    return if (offset > 0f) {
         when (current) {
             BottomSheetValue.Collapsed -> BottomSheetValue.PartiallyExpanded
             BottomSheetValue.PartiallyExpanded -> BottomSheetValue.Expanded
@@ -511,5 +512,4 @@ private fun transitionBottomSheet(
             BottomSheetValue.Expanded -> BottomSheetValue.PartiallyExpanded
         }
     }
-    return value
 }
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
@@ -15,6 +15,7 @@ import com.yapp.buddycon.utility.stability.MapSearchPlace
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.zip
@@ -73,12 +74,16 @@ class MapViewModel @Inject constructor(
     ) {
         if (stores.isEmpty()) return
         stores.map { store ->
-            kakaoRepository.searchPlacesByKeyword(
-                query = store.value,
-                x = x,
-                y = y,
-                radius = 2000
-            )
+            if (store == GifticonStore.NONE || store == GifticonStore.OTHERS) {
+                flowOf(listOf())
+            } else {
+                kakaoRepository.searchPlacesByKeyword(
+                    query = store.value,
+                    x = x,
+                    y = y,
+                    radius = 2000
+                )
+            }
         }.reduce { acc, flow ->
             acc.zip(flow) { searchPlaceModels, searchPlaceModel ->
                 searchPlaceModels + searchPlaceModel