REFACTOR: 루틴 목록, 루틴 작성 화면 경로 수정

Author: l5x5l

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

@@ -18,15 +18,15 @@ import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailScreen
 import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewModel
 import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg
 import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer
-import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
+import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer
 import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
 import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
 import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
 import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen
 import com.threegap.bitnagil.presentation.withdrawal.WithdrawalScreenContainer
-import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineScreenContainer
-import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineViewModel
-import com.threegap.bitnagil.presentation.writeroutine.model.navarg.WriteRoutineScreenArg
+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
 
 @Composable
 fun MainNavHost(

…ntation/routinelist/RoutineListScreen.kt …/screen/routinelist/RoutineListScreen.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist
+package com.threegap.bitnagil.presentation.screen.routinelist
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -22,15 +22,15 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
 import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
-import com.threegap.bitnagil.presentation.routinelist.component.template.DeleteConfirmBottomSheet
-import com.threegap.bitnagil.presentation.routinelist.component.template.EditConfirmBottomSheet
-import com.threegap.bitnagil.presentation.routinelist.component.template.EmptyRoutineListView
-import com.threegap.bitnagil.presentation.routinelist.component.template.RoutineDetailsCard
-import com.threegap.bitnagil.presentation.routinelist.component.template.WeeklyDatePicker
-import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListSideEffect
-import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState
-import com.threegap.bitnagil.presentation.routinelist.model.RoutineListStatePreviewProvider
-import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
+import com.threegap.bitnagil.presentation.screen.routinelist.component.template.DeleteConfirmBottomSheet
+import com.threegap.bitnagil.presentation.screen.routinelist.component.template.EditConfirmBottomSheet
+import com.threegap.bitnagil.presentation.screen.routinelist.component.template.EmptyRoutineListView
+import com.threegap.bitnagil.presentation.screen.routinelist.component.template.RoutineDetailsCard
+import com.threegap.bitnagil.presentation.screen.routinelist.component.template.WeeklyDatePicker
+import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListSideEffect
+import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListState
+import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineListStatePreviewProvider
+import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 import java.time.LocalDate

…tion/routinelist/RoutineListViewModel.kt …reen/routinelist/RoutineListViewModel.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListViewModel.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListViewModel.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist
+package com.threegap.bitnagil.presentation.screen.routinelist
 
 import android.util.Log
 import androidx.lifecycle.SavedStateHandle
@@ -9,10 +9,10 @@ import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineUseCase
 import com.threegap.bitnagil.domain.routine.usecase.FetchWeeklyRoutinesUseCase
 import com.threegap.bitnagil.domain.writeroutine.usecase.GetWriteRoutineEventFlowUseCase
 import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays
-import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListSideEffect
-import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState
-import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
-import com.threegap.bitnagil.presentation.routinelist.model.toUiModel
+import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListSideEffect
+import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListState
+import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel
+import com.threegap.bitnagil.presentation.screen.routinelist.model.toUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.Container

…ent/template/DeleteConfirmBottomSheet.kt …ent/template/DeleteConfirmBottomSheet.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/DeleteConfirmBottomSheet.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/DeleteConfirmBottomSheet.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/DeleteConfirmBottomSheet.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/DeleteConfirmBottomSheet.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist.component.template
+package com.threegap.bitnagil.presentation.screen.routinelist.component.template
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

…onent/template/EditConfirmBottomSheet.kt …onent/template/EditConfirmBottomSheet.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EditConfirmBottomSheet.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EditConfirmBottomSheet.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EditConfirmBottomSheet.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EditConfirmBottomSheet.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist.component.template
+package com.threegap.bitnagil.presentation.screen.routinelist.component.template
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer

…mponent/template/EmptyRoutineListView.kt …mponent/template/EmptyRoutineListView.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EmptyRoutineListView.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EmptyRoutineListView.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EmptyRoutineListView.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EmptyRoutineListView.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist.component.template
+package com.threegap.bitnagil.presentation.screen.routinelist.component.template
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

…component/template/RoutineDetailsCard.kt …component/template/RoutineDetailsCard.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/RoutineDetailsCard.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/RoutineDetailsCard.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist.component.template
+package com.threegap.bitnagil.presentation.screen.routinelist.component.template
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -24,7 +24,7 @@ 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.screen.routinelist.model.RoutineUiModel
 
 @Composable
 fun RoutineDetailsCard(

…t/component/template/WeeklyDatePicker.kt …t/component/template/WeeklyDatePicker.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/WeeklyDatePicker.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/WeeklyDatePicker.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist.component.template
+package com.threegap.bitnagil.presentation.screen.routinelist.component.template
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

…nelist/contract/RoutineListSideEffect.kt …nelist/contract/RoutineListSideEffect.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListSideEffect.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListSideEffect.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListSideEffect.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListSideEffect.kt

@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.routinelist.contract
+package com.threegap.bitnagil.presentation.screen.routinelist.contract
 
 sealed interface RoutineListSideEffect {
     data object NavigateToBack : RoutineListSideEffect

…routinelist/contract/RoutineListState.kt …routinelist/contract/RoutineListState.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListState.kt presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListState.kt

@@ -1,8 +1,8 @@
-package com.threegap.bitnagil.presentation.routinelist.contract
+package com.threegap.bitnagil.presentation.screen.routinelist.contract
 
 import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays
-import com.threegap.bitnagil.presentation.routinelist.model.RoutineScheduleUiModel
-import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
+import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineScheduleUiModel
+import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel
 import java.time.LocalDate
 
 data class RoutineListState(