✨ RunningData 모듈 분리

yonghanJu · bngsh · yonghanJu · commit 3578a6f8b114 · 2022-12-07T16:05:33.000+09:00
Co-authored-by: bngsh &lt;hee132@korea.ac.kr&gt;
diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -51,6 +51,7 @@ android {
 dependencies {
 
     implementation project(":domain")
+    implementation project(":runningdata")
 
     implementation "androidx.core:core-ktx:$coreKtxVersion"
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
diff --git a/presentation/src/main/java/com/whyranoid/presentation/running/Event.kt b/presentation/src/main/java/com/whyranoid/presentation/running/Event.kt
@@ -1,6 +1,6 @@
 package com.whyranoid.presentation.running
 
-import com.whyranoid.presentation.running.runningdatamanager.RunningFinishData
+import com.whyranoid.runningdata.model.RunningFinishData
 
 sealed interface Event {
     data class FinishButtonClick(val runningFinishData: RunningFinishData) : Event
diff --git a/presentation/src/main/java/com/whyranoid/presentation/running/RunningActivity.kt b/presentation/src/main/java/com/whyranoid/presentation/running/RunningActivity.kt
@@ -17,12 +17,11 @@ 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 com.whyranoid.runningdata.model.RunningData
+import com.whyranoid.runningdata.model.RunningFinishData
+import com.whyranoid.runningdata.model.RunningState
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.Date
 
@@ -76,7 +75,7 @@ internal class RunningActivity :
         }
 
         observeStateOnMapReady()
-        naverMap.addOnCameraChangeListener { reason, animated ->
+        naverMap.addOnCameraChangeListener { reason, _ ->
             if (reason == CameraUpdate.REASON_GESTURE) {
                 viewModel.onTrackingCanceledByGesture()
             }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/running/RunningUtil.kt b/presentation/src/main/java/com/whyranoid/presentation/running/RunningUtil.kt
@@ -1,13 +1,10 @@
-package com.whyranoid.presentation.running.runningdatamanager
+package com.whyranoid.presentation.running
 
 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
+import com.whyranoid.runningdata.model.RunningHistoryModel
+import com.whyranoid.runningdata.model.RunningPosition
 
 fun RunningPosition.toLatLng(): LatLng {
     return LatLng(
diff --git a/presentation/src/main/java/com/whyranoid/presentation/running/RunningViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/running/RunningViewModel.kt
@@ -12,9 +12,8 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import com.whyranoid.domain.usecase.FinishRunningUseCase
 import com.whyranoid.domain.usecase.StartRunningUseCase
-import com.whyranoid.presentation.running.runningdatamanager.RunningDataManager
-import com.whyranoid.presentation.running.runningdatamanager.RunningState
-import com.whyranoid.presentation.running.runningdatamanager.toRunningHistory
+import com.whyranoid.runningdata.RunningDataManager
+import com.whyranoid.runningdata.model.RunningState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/presentation/src/main/java/com/whyranoid/presentation/running/RunningWorker.kt b/presentation/src/main/java/com/whyranoid/presentation/running/RunningWorker.kt
@@ -22,8 +22,8 @@ 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 com.whyranoid.runningdata.RunningDataManager
+import com.whyranoid.runningdata.model.RunningState
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.delay
@@ -62,7 +62,6 @@ class RunningWorker @AssistedInject constructor(
     }
 
     private fun createForegroundInfo(progress: String): ForegroundInfo {
-        val id = context.getString(R.string.running_notification_id)
         val title = context.getString(R.string.running_notification_title)
 
         val intent = Intent(context, MainActivity::class.java)
@@ -73,7 +72,7 @@ class RunningWorker @AssistedInject constructor(
             createChannel()
         }
 
-        val notification = NotificationCompat.Builder(applicationContext, id)
+        val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
             .setContentTitle(title)
             .setTicker(title)
             .setContentText(progress)
diff --git a/presentation/src/main/java/com/whyranoid/presentation/runningfinish/RunningFinishFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/runningfinish/RunningFinishFragment.kt
@@ -15,12 +15,12 @@ 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.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.running.toLatLng
+import com.whyranoid.presentation.running.toRunningHistoryUiModel
 import com.whyranoid.presentation.util.converters.UnitConverters
 import com.whyranoid.presentation.util.repeatWhenUiStarted
+import com.whyranoid.runningdata.model.RunningFinishData
+import com.whyranoid.runningdata.model.RunningPosition
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 
diff --git a/presentation/src/main/java/com/whyranoid/presentation/runningfinish/RunningFinishViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/runningfinish/RunningFinishViewModel.kt
@@ -7,8 +7,8 @@ import com.whyranoid.domain.model.MoGakRunException
 import com.whyranoid.domain.usecase.SaveRunningHistoryUseCase
 import com.whyranoid.presentation.model.UiState
 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 com.whyranoid.presentation.running.toRunningHistoryUiModel
+import com.whyranoid.runningdata.model.RunningFinishData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartFragment.kt
@@ -18,11 +18,11 @@ import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentRunningStartBinding
 import com.whyranoid.presentation.running.RunningActivity
 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
+import com.whyranoid.runningdata.model.RunningFinishData
+import com.whyranoid.runningdata.model.RunningState
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
diff --git a/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartViewModel.kt
@@ -3,8 +3,8 @@ package com.whyranoid.presentation.runningstart
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.whyranoid.domain.usecase.GetRunnerCountUseCase
-import com.whyranoid.presentation.running.runningdatamanager.RunningDataManager
 import com.whyranoid.presentation.util.networkconnection.NetworkConnectionStateHolder
+import com.whyranoid.runningdata.RunningDataManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
diff --git a/presentation/src/main/res/layout/activity_running.xml b/presentation/src/main/res/layout/activity_running.xml
@@ -5,7 +5,7 @@
 
     <data>
 
-        <import type="com.whyranoid.presentation.running.runningdatamanager.RunningState" />
+        <import type="com.whyranoid.runningdata.model.RunningState" />
 
         <import type="android.view.View" />
 
diff --git a/presentation/src/main/res/navigation/navigation_graph.xml b/presentation/src/main/res/navigation/navigation_graph.xml
@@ -97,7 +97,7 @@
         android:name="com.whyranoid.presentation.runningfinish.RunningFinishFragment">
         <argument
             android:name="runningFinishData"
-            app:argType="com.whyranoid.presentation.running.runningdatamanager.RunningFinishData"
+            app:argType="com.whyranoid.runningdata.model.RunningFinishData"
             app:nullable="true" />
         <action
             android:id="@+id/action_runningFinishFragment_to_createRunningPostFragment"
diff --git a/runningdata/.gitignore b/runningdata/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/runningdata/build.gradle b/runningdata/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'com.whyranoid.runningdata'
+    compileSdk 33
+
+    defaultConfig {
+        minSdk 23
+        targetSdk 33
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+    dependencies {
+
+        implementation "androidx.core:core-ktx:$coreKtxVersion"
+        implementation "androidx.appcompat:appcompat:$appcompatVersion"
+        implementation "com.google.android.material:material:$materialVersion"
+        testImplementation "junit:junit:$junitVersion"
+        androidTestImplementation "androidx.test.ext:junit:$junitUiVersion"
+        androidTestImplementation "androidx.test.espresso:espresso-core:$espressoCoreVersion"
+    }
diff --git a/runningdata/consumer-rules.pro b/runningdata/consumer-rules.pro
diff --git a/runningdata/proguard-rules.pro b/runningdata/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/runningdata/src/main/AndroidManifest.xml b/runningdata/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/runningdata/src/main/java/com/whyranoid/runningdata/RunningDataManager.kt b/runningdata/src/main/java/com/whyranoid/runningdata/RunningDataManager.kt
@@ -1,9 +1,13 @@
-package com.whyranoid.presentation.running.runningdatamanager
+package com.whyranoid.runningdata
 
 import android.location.Location
+import com.whyranoid.runningdata.model.RunningData
+import com.whyranoid.runningdata.model.RunningFinishData
+import com.whyranoid.runningdata.model.RunningPosition
+import com.whyranoid.runningdata.model.RunningState
+import com.whyranoid.runningdata.model.toRunningFinishData
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import java.util.UUID
 
 class RunningDataManager {
     private var _runningState = MutableStateFlow<RunningState>(
@@ -114,50 +118,3 @@ class RunningDataManager {
         }
     }
 }
-
-// TODO : 모델 파일 분리
-data class RunningData(
-    val startTime: Long = 0L,
-    val runningTime: Int = 0,
-    val totalDistance: Double = 0.0,
-    val pace: Double = 0.0,
-    val runningPositionList: List<List<RunningPosition>> = listOf(emptyList()),
-    val lastLocation: Location? = null
-)
-
-data class RunningFinishData(
-    val runningHistory: RunningHistoryModel,
-    val runningPositionList: List<List<RunningPosition>>
-) : java.io.Serializable
-
-sealed interface RunningState {
-    val runningData: RunningData
-
-    data class NotRunning(override val runningData: RunningData = RunningData()) : RunningState
-
-    data class Running(override val runningData: RunningData) : RunningState
-
-    data class Paused(override val runningData: RunningData) : RunningState
-}
-
-fun RunningData.toRunningFinishData() =
-    RunningFinishData(
-        RunningHistoryModel(
-            historyId = UUID.randomUUID().toString(),
-            startedAt = startTime,
-            finishedAt = System.currentTimeMillis(),
-            totalRunningTime = runningTime,
-            pace = pace,
-            totalDistance = totalDistance
-        ),
-        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
diff --git a/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningData.kt b/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningData.kt
@@ -0,0 +1,26 @@
+package com.whyranoid.runningdata.model
+
+import android.location.Location
+import java.util.UUID
+
+data class RunningData(
+    val startTime: Long = 0L,
+    val runningTime: Int = 0,
+    val totalDistance: Double = 0.0,
+    val pace: Double = 0.0,
+    val runningPositionList: List<List<RunningPosition>> = listOf(emptyList()),
+    val lastLocation: Location? = null
+)
+
+fun RunningData.toRunningFinishData() =
+    RunningFinishData(
+        RunningHistoryModel(
+            historyId = UUID.randomUUID().toString(),
+            startedAt = startTime,
+            finishedAt = System.currentTimeMillis(),
+            totalRunningTime = runningTime,
+            pace = pace,
+            totalDistance = totalDistance
+        ),
+        runningPositionList
+    )
diff --git a/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningFinishData.kt b/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningFinishData.kt
@@ -0,0 +1,6 @@
+package com.whyranoid.runningdata.model
+
+data class RunningFinishData(
+    val runningHistory: RunningHistoryModel,
+    val runningPositionList: List<List<RunningPosition>>
+) : java.io.Serializable
diff --git a/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningHistoryModel.kt b/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningHistoryModel.kt
@@ -0,0 +1,10 @@
+package com.whyranoid.runningdata.model
+
+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
diff --git a/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningPosition.kt b/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningPosition.kt
@@ -0,0 +1,6 @@
+package com.whyranoid.runningdata.model
+
+data class RunningPosition(
+    val latitude: Double,
+    val longitude: Double
+) : java.io.Serializable
diff --git a/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningState.kt b/runningdata/src/main/java/com/whyranoid/runningdata/model/RunningState.kt
@@ -0,0 +1,11 @@
+package com.whyranoid.runningdata.model
+
+sealed interface RunningState {
+    val runningData: RunningData
+
+    data class NotRunning(override val runningData: RunningData = RunningData()) : RunningState
+
+    data class Running(override val runningData: RunningData) : RunningState
+
+    data class Paused(override val runningData: RunningData) : RunningState
+}
diff --git a/runningdata/src/test/java/com/whyranoid/runningdata/ExampleUnitTest.kt b/runningdata/src/test/java/com/whyranoid/runningdata/ExampleUnitTest.kt
@@ -0,0 +1,16 @@
+package com.whyranoid.runningdata
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/settings.gradle b/settings.gradle
@@ -25,3 +25,4 @@ include ':domain'
 include ':data'
 include ':presentation'
 include ':signin'
+include ':runningdata'
