REFACTOR: 루틴 작성 화면 관련 클래스의 이름을 WriteRoutine~ 에서 RoutineWrite~ 으로 수정

Author: l5x5l

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -19,9 +19,9 @@ import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.Repor
 import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer
 import com.threegap.bitnagil.presentation.screen.reportwrite.ReportWriteScreenContainer
 import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer
-import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer
-import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel
-import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg
+import com.threegap.bitnagil.presentation.screen.routinewrite.RoutineWriteScreenContainer
+import com.threegap.bitnagil.presentation.screen.routinewrite.RoutineWriteViewModel
+import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.RoutineWriteScreenArg
 import com.threegap.bitnagil.presentation.screen.setting.SettingScreenContainer
 import com.threegap.bitnagil.presentation.screen.splash.SplashScreenContainer
 import com.threegap.bitnagil.presentation.screen.terms.TermsAgreementScreenContainer
@@ -127,7 +127,7 @@ fun MainNavHost(
                     }
                 },
                 navigateToRegisterRoutine = { routineId ->
-                    navigator.navController.navigate(Route.WriteRoutine(routineId = routineId))
+                    navigator.navController.navigate(Route.RoutineWrite(routineId = routineId))
                 },
                 navigateToEmotion = {
                     navigator.navController.navigate(Route.Emotion)
@@ -224,19 +224,19 @@ fun MainNavHost(
             )
         }
 
-        composable<Route.WriteRoutine> { navBackStackEntry ->
-            val arg = navBackStackEntry.toRoute<Route.WriteRoutine>()
+        composable<Route.RoutineWrite> { navBackStackEntry ->
+            val arg = navBackStackEntry.toRoute<Route.RoutineWrite>()
             val writeScreenNavArg = if (arg.isRegister) {
-                WriteRoutineScreenArg.Add(baseRoutineId = arg.routineId)
+                RoutineWriteScreenArg.Add(baseRoutineId = arg.routineId)
             } else {
-                WriteRoutineScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate)
+                RoutineWriteScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate)
             }
 
