✨ RunningDataManager.kt 에서 현재 프로젝트의 의존성 제거

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

Author: yonghanJu

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

@@ -1,5 +1,7 @@
 package com.whyranoid.presentation.running
 
+import com.whyranoid.presentation.running.runningdatamanager.RunningFinishData
+
 sealed interface Event {
     data class FinishButtonClick(val runningFinishData: RunningFinishData) : Event
     object RunningFinishFailure : Event

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

@@ -17,10 +17,14 @@ import com.naver.maps.map.overlay.PathOverlay
 import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseActivity
 import com.whyranoid.presentation.databinding.ActivityRunningBinding
+import com.whyranoid.presentation.running.runningdatamanager.RunningData
+import com.whyranoid.presentation.running.runningdatamanager.RunningFinishData
+import com.whyranoid.presentation.running.runningdatamanager.RunningState
+import com.whyranoid.presentation.running.runningdatamanager.toLatLng
 import com.whyranoid.presentation.util.dateToString
 import com.whyranoid.presentation.util.repeatWhenUiStarted
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.*
+import java.util.Date
 
 @AndroidEntryPoint
 internal class RunningActivity :

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

@@ -12,7 +12,9 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import com.whyranoid.domain.usecase.FinishRunningUseCase
 import com.whyranoid.domain.usecase.StartRunningUseCase
-import com.whyranoid.presentation.model.toRunningHistory
+import com.whyranoid.presentation.running.runningdatamanager.RunningDataManager
+import com.whyranoid.presentation.running.runningdatamanager.RunningState
+import com.whyranoid.presentation.running.runningdatamanager.toRunningHistory
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -26,10 +28,10 @@ import javax.inject.Inject
 class RunningViewModel @Inject constructor(
     @ApplicationContext context: Context,
     startRunningUseCase: StartRunningUseCase,
-    private val finishRunningUseCase: FinishRunningUseCase,
-    private val runningDataManager: RunningDataManager
+    private val finishRunningUseCase: FinishRunningUseCase
 ) : ViewModel() {
 
+    private val runningDataManager = RunningDataManager.getInstance()
     val runningState = runningDataManager.runningState
 
     private val _trackingModeState = MutableStateFlow(TrackingMode.FOLLOW)

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

@@ -22,17 +22,20 @@ import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.Priority
 import com.whyranoid.presentation.MainActivity
 import com.whyranoid.presentation.R
+import com.whyranoid.presentation.running.runningdatamanager.RunningDataManager
+import com.whyranoid.presentation.running.runningdatamanager.RunningState
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.delay
 
 @HiltWorker
 class RunningWorker @AssistedInject constructor(
     @Assisted private val context: Context,
-    @Assisted params: WorkerParameters,
-    private val runningDataManager: RunningDataManager
+    @Assisted params: WorkerParameters
 ) : CoroutineWorker(context, params) {
 
+    private val runningDataManager = RunningDataManager.getInstance()
+
     private val fusedLocationClient = LocationServices.getFusedLocationProviderClient(context)
     private val locationRequest =
         LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, UPDATE_INTERVAL_MS).build()

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

@@ -1,15 +1,11 @@
-package com.whyranoid.presentation.running
+package com.whyranoid.presentation.running.runningdatamanager
 
 import android.location.Location
-import com.whyranoid.presentation.model.RunningHistoryUiModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
+import java.util.UUID
 
-@Singleton
-class RunningDataManager @Inject constructor() {
+class RunningDataManager {
     private var _runningState = MutableStateFlow<RunningState>(
         RunningState.NotRunning()
     )
@@ -107,6 +103,16 @@ class RunningDataManager @Inject constructor() {
             it.runningData.copy(runningTime = it.runningData.runningTime + 1)
         }.let { RunningState.Running(it) }
     }
+
+    companion object {
+        private var INSTANCE: RunningDataManager? = null
+
+        fun getInstance(): RunningDataManager {
+            return INSTANCE ?: RunningDataManager().also {
+                INSTANCE = it
+            }
+        }
+    }
 }
 
 // TODO : 모델 파일 분리
@@ -120,7 +126,7 @@ data class RunningData(
 )
 
 data class RunningFinishData(
-    val runningHistory: RunningHistoryUiModel,
+    val runningHistory: RunningHistoryModel,
     val runningPositionList: List<List<RunningPosition>>
 ) : java.io.Serializable
 
@@ -136,9 +142,8 @@ sealed interface RunningState {
 
 fun RunningData.toRunningFinishData() =
     RunningFinishData(
-        RunningHistoryUiModel(
+        RunningHistoryModel(
             historyId = UUID.randomUUID().toString(),
-            date = startTime,
             startedAt = startTime,
             finishedAt = System.currentTimeMillis(),
             totalRunningTime = runningTime,
@@ -147,3 +152,12 @@ fun RunningData.toRunningFinishData() =
         ),
         runningPositionList
     )
+
+data class RunningHistoryModel(
+    val historyId: String = "",
+    val startedAt: Long = 0L,
+    val finishedAt: Long = 0L,
+    val totalRunningTime: Int = 0,
+    val pace: Double = 0.0,
+    val totalDistance: Double = 0.0
+) : java.io.Serializable

presentation/src/main/java/com/whyranoid/presentation/running/RunningDataManager.kt renamed to presentation/src/main/java/com/whyranoid/presentation/running/runningdatamanager/RunningDataManager.kt

@@ -0,0 +1,38 @@
+package com.whyranoid.presentation.running.runningdatamanager
+
+import com.naver.maps.geometry.LatLng
+import com.whyranoid.domain.model.RunningHistory
+import com.whyranoid.presentation.model.RunningHistoryUiModel
+
+data class RunningPosition(
+    val latitude: Double,
+    val longitude: Double
+) : java.io.Serializable
+
+fun RunningPosition.toLatLng(): LatLng {
+    return LatLng(
+        this.latitude,
+        this.longitude
+    )
+}
+
+fun RunningHistoryModel.toRunningHistoryUiModel() =
+    RunningHistoryUiModel(
+        historyId = historyId,
+        date = startedAt,
+        startedAt = startedAt,
+        finishedAt = finishedAt,
+        totalRunningTime = totalRunningTime,
+        pace = pace,
+        totalDistance = totalDistance
+    )
+
+fun RunningHistoryModel.toRunningHistory() =
+    RunningHistory(
+        historyId = historyId,
+        startedAt = startedAt,
+        finishedAt = finishedAt,
+        totalRunningTime = totalRunningTime,
+        pace = pace,
+        totalDistance = totalDistance
+    )

presentation/src/main/java/com/whyranoid/presentation/running/runningdatamanager/RunningPosition.kt

@@ -15,10 +15,11 @@ import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentRunningFinishBinding
 import com.whyranoid.presentation.model.RunningHistoryUiModel
 import com.whyranoid.presentation.model.UiState
-import com.whyranoid.presentation.running.RunningFinishData
-import com.whyranoid.presentation.running.RunningPosition
-import com.whyranoid.presentation.running.toLatLng
-import com.whyranoid.presentation.util.pxdp.PxDpUtil
+import com.whyranoid.presentation.running.runningdatamanager.RunningFinishData
+import com.whyranoid.presentation.running.runningdatamanager.RunningPosition
+import com.whyranoid.presentation.running.runningdatamanager.toLatLng
+import com.whyranoid.presentation.running.runningdatamanager.toRunningHistoryUiModel
+import com.whyranoid.presentation.util.converters.UnitConverters
 import com.whyranoid.presentation.util.repeatWhenUiStarted
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
@@ -72,7 +73,8 @@ internal class RunningFinishFragment :
     }
 
     private fun handleDataStateSuccess(runningFinishData: RunningFinishData) {
-        binding.runningHistoryItem.runningHistory = runningFinishData.runningHistory
+        binding.runningHistoryItem.runningHistory =
+            runningFinishData.runningHistory.toRunningHistoryUiModel()
 
         moveCamera(runningFinishData)
         updatePathsOverlay(runningFinishData.runningPositionList)
@@ -95,9 +97,10 @@ internal class RunningFinishFragment :
     }
 
     private fun handlePositiveButtonClicked(runningHistory: RunningHistoryUiModel) {
-        val direction = RunningFinishFragmentDirections.actionRunningFinishFragmentToCreateRunningPostFragment(
-            runningHistory
-        )
+        val direction =
+            RunningFinishFragmentDirections.actionRunningFinishFragmentToCreateRunningPostFragment(
+                runningHistory
+            )
         findNavController().navigate(direction)
     }
 
@@ -118,7 +121,7 @@ internal class RunningFinishFragment :
                         position.toLatLng()
                     }
                 ).build(),
-                PxDpUtil.pxToDp(requireContext(), 200)
+                UnitConverters.pxToDp(requireContext(), 200)
             )
             it.moveCamera(cameraUpdate)
         }

