✨ 러닝 종료 시 RunningActivity 종료 및 화면 전환 처리

Co-authored-by: yonghanJu <[email protected]>

Author: bngsh

presentation/src/main/java/com/whyranoid/presentation/running/Event.kt

@@ -1,5 +1,6 @@
 package com.whyranoid.presentation.running
 
 sealed interface Event {
-    data class TrackingButtonClick(val mode: TrackingMode) : Event
+    data class FinishButtonClick(val runningFinishData: RunningFinishData) : Event
+    object RunningFinishFailure : Event
 }

presentation/src/main/java/com/whyranoid/presentation/running/RunningActivity.kt

@@ -1,5 +1,6 @@
 package com.whyranoid.presentation.running
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import com.naver.maps.geometry.LatLng
@@ -138,6 +139,15 @@ internal class RunningActivity :
                 }
             }
         }
+
+        repeatWhenUiStarted {
+            viewModel.eventFlow.collect { event ->
+                when (event) {
+                    is Event.FinishButtonClick -> handleRunningFinishSuccessState(event.runningFinishData)
+                    is Event.RunningFinishFailure -> handleRunningFinishFailureState()
+                }
+            }
+        }
     }
 
     private fun observeStateOnMapReady() {
@@ -199,6 +209,15 @@ internal class RunningActivity :
         }
     }
 
+    private fun handleRunningFinishSuccessState(runningFinishData: RunningFinishData) {
+        setResult(RESULT_OK, Intent().putExtra(RunningViewModel.RUNNING_FINISH_DATA_KEY, runningFinishData))
+        finish()
+    }
+
+    private fun handleRunningFinishFailureState() {
+        finish()
+    }
+
     companion object {
         const val MAP_MAX_ZOOM = 18.0
         const val MAP_MIN_ZOOM = 10.0

presentation/src/main/java/com/whyranoid/presentation/running/RunningViewModel.kt

@@ -107,8 +107,11 @@ class RunningViewModel @Inject constructor(
     }
 
     fun onFinishButtonClicked() {
-        // TODO: 액티비티에 이벤트 알려주기
-        runningDataManager.finishRunning()
+        runningDataManager.finishRunning().onSuccess { runningFinishData ->
+            emitEvent(Event.FinishButtonClick(runningFinishData))
+        }.onFailure {
+            emitEvent(Event.RunningFinishFailure)
+        }
     }
 
     companion object {

presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartFragment.kt

@@ -51,12 +51,15 @@ internal class RunningStartFragment :
                     RUNNING_FINISH_DATA_KEY
                 )
 
-            // 결과 넘겨주기
-            val direction =
-                RunningStartFragmentDirections.actionRunningStartFragmentToRunningFinish(
-                    runningFinishData
-                )
-            findNavController().navigate(direction)
+            runningFinishData?.let {
+                // 결과 넘겨주기
+                val direction =
+                    RunningStartFragmentDirections.actionRunningStartFragmentToRunningFinish(
+                        runningFinishData
+                    )
+                findNavController().navigate(direction)
+            } ?: Snackbar.make(binding.root, "러닝 도중 에러가 발생했어요! 죄송해요..", Snackbar.LENGTH_SHORT)
+                .show()
         }
     }