FIX: 세부 항목 수정

- "세부루틴 설정 안 함" 선택시 기존 입력한 세부루틴이 초기화되도록 수정
- 반복요일, 목표 기간을 필수 항목으로 수정
- 시작일/종료일 선택시 선택 범위 해제
- ExpandableContent의 패키지 경로 누락 추가
- Routine 내 routineDeleteYn 변수 추가

Author: l5x5l

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

@@ -45,6 +45,7 @@ fun RoutineDto.toDomain(): Routine =
         subRoutineNames = this.subRoutineNames,
         subRoutineCompleteYn = this.subRoutineCompleteYn,
         recommendedRoutineType = RecommendedRoutineType.fromString(this.recommendedRoutineType),
+        routineDeletedYn = routineDeletedYn,
         startDate = this.routineStartDate,
         endDate = this.routineEndDate,
     )

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

@@ -9,6 +9,7 @@ data class Routine(
     val endDate: String,
     val routineDate: String,
     val routineCompleteYn: Boolean,
+    val routineDeletedYn: Boolean,
     val subRoutineNames: List<String>,
     val subRoutineCompleteYn: List<Boolean>,
     val recommendedRoutineType: RecommendedRoutineType?,

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt

@@ -1,6 +1,5 @@
 package com.threegap.bitnagil.presentation.writeroutine
 
-import ExpandableContent
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -33,12 +32,12 @@ import com.threegap.bitnagil.presentation.common.flow.collectAsEffect
 import com.threegap.bitnagil.presentation.writeroutine.component.atom.namefield.NameField
 import com.threegap.bitnagil.presentation.writeroutine.component.atom.selectcell.SelectCell
 import com.threegap.bitnagil.presentation.writeroutine.component.atom.writeroutinebutton.WriteRoutineButton
+import com.threegap.bitnagil.presentation.writeroutine.component.block.expandablecontent.ExpandableContent
 import com.threegap.bitnagil.presentation.writeroutine.component.block.labeledcheckbox.LabeledCheckBox
 import com.threegap.bitnagil.presentation.writeroutine.component.block.routinedetailrow.RoutineDetailRow
 import com.threegap.bitnagil.presentation.writeroutine.component.block.subroutinefield.SubRoutineField
 import com.threegap.bitnagil.presentation.writeroutine.component.template.datepickerbottomsheet.DatePickerBottomSheet
 import com.threegap.bitnagil.presentation.writeroutine.component.template.timepickerbottomsheet.TimePickerBottomSheet
-import com.threegap.bitnagil.presentation.writeroutine.model.Date
 import com.threegap.bitnagil.presentation.writeroutine.model.Day
 import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType
 import com.threegap.bitnagil.presentation.writeroutine.model.Time
@@ -77,8 +76,8 @@ fun WriteRoutineScreenContainer(
             onDateSelected = viewModel::setStartDate,
             date = state.startDate,
             onDismiss = viewModel::hideStartDatePickerBottomSheet,
-            availableStartDate = Date.now(),
-            availableEndDate = state.endDate,
+            availableStartDate = null,
+            availableEndDate = null,
         )
     }
 
@@ -88,7 +87,7 @@ fun WriteRoutineScreenContainer(
             onDateSelected = viewModel::setEndDate,
             date = state.endDate,
             onDismiss = viewModel::hideEndDatePickerBottomSheet,
-            availableStartDate = state.startDate,
+            availableStartDate = null,
             availableEndDate = null,
         )
     }
@@ -215,7 +214,7 @@ private fun WriteRoutineScreen(
 
                 ExpandableContent(
                     expand = state.repeatDaysUiExpanded,
-                    required = false,
+                    required = true,
                     iconResourceId = R.drawable.img_repeat_days,
                     title = "반복 요일",
                     placeHolder = "ex) 매주 월,화,수.목,금",
@@ -271,7 +270,7 @@ private fun WriteRoutineScreen(
 
                 ExpandableContent(
                     expand = state.periodUiExpanded,
-                    required = false,
+                    required = true,
                     iconResourceId = R.drawable.img_routine_period,
                     title = "목표 기간",
                     placeHolder = "ex) 25.08.06 - 25.08.06",

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt

@@ -302,18 +302,23 @@ class WriteRoutineViewModel @AssistedInject constructor(
             }
             is WriteRoutineIntent.SetEndDate -> {
                 return state.copy(
+                    startDate = Date.min(intent.date, state.startDate),
                     endDate = intent.date,
                 )
             }
             is WriteRoutineIntent.SetStartDate -> {
                 return state.copy(
                     startDate = intent.date,
+                    endDate = Date.max(intent.date, state.endDate),
                 )
             }
 
             WriteRoutineIntent.SelectNotUseSubRoutines -> {
+                val toggledSelectNotUseSubRoutines = !state.selectNotUseSUbRoutines
+
                 return state.copy(
-                    selectNotUseSUbRoutines = !state.selectNotUseSUbRoutines,
+                    selectNotUseSUbRoutines = toggledSelectNotUseSubRoutines,
+                    subRoutineNames = if (toggledSelectNotUseSubRoutines) listOf("", "", "") else state.subRoutineNames,
                 )
             }
         }

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/expandablecontent/ExpandableContent.kt

@@ -1,3 +1,5 @@
+package com.threegap.bitnagil.presentation.writeroutine.component.block.expandablecontent
+
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.Image
@@ -123,7 +125,7 @@ fun ExpandableContent(
 
 @Preview(heightDp = 300)
 @Composable
-fun ExpandableContentPreview() {
+private fun ExpandableContentPreview() {
     var isExpanded by remember { mutableStateOf(true) }
     var isChecked by remember { mutableStateOf(false) }