-            val viewModel = hiltViewModel<WriteRoutineViewModel, WriteRoutineViewModel.Factory> { factory ->
+            val viewModel = hiltViewModel<RoutineWriteViewModel, RoutineWriteViewModel.Factory> { factory ->
                 factory.create(writeScreenNavArg)
             }
 
-            WriteRoutineScreenContainer(
+            RoutineWriteScreenContainer(
                 viewModel = viewModel,
                 navigateToBack = {
                     if (navigator.navController.previousBackStackEntry != null) {
@@ -281,11 +281,11 @@ fun MainNavHost(
                     }
                 },
                 navigateToAddRoutine = {
-                    navigator.navController.navigate(Route.WriteRoutine())
+                    navigator.navController.navigate(Route.RoutineWrite())
                 },
                 navigateToEditRoutine = { routineId, updateRoutineFromNowDate ->
                     navigator.navController.navigate(
-                        Route.WriteRoutine(
+                        Route.RoutineWrite(
                             routineId = routineId,
                             isRegister = false,
                             isUpdateRoutineFromNowDate = updateRoutineFromNowDate,

app/src/main/java/com/threegap/bitnagil/Route.kt

@@ -31,7 +31,7 @@ sealed interface Route {
     ) : Route
 
     @Serializable
-    data class WriteRoutine(
+    data class RoutineWrite(
         val routineId: String? = null,
         val isRegister: Boolean = true,
         val isUpdateRoutineFromNowDate: Boolean = true,

…creen/routinewrite/WriteRoutineScreen.kt …tion/screen/routinewrite/RoutineWrite.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt

@@ -38,30 +38,30 @@ import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.ro
 import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.subroutinefield.SubRoutineField
 import com.threegap.bitnagil.presentation.screen.routinewrite.component.template.datepickerbottomsheet.DatePickerBottomSheet
 import com.threegap.bitnagil.presentation.screen.routinewrite.component.template.timepickerbottomsheet.TimePickerBottomSheet
-import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineSideEffect
-import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineState
+import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteSideEffect
+import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteState
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time
-import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType
+import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType
 import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
 @Composable
-fun WriteRoutineScreenContainer(
-    viewModel: WriteRoutineViewModel = hiltViewModel(),
+fun RoutineWriteScreenContainer(
+    viewModel: RoutineWriteViewModel = hiltViewModel(),
     navigateToBack: () -> Unit,
 ) {
     val state by viewModel.collectAsState()
 
     viewModel.collectSideEffect { sideEffect ->
         when (sideEffect) {
-            WriteRoutineSideEffect.MoveToPreviousScreen -> {
+            RoutineWriteSideEffect.MoveToPreviousScreen -> {
                 navigateToBack()
             }
 
-            is WriteRoutineSideEffect.ShowToast -> {
+            is RoutineWriteSideEffect.ShowToast -> {
                 GlobalBitnagilToast.showCheck(sideEffect.message)
             }
         }
@@ -99,7 +99,7 @@ fun WriteRoutineScreenContainer(
         )
     }
 
-    WriteRoutineScreen(
+    RoutineWriteScreen(
         state = state,
         setRoutineName = viewModel::setRoutineName,
         setSubRoutineName = viewModel::setSubRoutineName,
@@ -120,8 +120,8 @@ fun WriteRoutineScreenContainer(
 }
 
 @Composable
-private fun WriteRoutineScreen(
-    state: WriteRoutineState,
+private fun RoutineWriteScreen(
+    state: RoutineWriteState,
     setRoutineName: (String) -> Unit,
     setSubRoutineName: (Int, String) -> Unit,
     selectNotUseSubRoutines: () -> Unit,
@@ -148,7 +148,7 @@ private fun WriteRoutineScreen(
             .windowInsetsPadding(WindowInsets.ime),
     ) {
         BitnagilTopBar(
-            title = if (state.writeRoutineType == WriteRoutineType.Add) "루틴 등록" else "루틴 수정",
+            title = if (state.routineWriteType == RoutineWriteType.Add) "루틴 등록" else "루틴 수정",
             showBackButton = true,
             onBackClick = onClickBack,
         )
@@ -171,7 +171,7 @@ private fun WriteRoutineScreen(
             Spacer(modifier = Modifier.height(6.dp))
 
             Text(
-                text = "${state.routineName.length} / ${WriteRoutineState.MAX_ROUTINE_NAME_LENGTH}",
+                text = "${state.routineName.length} / ${RoutineWriteState.MAX_ROUTINE_NAME_LENGTH}",
                 style = BitnagilTheme.typography.caption1Medium,
                 color = BitnagilTheme.colors.coolGray80,
                 textAlign = TextAlign.End,
@@ -368,10 +368,10 @@ private fun getSubRoutinePlaceHolder(index: Int): String {
 
 @Preview
 @Composable
-fun WriteRoutineScreenPreview() {
+fun RoutineWriteScreenPreview() {
     BitnagilTheme {
-        WriteRoutineScreen(
-            state = WriteRoutineState.INIT.copy(periodUiExpanded = true, startTimeUiExpanded = true),
+        RoutineWriteScreen(
+            state = RoutineWriteState.INIT.copy(periodUiExpanded = true, startTimeUiExpanded = true),
             setRoutineName = {},
             setSubRoutineName = { _, _ -> },
             selectRepeatTime = {},

…en/routinewrite/WriteRoutineViewModel.kt …en/routinewrite/RoutineWriteViewModel.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt

@@ -8,16 +8,16 @@ import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
 import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
 import com.threegap.bitnagil.domain.writeroutine.usecase.EditRoutineUseCase
 import com.threegap.bitnagil.domain.writeroutine.usecase.RegisterRoutineUseCase
-import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineSideEffect
-import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineState
+import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteSideEffect
+import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteState
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.Date
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.SubRoutineUiModel
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time
-import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType
-import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg
+import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType
+import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.RoutineWriteScreenArg
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.toUiModel
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -27,22 +27,22 @@ import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.ContainerHost
 import org.orbitmvi.orbit.viewmodel.container
 
-@HiltViewModel(assistedFactory = WriteRoutineViewModel.Factory::class)
-class WriteRoutineViewModel @AssistedInject constructor(
+@HiltViewModel(assistedFactory = RoutineWriteViewModel.Factory::class)
+class RoutineWriteViewModel @AssistedInject constructor(
     savedStateHandle: SavedStateHandle,
     private val registerRoutineUseCase: RegisterRoutineUseCase,
     private val editRoutineUseCase: EditRoutineUseCase,
     private val getRoutineUseCase: GetRoutineUseCase,
     private val getRecommendRoutineUseCase: GetRecommendRoutineUseCase,
-    @Assisted private val writeRoutineArg: WriteRoutineScreenArg,
-) : ContainerHost<WriteRoutineState, WriteRoutineSideEffect>, ViewModel() {
+    @Assisted private val writeRoutineArg: RoutineWriteScreenArg,
+) : ContainerHost<RoutineWriteState, RoutineWriteSideEffect>, ViewModel() {
     @AssistedFactory interface Factory {
-        fun create(writeRoutineArg: WriteRoutineScreenArg): WriteRoutineViewModel
+        fun create(writeRoutineArg: RoutineWriteScreenArg): RoutineWriteViewModel
     }
 
-    override val container: Container<WriteRoutineState, WriteRoutineSideEffect> = container(
+    override val container: Container<RoutineWriteState, RoutineWriteSideEffect> = container(
         savedStateHandle = savedStateHandle,
-        initialState = WriteRoutineState.INIT,
+        initialState = RoutineWriteState.INIT,
     )
 
     private var routineId: String? = null
@@ -53,12 +53,12 @@ class WriteRoutineViewModel @AssistedInject constructor(
         initResource(navigationArg)
     }
 
-    private fun initResource(navigationArg: WriteRoutineScreenArg) = intent {
+    private fun initResource(navigationArg: RoutineWriteScreenArg) = intent {
         when (navigationArg) {
-            is WriteRoutineScreenArg.Add -> {
+            is RoutineWriteScreenArg.Add -> {
                 reduce {
                     state.copy(
-                        writeRoutineType = WriteRoutineType.Add,
+                        routineWriteType = RoutineWriteType.Add,
                     )
                 }
 
@@ -67,10 +67,10 @@ class WriteRoutineViewModel @AssistedInject constructor(
                     loadRecommendRoutine(it)
                 }
             }
-            is WriteRoutineScreenArg.Edit -> {
+            is RoutineWriteScreenArg.Edit -> {
                 reduce {
                     state.copy(
-                        writeRoutineType = WriteRoutineType.Edit(updateRoutineFromNowDate = navigationArg.updateRoutineFromNowDate),
+                        routineWriteType = RoutineWriteType.Edit(updateRoutineFromNowDate = navigationArg.updateRoutineFromNowDate),
                     )
                 }
 
@@ -158,7 +158,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
     }
 
     fun setRoutineName(name: String) = intent {
-        if (name.length > WriteRoutineState.MAX_ROUTINE_NAME_LENGTH) return@intent
+        if (name.length > RoutineWriteState.MAX_ROUTINE_NAME_LENGTH) return@intent
         reduce {
             state.copy(
                 routineName = name,
@@ -360,8 +360,8 @@ class WriteRoutineViewModel @AssistedInject constructor(
             null -> listOf()
         }
 
-        when (val writeRoutineType = currentState.writeRoutineType) {
-            WriteRoutineType.Add -> {
+        when (val writeRoutineType = currentState.routineWriteType) {
+            RoutineWriteType.Add -> {
                 reduce {
                     state.copy(
                         loading = true,
@@ -382,7 +382,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                 )
 
                 if (registerRoutineResult.isSuccess) {
-                    postSideEffect(WriteRoutineSideEffect.MoveToPreviousScreen)
+                    postSideEffect(RoutineWriteSideEffect.MoveToPreviousScreen)
                 } else {
                     reduce {
                         state.copy(
@@ -391,7 +391,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                     }
                 }
             }
-            is WriteRoutineType.Edit -> {
+            is RoutineWriteType.Edit -> {
                 val currentRoutineId = routineId ?: return@intent
                 val subRoutines = if (currentState.selectNotUseSubRoutines) emptyList() else currentState.subRoutineNames.filter { it.isNotEmpty() }
                 val routineUpdateType = if (writeRoutineType.updateRoutineFromNowDate) {
@@ -418,8 +418,8 @@ class WriteRoutineViewModel @AssistedInject constructor(
                 )
 
                 if (editRoutineResult.isSuccess) {
-                    postSideEffect(WriteRoutineSideEffect.MoveToPreviousScreen)
-                    postSideEffect(WriteRoutineSideEffect.ShowToast("루틴 수정이 완료되었습니다."))
+                    postSideEffect(RoutineWriteSideEffect.MoveToPreviousScreen)
+                    postSideEffect(RoutineWriteSideEffect.ShowToast("루틴 수정이 완료되었습니다."))
                 } else {
                     reduce {
                         state.copy(

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteSideEffect.kt

@@ -0,0 +1,6 @@
+package com.threegap.bitnagil.presentation.screen.routinewrite.contract
+
+sealed interface RoutineWriteSideEffect {
+    data object MoveToPreviousScreen : RoutineWriteSideEffect
+    data class ShowToast(val message: String) : RoutineWriteSideEffect
+}

…utinewrite/contract/WriteRoutineState.kt …utinewrite/contract/RoutineWriteState.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt

@@ -7,11 +7,11 @@ import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time
-import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType
+import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class WriteRoutineState(
+data class RoutineWriteState(
     val routineName: String,
     val subRoutineNames: List<String>,
     val selectNotUseSubRoutines: Boolean,
@@ -25,7 +25,7 @@ data class WriteRoutineState(
     val showTimePickerBottomSheet: Boolean,
     val showStartDatePickerBottomSheet: Boolean,
     val showEndDatePickerBottomSheet: Boolean,
-    val writeRoutineType: WriteRoutineType,
+    val routineWriteType: RoutineWriteType,
     val subRoutineUiExpanded: Boolean,
     val repeatDaysUiExpanded: Boolean,
     val periodUiExpanded: Boolean,
@@ -35,7 +35,7 @@ data class WriteRoutineState(
     companion object {
         const val MAX_ROUTINE_NAME_LENGTH = 20
 
-        val INIT = WriteRoutineState(
+        val INIT = RoutineWriteState(
             routineName = "",
             subRoutineNames = listOf("", "", ""),
             selectNotUseSubRoutines = false,
@@ -76,7 +76,7 @@ data class WriteRoutineState(
             showStartDatePickerBottomSheet = false,
             showEndDatePickerBottomSheet = false,
             showTimePickerBottomSheet = false,
-            writeRoutineType = WriteRoutineType.Add,
+            routineWriteType = RoutineWriteType.Add,
             subRoutineUiExpanded = false,
             repeatDaysUiExpanded = false,
             periodUiExpanded = false,

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt

@@ -4,10 +4,10 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-sealed class WriteRoutineType : Parcelable {
+sealed class RoutineWriteType : Parcelable {
     @Parcelize
-    data object Add : WriteRoutineType()
+    data object Add : RoutineWriteType()
 
     @Parcelize
-    data class Edit(val updateRoutineFromNowDate: Boolean) : WriteRoutineType()
+    data class Edit(val updateRoutineFromNowDate: Boolean) : RoutineWriteType()
 }

…n/routinewrite/model/WriteRoutineType.kt …n/routinewrite/model/RoutineWriteType.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RoutineWriteType.kt presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RoutineWriteType.kt

@@ -3,10 +3,10 @@ package com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed class WriteRoutineScreenArg {
+sealed class RoutineWriteScreenArg {
     @Serializable
-    data class Add(val baseRoutineId: String?) : WriteRoutineScreenArg()
+    data class Add(val baseRoutineId: String?) : RoutineWriteScreenArg()
 
     @Serializable
-    data class Edit(val routineId: String, val updateRoutineFromNowDate: Boolean) : WriteRoutineScreenArg()
+    data class Edit(val routineId: String, val updateRoutineFromNowDate: Boolean) : RoutineWriteScreenArg()
 }