presentation/src/main/java/com/whyranoid/presentation/runningfinish/RunningFinishFragment.kt

@@ -6,8 +6,9 @@ import androidx.lifecycle.viewModelScope
 import com.whyranoid.domain.model.MoGakRunException
 import com.whyranoid.domain.usecase.SaveRunningHistoryUseCase
 import com.whyranoid.presentation.model.UiState
-import com.whyranoid.presentation.running.RunningFinishData
 import com.whyranoid.presentation.running.RunningViewModel.Companion.RUNNING_FINISH_DATA_KEY
+import com.whyranoid.presentation.running.runningdatamanager.RunningFinishData
+import com.whyranoid.presentation.running.runningdatamanager.toRunningHistoryUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -58,7 +59,7 @@ class RunningFinishViewModel @Inject constructor(
 
     fun onPositiveButtonClicked() {
         (runningFinishDataState.value as? UiState.Success<RunningFinishData>)?.value?.let { runningFinishData ->
-            emitEvent(Event.PositiveButtonClick(runningFinishData.runningHistory))
+            emitEvent(Event.PositiveButtonClick(runningFinishData.runningHistory.toRunningHistoryUiModel()))
         } ?: kotlin.run {
             _runningFinishDataState.value = UiState.Failure(
                 MoGakRunException.FileNotFoundedException

presentation/src/main/java/com/whyranoid/presentation/runningfinish/RunningFinishViewModel.kt

@@ -17,9 +17,9 @@ import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentRunningStartBinding
 import com.whyranoid.presentation.running.RunningActivity
-import com.whyranoid.presentation.running.RunningFinishData
-import com.whyranoid.presentation.running.RunningState
 import com.whyranoid.presentation.running.RunningViewModel.Companion.RUNNING_FINISH_DATA_KEY
+import com.whyranoid.presentation.running.runningdatamanager.RunningFinishData
+import com.whyranoid.presentation.running.runningdatamanager.RunningState
 import com.whyranoid.presentation.util.getSerializableData
 import com.whyranoid.presentation.util.gpsstate.GPSState
 import com.whyranoid.presentation.util.repeatWhenUiStarted