Feat: 루틴리스트 화면 네비게이션 로직 추가

- 루틴 수정, 작성 화면 연결

Author: wjdrjs00

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

@@ -121,11 +121,11 @@ fun MainNavHost(
                 },
                 navigateToRoutineList = { selectedDate ->
                     navigator.navController.navigate(
-                        Route.RoutineList(selectedDate = selectedDate)
+                        Route.RoutineList(selectedDate = selectedDate),
                     ) {
                         launchSingleTop = true
                     }
-                }
+                },
             )
         }
 

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

@@ -1,5 +1,9 @@
 package com.threegap.bitnagil.domain.routine.model
 
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
 data class Routine(
     val routineId: String,
     val routineName: String,
@@ -10,4 +14,19 @@ data class Routine(
     val subRoutineNames: List<String>,
     val subRoutineCompleteYn: List<Boolean>,
     val recommendedRoutineType: RecommendedRoutineType?,
-)
+) {
+    private val koreanLocale = Locale.KOREAN
+    private val executionTimeFormatter12 = DateTimeFormatter.ofPattern("a h:mm", koreanLocale)
+
+    val formattedExecutionTime: String =
+        try {
+            val time = LocalTime.parse(executionTime)
+            if (time == LocalTime.MIDNIGHT) {
+                "하루종일"
+            } else {
+                time.format(executionTimeFormatter12)
+            }
+        } catch (e: Exception) {
+            "시간 미정"
+        }
+}

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt

@@ -43,6 +43,13 @@ fun RoutineListScreenContainer(
     viewModel.sideEffectFlow.collectAsEffect { sideEffect ->
         when (sideEffect) {
             is RoutineListSideEffect.NavigateToBack -> navigateToBack()
+            is RoutineListSideEffect.NavigateToWriteRoutine -> {
+//                TODO: 네비게이션 연결하기
+//                navigateToWriteRoutine(
+//                    routineId = sideEffect.routineId,
+//                    applyDate = sideEffect.applyDate,
+//                )
+            }
         }
     }
 
@@ -59,15 +66,13 @@ fun RoutineListScreenContainer(
     }
 
     if (uiState.editConfirmBottomSheetVisible) {
-        EditConfirmBottomSheet(
-            onDismissRequest = { viewModel.sendIntent(RoutineListIntent.HideEditConfirmBottomSheet) },
-            onApplyToday = {
-                // TODO("루틴수정으로 이동(id와 수정여부(TODAY) 넘겨주기")
-            },
-            onApplyTomorrow = {
-                //TODO("루틴수정으로 이동(id와 수정여부(TOMORROW) 넘겨주기")
-            },
-        )
+        uiState.selectedRoutine?.let {
+            EditConfirmBottomSheet(
+                onDismissRequest = { viewModel.sendIntent(RoutineListIntent.HideEditConfirmBottomSheet) },
+                onApplyToday = { viewModel.sendIntent(RoutineListIntent.OnApplyTodayClick) },
+                onApplyTomorrow = { viewModel.sendIntent(RoutineListIntent.OnApplyTomorrowClick) },
+            )
+        }
     }
 
     RoutineListScreen(
@@ -78,8 +83,10 @@ fun RoutineListScreenContainer(
         onShowDeleteConfirmBottomSheet = { routine ->
             viewModel.sendIntent(RoutineListIntent.ShowDeleteConfirmBottomSheet(routine))
         },
-        onShowEditConfirmBottomSheet = { viewModel.sendIntent(RoutineListIntent.ShowEditConfirmBottomSheet) },
-        onRegisterRoutineClick = {},
+        onShowEditConfirmBottomSheet = { routine ->
+            viewModel.sendIntent(RoutineListIntent.ShowEditConfirmBottomSheet(routine))
+        },
+        onRegisterRoutineClick = { viewModel.sendIntent(RoutineListIntent.OnRegisterRoutineClick) },
         onBackClick = { viewModel.sendIntent(RoutineListIntent.NavigateToBack) },
     )
 }
@@ -89,7 +96,7 @@ private fun RoutineListScreen(
     uiState: RoutineListState,
     onDateSelect: (LocalDate) -> Unit,
     onShowDeleteConfirmBottomSheet: (RoutineUiModel) -> Unit,
-    onShowEditConfirmBottomSheet: () -> Unit,
+    onShowEditConfirmBottomSheet: (RoutineUiModel) -> Unit,
     onRegisterRoutineClick: () -> Unit,
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -137,7 +144,7 @@ private fun RoutineListScreen(
                 ) { routine ->
                     RoutineDetailsCard(
                         routine = routine,
-                        onEditClick = { onShowEditConfirmBottomSheet() },
+                        onEditClick = { onShowEditConfirmBottomSheet(routine) },
                         onDeleteClick = { onShowDeleteConfirmBottomSheet(routine) },
                     )
                 }

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt

@@ -56,14 +56,56 @@ class RoutineListViewModel @Inject constructor(
                 )
             }
 
+            is RoutineListIntent.ShowEditConfirmBottomSheet -> {
+                state.copy(
+                    selectedRoutine = intent.routine,
+                    editConfirmBottomSheetVisible = true,
+                )
+            }
+
             is RoutineListIntent.HideDeleteConfirmBottomSheet -> state.copy(deleteConfirmBottomSheetVisible = false)
-            is RoutineListIntent.ShowEditConfirmBottomSheet -> state.copy(editConfirmBottomSheetVisible = true)
             is RoutineListIntent.HideEditConfirmBottomSheet -> state.copy(editConfirmBottomSheetVisible = false)
 
             is RoutineListIntent.NavigateToBack -> {
                 sendSideEffect(RoutineListSideEffect.NavigateToBack)
                 null
             }
+
+            is RoutineListIntent.OnRegisterRoutineClick -> {
+                sendSideEffect(
+                    RoutineListSideEffect.NavigateToWriteRoutine(
+                        routineId = null,
+                        applyDate = null,
+                    ),
+                )
+                null
+            }
+
+            is RoutineListIntent.OnApplyTodayClick -> {
+                val selectedRoutine = state.selectedRoutine
+                if (selectedRoutine != null) {
+                    sendSideEffect(
+                        RoutineListSideEffect.NavigateToWriteRoutine(
+                            routineId = selectedRoutine.routineId,
+                            applyDate = "TODAY",
+                        ),
+                    )
+                }
+                null
+            }
+
+            is RoutineListIntent.OnApplyTomorrowClick -> {
+                val selectedRoutine = state.selectedRoutine
+                if (selectedRoutine != null) {
+                    sendSideEffect(
+                        RoutineListSideEffect.NavigateToWriteRoutine(
+                            routineId = selectedRoutine.routineId,
+                            applyDate = "TOMORROW",
+                        ),
+                    )
+                }
+                null
+            }
         }
 
         return newState

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineListIntent.kt

@@ -8,8 +8,11 @@ sealed class RoutineListIntent : MviIntent {
     data class LoadRoutines(val routines: RoutinesUiModel) : RoutineListIntent()
     data class OnDateSelect(val date: LocalDate) : RoutineListIntent()
     data class ShowDeleteConfirmBottomSheet(val routine: RoutineUiModel) : RoutineListIntent()
+    data class ShowEditConfirmBottomSheet(val routine: RoutineUiModel) : RoutineListIntent()
     data object HideDeleteConfirmBottomSheet : RoutineListIntent()
-    data object ShowEditConfirmBottomSheet : RoutineListIntent()
     data object HideEditConfirmBottomSheet : RoutineListIntent()
     data object NavigateToBack : RoutineListIntent()
+    data object OnRegisterRoutineClick : RoutineListIntent()
+    data object OnApplyTodayClick : RoutineListIntent()
+    data object OnApplyTomorrowClick : RoutineListIntent()
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineListSideEffect.kt

@@ -4,4 +4,5 @@ import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
 
 sealed interface RoutineListSideEffect : MviSideEffect {
     data object NavigateToBack : RoutineListSideEffect
+    data class NavigateToWriteRoutine(val routineId: String?, val applyDate: String?) : RoutineListSideEffect
 }