Refactor: 추천 루틴 카테고리 모델 통합

Author: wjdrjs00

data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineResponse.kt

@@ -1,7 +1,7 @@
 package com.threegap.bitnagil.data.routine.model.response
 
+import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.routine.model.DayOfWeek
-import com.threegap.bitnagil.domain.routine.model.RecommendedRoutineType
 import com.threegap.bitnagil.domain.routine.model.Routine
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -25,7 +25,7 @@ data class RoutineResponse(
     @SerialName("subRoutineCompleteYn")
     val subRoutineCompleteYn: List<Boolean>,
     @SerialName("recommendedRoutineType")
-    val recommendedRoutineType: RecommendedRoutineType?,
+    val recommendedRoutineType: RecommendCategory?,
     @SerialName("routineDeletedYn")
     val routineDeletedYn: Boolean,
     @SerialName("routineStartDate")

domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RecommendedRoutineType.kt

@@ -1,5 +1,7 @@
 package com.threegap.bitnagil.domain.routine.model
 
+import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
+
 data class Routine(
     val id: String,
     val name: String,
@@ -12,5 +14,5 @@ data class Routine(
     val isDeleted: Boolean,
     val subRoutineNames: List<String>,
     val subRoutineCompletionStates: List<Boolean>,
-    val recommendedRoutineType: RecommendedRoutineType?,
+    val recommendedRoutineType: RecommendCategory?,
 )

domain/src/main/java/com/threegap/bitnagil/domain/routine/model/Routine.kt

@@ -1,7 +1,7 @@
 package com.threegap.bitnagil.presentation.home.model
 
+import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.routine.model.DayOfWeek
-import com.threegap.bitnagil.domain.routine.model.RecommendedRoutineType
 import com.threegap.bitnagil.domain.routine.model.Routine
 
 data class RoutineUiModel(
@@ -13,7 +13,7 @@ data class RoutineUiModel(
     val isCompleted: Boolean,
     val subRoutineNames: List<String>,
     val subRoutineCompletionStates: List<Boolean>,
-    val recommendedRoutineType: RecommendedRoutineType?,
+    val recommendedRoutineType: RecommendCategory?,
 )
 
 internal fun Routine.toUiModel(): RoutineUiModel =

presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineUiModel.kt

@@ -22,10 +22,10 @@ import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton
 import com.threegap.bitnagil.domain.routine.model.DayOfWeek
+import com.threegap.bitnagil.presentation.common.extension.displayColor
+import com.threegap.bitnagil.presentation.common.extension.displayIcon
 import com.threegap.bitnagil.presentation.common.extension.displayTitle
 import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
-import com.threegap.bitnagil.presentation.routinelist.model.getColor
-import com.threegap.bitnagil.presentation.routinelist.model.getIcon
 
 @Composable
 fun RoutineDetailsCard(
@@ -56,11 +56,11 @@ fun RoutineDetailsCard(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             BitnagilIcon(
-                id = if (routine.recommendedRoutineType != null) routine.recommendedRoutineType.getIcon() else R.drawable.ic_shine,
+                id = if (routine.recommendedRoutineType != null) routine.recommendedRoutineType.displayIcon else R.drawable.ic_shine,
                 tint = null,
                 modifier = Modifier
                     .background(
-                        color = if (routine.recommendedRoutineType != null) routine.recommendedRoutineType.getColor() else BitnagilTheme.colors.yellow10,
+                        color = if (routine.recommendedRoutineType != null) routine.recommendedRoutineType.displayColor else BitnagilTheme.colors.yellow10,
                         shape = RoundedCornerShape(4.dp),
                     )
                     .padding(4.dp),

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/RoutineDetailsCard.kt

@@ -1,12 +1,8 @@
 package com.threegap.bitnagil.presentation.routinelist.model
 
 import android.os.Parcelable
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import com.threegap.bitnagil.designsystem.BitnagilTheme
-import com.threegap.bitnagil.designsystem.R
+import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.routine.model.DayOfWeek
-import com.threegap.bitnagil.domain.routine.model.RecommendedRoutineType
 import com.threegap.bitnagil.domain.routine.model.Routine
 import com.threegap.bitnagil.presentation.home.util.formatExecutionTime12Hour
 import com.threegap.bitnagil.presentation.home.util.toShortDateFormat
@@ -23,8 +19,8 @@ data class RoutineUiModel(
     val endDate: String,
     val routineDeletedYn: Boolean,
     val subRoutineNames: List<String>,
-    val recommendedRoutineType: RecommendedRoutineType?,
 ) : Parcelable {
+    val recommendedRoutineType: RecommendCategory?,
     val formattedDateRange: String
         get() = "${startDate.toShortDateFormat()} - ${endDate.toShortDateFormat()}"
 }
@@ -43,25 +39,3 @@ fun Routine.toUiModel(): RoutineUiModel =
         recommendedRoutineType = this.recommendedRoutineType,
     )
 
-fun RecommendedRoutineType.getIcon(): Int =
-    when (this) {
-        RecommendedRoutineType.OUTING -> R.drawable.ic_outside
-        RecommendedRoutineType.WAKE_UP -> R.drawable.ic_wakeup
-        RecommendedRoutineType.CONNECT -> R.drawable.ic_connect
-        RecommendedRoutineType.REST -> R.drawable.ic_rest
-        RecommendedRoutineType.GROW -> R.drawable.ic_grow
-        RecommendedRoutineType.PERSONALIZED -> R.drawable.ic_shine
-        RecommendedRoutineType.OUTING_REPORT -> R.drawable.ic_shine
-    }
-
-@Composable
-fun RecommendedRoutineType.getColor(): Color =
-    when (this) {
-        RecommendedRoutineType.OUTING -> BitnagilTheme.colors.skyBlue10
-        RecommendedRoutineType.WAKE_UP -> BitnagilTheme.colors.orange25
-        RecommendedRoutineType.CONNECT -> BitnagilTheme.colors.purple10
-        RecommendedRoutineType.REST -> BitnagilTheme.colors.green10
-        RecommendedRoutineType.GROW -> BitnagilTheme.colors.pink10
-        RecommendedRoutineType.PERSONALIZED -> BitnagilTheme.colors.yellow10
-        RecommendedRoutineType.OUTING_REPORT -> BitnagilTheme.colors.yellow10
-    }