File tree Expand file tree Collapse file tree
data/src/main/java/com/threegap/bitnagil/data/writeroutine
domain/src/main/java/com/threegap/bitnagil/domain/writeroutine
presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11package com.threegap.bitnagil.data.writeroutine.model.request
22
3+ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
34import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
45import kotlinx.serialization.SerialName
56import kotlinx.serialization.Serializable
@@ -19,5 +20,5 @@ data class RegisterRoutineRequest(
1920 @SerialName(" subRoutineName" )
2021 val subRoutineName : List <String >,
2122 @SerialName(" recommendedRoutineType" )
22- val recommendedRoutineType : String ? ,
23+ val recommendedRoutineType : RecommendCategory ? ,
2324)
Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ package com.threegap.bitnagil.data.writeroutine.repositoryImpl
33import com.threegap.bitnagil.data.writeroutine.datasource.WriteRoutineDataSource
44import com.threegap.bitnagil.data.writeroutine.model.request.EditRoutineRequest
55import com.threegap.bitnagil.data.writeroutine.model.request.RegisterRoutineRequest
6+ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
67import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
78import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
89import com.threegap.bitnagil.domain.writeroutine.model.WriteRoutineEvent
@@ -24,7 +25,7 @@ class WriteRoutineRepositoryImpl @Inject constructor(
2425 startDate : LocalDate ,
2526 endDate : LocalDate ,
2627 subRoutines : List <String >,
27- recommendedRoutineType : String ? ,
28+ recommendedRoutineType : RecommendCategory ? ,
2829 ): Result <Unit > {
2930 val request = RegisterRoutineRequest (
3031 routineName = name,
Original file line number Diff line number Diff line change 11package com.threegap.bitnagil.domain.writeroutine.repository
22
3+ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
34import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
45import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
56import com.threegap.bitnagil.domain.writeroutine.model.WriteRoutineEvent
@@ -15,7 +16,7 @@ interface WriteRoutineRepository {
1516 startDate : LocalDate ,
1617 endDate : LocalDate ,
1718 subRoutines : List <String >,
18- recommendedRoutineType : String ? ,
19+ recommendedRoutineType : RecommendCategory ? ,
1920 ): Result <Unit >
2021
2122 suspend fun editRoutine (
Original file line number Diff line number Diff line change 11package com.threegap.bitnagil.domain.writeroutine.usecase
22
3+ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
34import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
45import com.threegap.bitnagil.domain.writeroutine.repository.WriteRoutineRepository
56import java.time.LocalDate
@@ -16,7 +17,7 @@ class RegisterRoutineUseCase @Inject constructor(
1617 startDate : LocalDate ,
1718 endDate : LocalDate ,
1819 subRoutines : List <String >,
19- recommendedRoutineType : String ? ,
20+ recommendedRoutineType : RecommendCategory ? ,
2021 ): Result <Unit > {
2122 return writeRoutineRepository.registerRoutine(
2223 name = name,
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
147147 oldSubRoutines.getOrNull(2 )?.name ? : " " ,
148148 ),
149149 loading = false ,
150- recommendedRoutineType = routine.category.displayTitle ,
150+ recommendedRoutineType = routine.category,
151151 )
152152 }
153153 },
Original file line number Diff line number Diff line change 11package com.threegap.bitnagil.presentation.writeroutine.contract
22
33import android.os.Parcelable
4+ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
45import com.threegap.bitnagil.presentation.writeroutine.model.Date
56import com.threegap.bitnagil.presentation.writeroutine.model.Day
67import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType
@@ -29,7 +30,7 @@ data class WriteRoutineState(
2930 val repeatDaysUiExpanded : Boolean ,
3031 val periodUiExpanded : Boolean ,
3132 val startTimeUiExpanded : Boolean ,
32- val recommendedRoutineType : String ? ,
33+ val recommendedRoutineType : RecommendCategory ? ,
3334) : Parcelable {
3435 companion object {
3536 val INIT = WriteRoutineState (
You can’t perform that action at this time.
0 commit comments