Merge pull request #171 from TeamPINGLE/chore-1.1.0

[chore] 1.1.0 업데이트

Author: jihyunniiii

app/build.gradle.kts

@@ -26,8 +26,8 @@ android {
         applicationId = "org.sopt.pingle"
         minSdk = 28
         targetSdk = 34
-        versionCode = 13
-        versionName = "1.0.1"
+        versionCode = 14
+        versionName = "1.1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "BASE_URL", properties["base.url"].toString())

app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapFragment.kt

@@ -222,7 +222,21 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
                         mapCardAdapter.pinId.takeIf { it != DEFAULT_VALUE }?.let { pinId ->
                             mapViewModel.getPingleList(pinId = pinId)
                         }
-                        mapViewModel.getPinListWithoutFilter()
+                    }
+
+                    else -> Unit
+                }
+            }.launchIn(viewLifecycleOwner.lifecycleScope)
+
+        mapViewModel.pingleDeleteState.flowWithLifecycle(viewLifecycleOwner.lifecycle)
+            .onEach { uiState ->
+                when (uiState) {
+                    is UiState.Success -> {
+                        if (mapCardAdapter.currentList.size == 1) mapViewModel.getPinListWithoutFilter()
+
+                        mapCardAdapter.pinId.takeIf { it != DEFAULT_VALUE }?.let { pinId ->
+                            mapViewModel.getPingleList(pinId = pinId)
+                        }
                     }
 
                     else -> Unit

app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapViewModel.kt

@@ -52,6 +52,9 @@ class MapViewModel @Inject constructor(
     private val _pingleParticipationState = MutableSharedFlow<UiState<Unit?>>()
     val pingleParticipationState get() = _pingleParticipationState.asSharedFlow()
 
+    private val _pingleDeleteState = MutableSharedFlow<UiState<Unit?>>()
+    val pingleDeleteState get() = _pingleDeleteState.asSharedFlow()
+
     private fun setMarkerModelListIsSelected(position: Int) {
         _markerModelData.value.second[position].isSelected.set(!_markerModelData.value.second[position].isSelected.get())
     }
@@ -167,13 +170,13 @@ class MapViewModel @Inject constructor(
 
     fun deletePingleDelete(meetingId: Long) {
         viewModelScope.launch {
-            _pingleParticipationState.emit(UiState.Loading)
+            _pingleDeleteState.emit(UiState.Loading)
             runCatching {
                 deletePingleDeleteUseCase(meetingId = meetingId).collect() { data ->
-                    _pingleParticipationState.emit(UiState.Success(data))
+                    _pingleDeleteState.emit(UiState.Success(data))
                 }
             }.onFailure { exception: Throwable ->
-                _pingleParticipationState.emit(UiState.Error(exception.message))
+                _pingleDeleteState.emit(UiState.Error(exception.message))
             }
         }
     }

app/src/main/java/org/sopt/pingle/util/component/PingleCard.kt

@@ -60,7 +60,11 @@ class PingleCard @JvmOverloads constructor(
             )
             tvCardBottomMapDetail.text = pingleEntity.location
             btnCardBottomMapChat.isEnabled = pingleEntity.isParticipating
-            btnCardBottomMapParticipate.isEnabled = !pingleEntity.isCompleted()
+            btnCardBottomMapParticipate.isEnabled = when {
+                pingleEntity.isOwner -> true
+                else -> pingleEntity.isParticipating || !pingleEntity.isCompleted()
+            }
+
             btnCardBottomMapParticipate.text =
                 when {
                     pingleEntity.isOwner -> stringOf(R.string.map_card_delete)