From e848b38ecb2dfbd1f86c8b12a204d35a7199c175 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:46:05 +0900 Subject: [PATCH 01/13] =?UTF-8?q?refactor/#85:=20parent/schedule=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/auto/state/AutoMissionContract.kt | 6 +++--- .../mission/auto/state/AutoMissionSideEffect.kt | 2 +- .../mission/auto/viewmodel/AutoMissionViewModel.kt | 12 +++++++----- .../parent/{schedule => }/mission/component/.gitkeep | 0 .../component/datepicker/component/BasicCalendar.kt | 12 ++++++------ .../datepicker/component/CalendarBottomSheet.kt | 4 ++-- .../datepicker/component/CalendarMontHeader.kt | 2 +- .../component/datepicker/component/DayItem.kt | 10 +++++----- .../datepicker/component/DaysOfWeekTitle.kt | 4 ++-- .../component/datepicker/component/KieroCalendar.kt | 10 +++++----- .../component/datepicker/model/CalendarDay.kt | 2 +- .../datepicker/model/CalendarDisplayMode.kt | 2 +- .../component/datepicker/model/CalendarMonth.kt | 2 +- .../mission/component/datepicker/model/DayStatus.kt | 2 +- .../component/datepicker/model/DownTimeStatus.kt | 8 ++++++++ .../component/datepicker/util/CalendarCalCulator.kt | 2 +- .../component/datepicker/util/DateExtenstions.kt | 2 +- .../component/datepicker/model/DownTimeStatus.kt | 8 -------- .../parent/schedule/mission/navigation/.gitkeep | 0 19 files changed, 46 insertions(+), 44 deletions(-) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/state/AutoMissionContract.kt (87%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/state/AutoMissionSideEffect.kt (82%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/viewmodel/AutoMissionViewModel.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/.gitkeep (100%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/component/BasicCalendar.kt (81%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/component/CalendarBottomSheet.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/component/CalendarMontHeader.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/component/DayItem.kt (91%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/component/DaysOfWeekTitle.kt (92%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/component/KieroCalendar.kt (81%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/model/CalendarDay.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/model/CalendarDisplayMode.kt (91%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/model/CalendarMonth.kt (75%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/model/DayStatus.kt (76%) create mode 100644 app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/util/CalendarCalCulator.kt (55%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/util/DateExtenstions.kt (90%) delete mode 100644 app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/DownTimeStatus.kt delete mode 100644 app/src/main/java/com/kiero/presentation/parent/schedule/mission/navigation/.gitkeep diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/state/AutoMissionContract.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionContract.kt similarity index 87% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/state/AutoMissionContract.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionContract.kt index 7e768a7d..fb9cc556 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/state/AutoMissionContract.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionContract.kt @@ -1,7 +1,7 @@ -package com.kiero.presentation.parent.schedule.mission.auto.state +package com.kiero.presentation.parent.mission.auto.state import androidx.compose.runtime.Immutable -import com.kiero.presentation.parent.schedule.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.mission.auto.model.MissionUiModel import java.time.LocalDate import java.time.format.DateTimeFormatter import java.util.Locale @@ -18,7 +18,7 @@ data class AutoMissionState( val selectedDate: LocalDate? = null, val showBottomSheet: Boolean = false, - val hasViewedLastPage: Boolean = false + val hasViewedLastPage: Boolean = false, ) { val currentScreen: Screen get() = when { diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/state/AutoMissionSideEffect.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionSideEffect.kt similarity index 82% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/state/AutoMissionSideEffect.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionSideEffect.kt index c208b0d5..716386fb 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/state/AutoMissionSideEffect.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionSideEffect.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.state +package com.kiero.presentation.parent.mission.auto.state sealed interface AutoMissionSideEffect { data class ShowToast(val message: String) : AutoMissionSideEffect diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/viewmodel/AutoMissionViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/viewmodel/AutoMissionViewModel.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/viewmodel/AutoMissionViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/viewmodel/AutoMissionViewModel.kt index b8577875..dbb3d270 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/viewmodel/AutoMissionViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/viewmodel/AutoMissionViewModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.viewmodel +package com.kiero.presentation.parent.mission.auto.viewmodel import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.snapshotFlow @@ -7,10 +7,10 @@ import androidx.lifecycle.viewModelScope import com.kiero.core.localstorage.info.UserInfoManager import com.kiero.data.parent.mission.model.SuggestedMissionModel import com.kiero.data.parent.mission.repository.AutoMissionRepository -import com.kiero.presentation.parent.schedule.mission.auto.model.MissionUiModel -import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionSideEffect -import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionState -import com.kiero.presentation.parent.schedule.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.mission.auto.state.AutoMissionSideEffect +import com.kiero.presentation.parent.mission.auto.state.AutoMissionState +import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay @@ -301,12 +301,14 @@ class AutoMissionViewModel @Inject constructor( ) updateMissionReward(500) } + value < 1 -> { awardTextFieldState.edit { replace(0, length, "1") } updateMissionReward(1) } + value != currentState.currentReward -> { updateMissionReward(value) } diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/.gitkeep b/app/src/main/java/com/kiero/presentation/parent/mission/component/.gitkeep similarity index 100% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/.gitkeep rename to app/src/main/java/com/kiero/presentation/parent/mission/component/.gitkeep diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/BasicCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/BasicCalendar.kt similarity index 81% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/BasicCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/BasicCalendar.kt index ecd0c89c..98f273a9 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/BasicCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/BasicCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.component +package com.kiero.presentation.parent.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -12,11 +12,11 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDisplayMode -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarMonth -import com.kiero.presentation.parent.schedule.mission.component.datepicker.util.daysOfWeek -import com.kiero.presentation.parent.schedule.mission.component.datepicker.util.generateMonthData +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarMonth +import com.kiero.presentation.parent.mission.component.datepicker.util.daysOfWeek +import com.kiero.presentation.parent.mission.component.datepicker.util.generateMonthData import kotlinx.collections.immutable.toImmutableList import java.time.DayOfWeek import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/CalendarBottomSheet.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarBottomSheet.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/CalendarBottomSheet.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarBottomSheet.kt index 0536ac2f..dfb75964 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/CalendarBottomSheet.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarBottomSheet.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.component +package com.kiero.presentation.parent.mission.component.datepicker.component import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Column @@ -19,7 +19,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.R import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode import com.kiero.presentation.parent.schedule.plan.component.picker.PickerTopbar import java.time.LocalDate import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/CalendarMontHeader.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarMontHeader.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/CalendarMontHeader.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarMontHeader.kt index 820a085a..2e5b9aed 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/CalendarMontHeader.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarMontHeader.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.component +package com.kiero.presentation.parent.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/DayItem.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DayItem.kt similarity index 91% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/DayItem.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DayItem.kt index e0dbb064..8a1b66b1 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/DayItem.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DayItem.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.component +package com.kiero.presentation.parent.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -20,10 +20,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.DateState -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.DateTextStyle -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.getDateState +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.mission.component.datepicker.model.DateState +import com.kiero.presentation.parent.mission.component.datepicker.model.DateTextStyle +import com.kiero.presentation.parent.mission.component.datepicker.model.getDateState import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/DaysOfWeekTitle.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DaysOfWeekTitle.kt similarity index 92% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/DaysOfWeekTitle.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DaysOfWeekTitle.kt index 90ac02e6..6c65fecb 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/DaysOfWeekTitle.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DaysOfWeekTitle.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.component +package com.kiero.presentation.parent.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.datepicker.util.daysOfWeek +import com.kiero.presentation.parent.mission.component.datepicker.util.daysOfWeek import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import java.time.DayOfWeek diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/KieroCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/KieroCalendar.kt similarity index 81% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/KieroCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/KieroCalendar.kt index 18726d80..d4a626d0 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/component/KieroCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/KieroCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.component +package com.kiero.presentation.parent.mission.component.datepicker.component import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable @@ -9,10 +9,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDisplayMode -import com.kiero.presentation.parent.schedule.mission.component.datepicker.util.nextMonth -import com.kiero.presentation.parent.schedule.mission.component.datepicker.util.previousMonth +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.mission.component.datepicker.util.nextMonth +import com.kiero.presentation.parent.mission.component.datepicker.util.previousMonth import java.time.LocalDate import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarDay.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDay.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarDay.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDay.kt index f6ff480b..8eed69ff 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarDay.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDay.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.model +package com.kiero.presentation.parent.mission.component.datepicker.model import androidx.compose.runtime.Immutable import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarDisplayMode.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDisplayMode.kt similarity index 91% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarDisplayMode.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDisplayMode.kt index 087aed63..9d1f364c 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarDisplayMode.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDisplayMode.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.model +package com.kiero.presentation.parent.mission.component.datepicker.model import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarMonth.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarMonth.kt similarity index 75% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarMonth.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarMonth.kt index deb1d906..f6a3732d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/CalendarMonth.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarMonth.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.model +package com.kiero.presentation.parent.mission.component.datepicker.model import androidx.compose.runtime.Immutable import kotlinx.collections.immutable.ImmutableList diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/DayStatus.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DayStatus.kt similarity index 76% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/DayStatus.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DayStatus.kt index 96e8ceac..0089fbce 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/DayStatus.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DayStatus.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.model +package com.kiero.presentation.parent.mission.component.datepicker.model import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt new file mode 100644 index 00000000..ff269ae0 --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt @@ -0,0 +1,8 @@ +package com.kiero.presentation.parent.mission.component.datepicker.model + + +enum class DateState { + PAST, + TODAY, + FUTURE +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/CalendarCalCulator.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/CalendarCalCulator.kt similarity index 55% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/CalendarCalCulator.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/CalendarCalCulator.kt index 2af26beb..cbb1cec9 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/CalendarCalCulator.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/CalendarCalCulator.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.util +package com.kiero.presentation.parent.mission.component.datepicker.util import java.time.DayOfWeek diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/DateExtenstions.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/DateExtenstions.kt similarity index 90% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/DateExtenstions.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/DateExtenstions.kt index b8a7e4ba..cb465d13 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/DateExtenstions.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/DateExtenstions.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.util +package com.kiero.presentation.parent.mission.component.datepicker.util import java.time.DayOfWeek import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/DownTimeStatus.kt b/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/DownTimeStatus.kt deleted file mode 100644 index 13e57702..00000000 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/model/DownTimeStatus.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.model - - -enum class DateState { - PAST, - TODAY, - FUTURE -} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/navigation/.gitkeep b/app/src/main/java/com/kiero/presentation/parent/schedule/mission/navigation/.gitkeep deleted file mode 100644 index e69de29b..00000000 From 5492a0b4719cdace2b6450a4ba13a66e3d14efb8 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:46:41 +0900 Subject: [PATCH 02/13] =?UTF-8?q?refactor/#85:=20parent/mission=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/MissionDateGroup.kt | 7 ++----- .../mission/ParentAddMissionScreen.kt | 16 ++++++++-------- .../mission/ParentMissionScreen.kt | 19 ++++++++++++------- .../mission/auto/ParentAutoAddScreen.kt | 12 ++++++------ .../mission/auto/ParentAutoLoadingScreen.kt | 2 +- .../mission/auto/ParentAutoResultScreen.kt | 19 ++++++++++--------- .../auto/component/ParentAutoInputField.kt | 2 +- .../component/ParentAutoMissionAwardInfo.kt | 2 +- .../component/ParentAutoMissionAwardSelect.kt | 4 ++-- .../component/ParentAutoMissionCalendar.kt | 2 +- .../component/ParentAutoMissionEditForm.kt | 6 +++--- .../component/ParentAutoMissionNavigator.kt | 2 +- .../component/ParentAutoMissionTextField.kt | 2 +- .../component/ParentLocalKieroSnackbar.kt | 2 +- .../mission/auto/model/MissionUiModel.kt | 2 +- .../navigation/ParentAutoMissionNavigation.kt | 5 ++--- .../component/datepicker/util/MonthData.kt | 8 ++++---- .../missionadd/MissionAwardButton.kt | 4 ++-- .../component/missionadd/MissionAwardInfo.kt | 2 +- .../component/missionadd/MissionTextField.kt | 2 +- .../component/missionmain/MissionCalendar.kt | 2 +- .../missionmain/MissionFabContent.kt | 2 +- .../component/missionmain/MissionListItem.kt | 2 +- .../component/model/MissionAwardModel.kt | 2 +- .../component/model/MissionListModel.kt | 2 +- .../navigation/MissionAddNavigation.kt | 4 ++-- .../mission/state/ParentAddMissionState.kt | 2 +- .../mission/state/ParentMissionState.kt | 2 +- .../viewmodel/ParentAddMissionViewModel.kt | 10 +++++----- .../viewmodel/ParentMissionViewModel.kt | 6 +++--- 30 files changed, 78 insertions(+), 76 deletions(-) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/MissionDateGroup.kt (71%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/ParentAddMissionScreen.kt (88%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/ParentMissionScreen.kt (86%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/ParentAutoAddScreen.kt (93%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/ParentAutoLoadingScreen.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/ParentAutoResultScreen.kt (92%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentAutoInputField.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentAutoMissionAwardInfo.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentAutoMissionAwardSelect.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentAutoMissionCalendar.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentAutoMissionEditForm.kt (95%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentAutoMissionNavigator.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentAutoMissionTextField.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ParentLocalKieroSnackbar.kt (93%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/model/MissionUiModel.kt (74%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/navigation/ParentAutoMissionNavigation.kt (81%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/datepicker/util/MonthData.kt (80%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/missionadd/MissionAwardButton.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/missionadd/MissionAwardInfo.kt (95%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/missionadd/MissionTextField.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/missionmain/MissionCalendar.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/missionmain/MissionFabContent.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/missionmain/MissionListItem.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/model/MissionAwardModel.kt (90%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/component/model/MissionListModel.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/navigation/MissionAddNavigation.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/state/ParentAddMissionState.kt (92%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/state/ParentMissionState.kt (86%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/viewmodel/ParentAddMissionViewModel.kt (95%) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/viewmodel/ParentMissionViewModel.kt (88%) diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/MissionDateGroup.kt b/app/src/main/java/com/kiero/presentation/parent/mission/MissionDateGroup.kt similarity index 71% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/MissionDateGroup.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/MissionDateGroup.kt index 7f8bb058..529c0159 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/MissionDateGroup.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/MissionDateGroup.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission +package com.kiero.presentation.parent.mission import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -6,12 +6,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.kiero.core.common.extension.formatWithDayOfWeek -import com.kiero.core.common.extension.toRelativeDayFromDate import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.presentation.kid.mission.model.KidMissionListUiModel -import com.kiero.presentation.parent.schedule.mission.component.missionmain.MissionInfo -import com.kiero.presentation.parent.schedule.mission.component.missionmain.MissionListItem +import com.kiero.presentation.parent.mission.component.missionmain.MissionListItem @Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/ParentAddMissionScreen.kt b/app/src/main/java/com/kiero/presentation/parent/mission/ParentAddMissionScreen.kt similarity index 88% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/ParentAddMissionScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/ParentAddMissionScreen.kt index d1f55955..9304f2f3 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/ParentAddMissionScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/ParentAddMissionScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission +package com.kiero.presentation.parent.mission import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -28,13 +28,13 @@ import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.model.UiState import com.kiero.core.model.trigger.SnackbarState import com.kiero.core.trigger.LocalGlobalUiEventTrigger -import com.kiero.presentation.parent.schedule.mission.component.datepicker.component.CalendarBottomSheet -import com.kiero.presentation.parent.schedule.mission.component.missionadd.MissionAwardInfo -import com.kiero.presentation.parent.schedule.mission.component.missionadd.MissionAwardSelect -import com.kiero.presentation.parent.schedule.mission.component.missionmain.MissionCalendar -import com.kiero.presentation.parent.schedule.mission.state.ParentAddMissionSideEffect -import com.kiero.presentation.parent.schedule.mission.state.ParentAddMissionState -import com.kiero.presentation.parent.schedule.mission.viewmodel.ParentAddMissionViewModel +import com.kiero.presentation.parent.mission.component.datepicker.component.CalendarBottomSheet +import com.kiero.presentation.parent.mission.component.missionadd.MissionAwardInfo +import com.kiero.presentation.parent.mission.component.missionadd.MissionAwardSelect +import com.kiero.presentation.parent.mission.component.missionmain.MissionCalendar +import com.kiero.presentation.parent.mission.state.ParentAddMissionSideEffect +import com.kiero.presentation.parent.mission.state.ParentAddMissionState +import com.kiero.presentation.parent.mission.viewmodel.ParentAddMissionViewModel import com.kiero.presentation.parent.schedule.plan.component.select.ScheduleTextField @Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/ParentMissionScreen.kt b/app/src/main/java/com/kiero/presentation/parent/mission/ParentMissionScreen.kt similarity index 86% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/ParentMissionScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/ParentMissionScreen.kt index 388d7559..7ed8fdf4 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/ParentMissionScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/ParentMissionScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission +package com.kiero.presentation.parent.mission import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -28,15 +28,15 @@ import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.model.UiState import com.kiero.core.trigger.LocalRefreshState import com.kiero.presentation.main.navigation.ParentMainTab -import com.kiero.presentation.parent.schedule.mission.component.missionmain.MissionInfo -import com.kiero.presentation.parent.schedule.mission.component.missionmain.MissionListItem -import com.kiero.presentation.parent.schedule.mission.component.missionmain.MissionInfo -import com.kiero.presentation.parent.schedule.mission.state.ParentMissionState -import com.kiero.presentation.parent.schedule.mission.viewmodel.ParentMissionViewModel +import com.kiero.presentation.parent.mission.component.missionmain.MissionInfo +import com.kiero.presentation.parent.mission.component.missionmain.MissionListItem +import com.kiero.presentation.parent.mission.state.ParentMissionState +import com.kiero.presentation.parent.mission.viewmodel.ParentMissionViewModel @Composable fun ParentMissionRoute( paddingValues: PaddingValues, + navigateUp: () -> Unit, viewModel: ParentMissionViewModel = hiltViewModel(), ) { val state by viewModel.state.collectAsStateWithLifecycle() @@ -48,6 +48,8 @@ fun ParentMissionRoute( when (val uiState = state) { is UiState.Success -> { ParentMissionScreen( + paddingValues = paddingValues, + navigateUp = navigateUp, state = uiState.data, ) } @@ -75,6 +77,8 @@ fun ParentMissionRoute( @Composable fun ParentMissionScreen( + paddingValues: PaddingValues, + navigateUp: () -> Unit, state: ParentMissionState, modifier: Modifier = Modifier, ) { @@ -129,7 +133,8 @@ fun ParentMissionScreen( private fun ParentMissionScreenPreview() { KieroTheme { ParentMissionRoute( - paddingValues = PaddingValues() + paddingValues = PaddingValues(), + navigateUp = {} ) } } \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoAddScreen.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoAddScreen.kt similarity index 93% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoAddScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoAddScreen.kt index 58304b8c..e146003b 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoAddScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoAddScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto +package com.kiero.presentation.parent.mission.auto import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures @@ -33,17 +33,17 @@ import com.kiero.core.designsystem.component.KieroTopbar import com.kiero.core.designsystem.component.button.KieroButtonMedium import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.trigger.LocalGlobalUiEventTrigger -import com.kiero.presentation.parent.schedule.mission.auto.component.ScrollableAutoInputField -import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionSideEffect -import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionState -import com.kiero.presentation.parent.schedule.mission.auto.viewmodel.AutoMissionViewModel +import com.kiero.presentation.parent.mission.auto.component.ScrollableAutoInputField +import com.kiero.presentation.parent.mission.auto.state.AutoMissionSideEffect +import com.kiero.presentation.parent.mission.auto.state.AutoMissionState +import com.kiero.presentation.parent.mission.auto.viewmodel.AutoMissionViewModel import timber.log.Timber @Composable fun ParentAutoAddRoute( paddingValues: PaddingValues, navigateUp: () -> Unit, - viewModel: AutoMissionViewModel = hiltViewModel() + viewModel: AutoMissionViewModel = hiltViewModel(), ) { val state by viewModel.state.collectAsState() val globalUiEventHolder = LocalGlobalUiEventTrigger.current diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoLoadingScreen.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoLoadingScreen.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoLoadingScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoLoadingScreen.kt index 5fd3493c..8089e5dc 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoLoadingScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoLoadingScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto +package com.kiero.presentation.parent.mission.auto import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoResultScreen.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoResultScreen.kt similarity index 92% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoResultScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoResultScreen.kt index 226e6966..45d6f0a0 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/ParentAutoResultScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoResultScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto +package com.kiero.presentation.parent.mission.auto import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures @@ -28,14 +28,13 @@ import com.kiero.R import com.kiero.core.designsystem.component.KieroTopbar import com.kiero.core.designsystem.component.button.KieroButtonMedium import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.auto.component.ParentAutoMissionEditForm -import com.kiero.presentation.parent.schedule.mission.auto.component.ParentMissionNavigator -import com.kiero.presentation.parent.schedule.mission.auto.model.MissionUiModel -import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionSideEffect -import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionState -import com.kiero.presentation.parent.schedule.mission.auto.viewmodel.AutoMissionViewModel -import com.kiero.presentation.parent.schedule.mission.component.datepicker.component.CalendarBottomSheet -import kotlinx.coroutines.launch +import com.kiero.presentation.parent.mission.auto.component.ParentAutoMissionEditForm +import com.kiero.presentation.parent.mission.auto.component.ParentMissionNavigator +import com.kiero.presentation.parent.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.mission.auto.state.AutoMissionSideEffect +import com.kiero.presentation.parent.mission.auto.state.AutoMissionState +import com.kiero.presentation.parent.mission.auto.viewmodel.AutoMissionViewModel +import com.kiero.presentation.parent.mission.component.datepicker.component.CalendarBottomSheet import timber.log.Timber import java.time.LocalDate @@ -63,6 +62,7 @@ fun ParentAutoResultRoute( snackbarHostState.currentSnackbarData?.dismiss() snackbarHostState.showSnackbar(effect.message) } + is AutoMissionSideEffect.ShowToastAndNavigate -> { Timber.e("parent Auto result") @@ -71,6 +71,7 @@ fun ParentAutoResultRoute( navigateUp() } + else -> {} } } diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoInputField.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoInputField.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoInputField.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoInputField.kt index 9c9d3835..bd451dab 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoInputField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoInputField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.shape.RoundedCornerShape diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionAwardInfo.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardInfo.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionAwardInfo.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardInfo.kt index ea2b0122..66326b30 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionAwardInfo.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardInfo.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.Image import androidx.compose.foundation.background diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionAwardSelect.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardSelect.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionAwardSelect.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardSelect.kt index 8c5fbf9d..0bc8becb 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionAwardSelect.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardSelect.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults @Composable fun ParentAutoMissionAwardSelect( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionCalendar.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionCalendar.kt index 3d4d93e7..69f73a57 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionEditForm.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionEditForm.kt similarity index 95% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionEditForm.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionEditForm.kt index 0618460c..870526b1 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionEditForm.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionEditForm.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -24,7 +24,7 @@ import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.mission.auto.model.MissionUiModel import java.time.LocalDate import java.time.format.DateTimeFormatter import java.util.Locale @@ -38,7 +38,7 @@ fun ParentAutoMissionEditForm( onRewardClick: (Int) -> Unit, awardTextFieldState: TextFieldState, snackbarHostState: SnackbarHostState, - modifier: Modifier = Modifier + modifier: Modifier = Modifier, ) { val dateToDisplay = remember(selectedDate, mission.dueAt) { val targetDate = selectedDate ?: mission.dueAt diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionNavigator.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionNavigator.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionNavigator.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionNavigator.kt index 4fc867da..c5f99338 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionNavigator.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionNavigator.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionTextField.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionTextField.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionTextField.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionTextField.kt index f4f2a23b..c12ca556 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentAutoMissionTextField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionTextField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentLocalKieroSnackbar.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentLocalKieroSnackbar.kt similarity index 93% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentLocalKieroSnackbar.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentLocalKieroSnackbar.kt index 771ef4e7..5c740350 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ParentLocalKieroSnackbar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentLocalKieroSnackbar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/model/MissionUiModel.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/model/MissionUiModel.kt similarity index 74% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/model/MissionUiModel.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/model/MissionUiModel.kt index c8c9adcd..a339957e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/model/MissionUiModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/model/MissionUiModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.model +package com.kiero.presentation.parent.mission.auto.model import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/navigation/ParentAutoMissionNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/navigation/ParentAutoMissionNavigation.kt similarity index 81% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/navigation/ParentAutoMissionNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/navigation/ParentAutoMissionNavigation.kt index 35eccc1f..6a956b3c 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/navigation/ParentAutoMissionNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/navigation/ParentAutoMissionNavigation.kt @@ -1,13 +1,12 @@ -package com.kiero.presentation.parent.schedule.mission.auto.navigation +package com.kiero.presentation.parent.mission.auto.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import androidx.navigation.toRoute import com.kiero.core.navigation.Route -import com.kiero.presentation.parent.schedule.mission.auto.ParentAutoAddRoute +import com.kiero.presentation.parent.mission.auto.ParentAutoAddRoute import kotlinx.serialization.Serializable fun NavController.navigateToAutoMissionAdd( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/MonthData.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/MonthData.kt similarity index 80% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/MonthData.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/MonthData.kt index d36033d8..569ae356 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/datepicker/util/MonthData.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/MonthData.kt @@ -1,8 +1,8 @@ -package com.kiero.presentation.parent.schedule.mission.component.datepicker.util +package com.kiero.presentation.parent.mission.component.datepicker.util -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarDisplayMode -import com.kiero.presentation.parent.schedule.mission.component.datepicker.model.CalendarMonth +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarMonth import kotlinx.collections.immutable.toImmutableList import java.time.DayOfWeek import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionAwardButton.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardButton.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionAwardButton.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardButton.kt index d49c4581..96b763bf 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionAwardButton.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardButton.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.missionadd +package com.kiero.presentation.parent.mission.component.missionadd import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults @Composable fun MissionAwardSelect( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionAwardInfo.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardInfo.kt similarity index 95% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionAwardInfo.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardInfo.kt index afc0cdf8..98a27a3b 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionAwardInfo.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardInfo.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.missionadd +package com.kiero.presentation.parent.mission.component.missionadd import androidx.compose.foundation.Image import androidx.compose.foundation.background diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionTextField.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionTextField.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionTextField.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionTextField.kt index 842d11f9..7d6213e6 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionadd/MissionTextField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionTextField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.missionadd +package com.kiero.presentation.parent.mission.component.missionadd import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionCalendar.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionCalendar.kt index c3aa7301..9627dee4 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.missionmain +package com.kiero.presentation.parent.mission.component.missionmain import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionFabContent.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionFabContent.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionFabContent.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionFabContent.kt index 743b096b..c7f81f13 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionFabContent.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionFabContent.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.missionmain +package com.kiero.presentation.parent.mission.component.missionmain import androidx.annotation.DrawableRes import androidx.compose.foundation.background diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionListItem.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionListItem.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionListItem.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionListItem.kt index 13cfbbc3..f23ccc11 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/missionmain/MissionListItem.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionListItem.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.missionmain +package com.kiero.presentation.parent.mission.component.missionmain import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/model/MissionAwardModel.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionAwardModel.kt similarity index 90% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/model/MissionAwardModel.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionAwardModel.kt index a6eec2cb..3b573d9d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/model/MissionAwardModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionAwardModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.model +package com.kiero.presentation.parent.mission.component.model data class MissionAwardValue( val value: Int diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/model/MissionListModel.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionListModel.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/model/MissionListModel.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionListModel.kt index a863603a..dc1bd589 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/component/model/MissionListModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionListModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.component.model +package com.kiero.presentation.parent.mission.component.model import androidx.compose.runtime.Immutable import com.kiero.data.parent.mission.model.MissionByDateModel diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/navigation/MissionAddNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/mission/navigation/MissionAddNavigation.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/navigation/MissionAddNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/navigation/MissionAddNavigation.kt index 80cf1e32..d92d7df9 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/navigation/MissionAddNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/navigation/MissionAddNavigation.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.navigation +package com.kiero.presentation.parent.mission.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.kiero.core.navigation.Route -import com.kiero.presentation.parent.schedule.mission.ParentAddMissionRoute +import com.kiero.presentation.parent.mission.ParentAddMissionRoute import kotlinx.serialization.Serializable fun NavController.navigateToMissionAdd( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/state/ParentAddMissionState.kt b/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentAddMissionState.kt similarity index 92% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/state/ParentAddMissionState.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/state/ParentAddMissionState.kt index a9b9a73f..928c591e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/state/ParentAddMissionState.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentAddMissionState.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.state +package com.kiero.presentation.parent.mission.state import androidx.compose.runtime.Immutable import com.kiero.data.parent.mission.model.ParentMissionAddModel diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/state/ParentMissionState.kt b/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentMissionState.kt similarity index 86% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/state/ParentMissionState.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/state/ParentMissionState.kt index 525370af..a9dbfc6b 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/state/ParentMissionState.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentMissionState.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.state +package com.kiero.presentation.parent.mission.state import androidx.compose.runtime.Immutable import com.kiero.presentation.kid.mission.model.KidMissionByDateUiModel diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/viewmodel/ParentAddMissionViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentAddMissionViewModel.kt similarity index 95% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/viewmodel/ParentAddMissionViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentAddMissionViewModel.kt index 6938df8d..0ca07661 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/viewmodel/ParentAddMissionViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentAddMissionViewModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.viewmodel +package com.kiero.presentation.parent.mission.viewmodel import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd @@ -8,10 +8,10 @@ import androidx.lifecycle.viewModelScope import com.kiero.core.common.extension.formatWithDayOfWeek import com.kiero.core.localstorage.info.UserInfoManager import com.kiero.data.parent.mission.repository.ParentMissionAddRepository -import com.kiero.presentation.parent.schedule.mission.component.model.MissionAwardDefaults -import com.kiero.presentation.parent.schedule.mission.component.model.ParentMissionAddValid -import com.kiero.presentation.parent.schedule.mission.state.ParentAddMissionSideEffect -import com.kiero.presentation.parent.schedule.mission.state.ParentAddMissionState +import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.mission.component.model.ParentMissionAddValid +import com.kiero.presentation.parent.mission.state.ParentAddMissionSideEffect +import com.kiero.presentation.parent.mission.state.ParentAddMissionState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/viewmodel/ParentMissionViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentMissionViewModel.kt similarity index 88% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/viewmodel/ParentMissionViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentMissionViewModel.kt index edb8087c..e3e44d8a 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/viewmodel/ParentMissionViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentMissionViewModel.kt @@ -1,12 +1,12 @@ -package com.kiero.presentation.parent.schedule.mission.viewmodel +package com.kiero.presentation.parent.mission.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.kiero.core.model.UiState import com.kiero.data.parent.mission.repository.MissionRepository import com.kiero.presentation.kid.mission.model.toUiModel -import com.kiero.presentation.parent.schedule.mission.state.ParentMissionSideEffect -import com.kiero.presentation.parent.schedule.mission.state.ParentMissionState +import com.kiero.presentation.parent.mission.state.ParentMissionSideEffect +import com.kiero.presentation.parent.mission.state.ParentMissionState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow From 03953907e00cbb96b932e1f154ddbdabc85bee85 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:46:48 +0900 Subject: [PATCH 03/13] =?UTF-8?q?refactor/#85:=20parent/mission=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/auto/component/ScrollableAutoInputField.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename app/src/main/java/com/kiero/presentation/parent/{schedule => }/mission/auto/component/ScrollableAutoInputField.kt (98%) diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ScrollableAutoInputField.kt b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ScrollableAutoInputField.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ScrollableAutoInputField.kt rename to app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ScrollableAutoInputField.kt index cfad415a..694bc1aa 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/mission/auto/component/ScrollableAutoInputField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ScrollableAutoInputField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.mission.auto.component +package com.kiero.presentation.parent.mission.auto.component import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.BoxWithConstraints From b70403150c14ba29dca03e4598eb8f77bc9d5698 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:47:01 +0900 Subject: [PATCH 04/13] =?UTF-8?q?refactor/#85:=20parent/alarm=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parent/alarm/screen/ParentAlarmScreen.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/screen/ParentAlarmScreen.kt b/app/src/main/java/com/kiero/presentation/parent/alarm/screen/ParentAlarmScreen.kt index ea8fa7bb..8c0e8cae 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/screen/ParentAlarmScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/alarm/screen/ParentAlarmScreen.kt @@ -40,7 +40,6 @@ import com.kiero.core.designsystem.component.indicator.KieroLoadingIndicator import com.kiero.core.designsystem.component.pulltorefresh.KieroPullToRefresh import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.trigger.LocalRefreshState -import com.kiero.presentation.main.navigation.ParentMainTab import com.kiero.presentation.parent.alarm.component.ParentAlarmCard import com.kiero.presentation.parent.alarm.component.ParentAlarmDateHeader import com.kiero.presentation.parent.alarm.model.ParentAlarmUiModel @@ -65,11 +64,9 @@ fun ParentAlarmRoute( val refreshState = LocalRefreshState.current LaunchedEffect(Unit) { - refreshState.refreshEvent.collect { tab -> - if (tab == ParentMainTab.ALARM) { - listState.animateScrollToItem(0) - viewModel.refresh(isRefresh = true) - } + refreshState.refreshEvent.collect { + listState.animateScrollToItem(0) + viewModel.refresh(isRefresh = true) } } @@ -82,7 +79,7 @@ fun ParentAlarmRoute( KieroPullToRefresh( isRefreshing = state.isRefreshing, - onRefresh = {viewModel.refresh(isRefresh = true)}, + onRefresh = { viewModel.refresh(isRefresh = true) }, ) { ParentAlarmScreen( state = state, @@ -150,9 +147,11 @@ private fun ParentAlarmScreen( CircularProgressIndicator(color = KieroTheme.colors.main) } } + state.alarms.isEmpty() -> { EmptyAlarmView() } + else -> { LazyColumn( state = listState, From 4af67d94b64e63d9e0ee4830bbe07838d020721c Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:47:29 +0900 Subject: [PATCH 05/13] =?UTF-8?q?refactor/#85:=20parent/schedule=20?= =?UTF-8?q?=EB=B7=B0=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=84=A4=EB=B9=84?= =?UTF-8?q?=EA=B2=8C=EC=9D=B4=EC=85=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parent/plan/model/PlanContentModel.kt | 23 +++ .../parent/component/ParentFloatingButton.kt | 2 +- .../parent/component/ParentTopbar.kt | 71 +++++++++ .../parent/schedule/ParentScheduleScreen.kt | 140 +++++------------- .../parent/schedule/model/ScheduleTimeUtil.kt | 13 -- .../navigation/ParentScheduleNavigation.kt | 10 +- .../parent/schedule/plan/ParentPlanScreen.kt | 20 ++- .../schedule/plan/state/PlanScheduleState.kt | 25 +--- app/src/main/res/values/strings.xml | 12 +- 9 files changed, 160 insertions(+), 156 deletions(-) create mode 100644 app/src/main/java/com/kiero/presentation/parent/component/ParentTopbar.kt diff --git a/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt b/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt index f1527cce..675264c3 100644 --- a/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt +++ b/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt @@ -4,6 +4,7 @@ import NormalScheduleDto import PlanAllResponseDto import RecurringScheduleDto import com.kiero.data.parent.plan.remote.dto.response.PlanColorResponseDto +import com.kiero.presentation.parent.schedule.model.ScheduleEvent data class PlanColorModel( val scheduleColor : String, @@ -59,4 +60,26 @@ fun NormalScheduleDto.toModel(): NormalScheduleModel = NormalScheduleModel( name = this.name, colorCode = this.colorCode, date = this.date +) + +fun RecurringScheduleModel.toUiModel() = ScheduleEvent( + id = "recurring_${name}_${startTime}", + name = name, + isRecurring = true, + startTime = startTime, + endTime = endTime, + scheduleColor = colorCode, + dayOfWeek = dayOfWeek, + date = null +) + +fun NormalScheduleModel.toUiModel() = ScheduleEvent( + id = "normal_${name}_${date}", + name = name, + isRecurring = false, + startTime = startTime, + endTime = endTime, + scheduleColor = colorCode, + dayOfWeek = null, + date = date ) \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt b/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt index de63fd9f..9b6fd9f8 100644 --- a/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt +++ b/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt @@ -30,7 +30,7 @@ import androidx.compose.ui.window.PopupProperties import androidx.compose.ui.zIndex import com.kiero.R import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.mission.component.missionmain.MissionFabContent +import com.kiero.presentation.parent.mission.component.missionmain.MissionFabContent @Composable fun ParentFloatingButton( diff --git a/app/src/main/java/com/kiero/presentation/parent/component/ParentTopbar.kt b/app/src/main/java/com/kiero/presentation/parent/component/ParentTopbar.kt new file mode 100644 index 00000000..cf825d3b --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/component/ParentTopbar.kt @@ -0,0 +1,71 @@ +package com.kiero.presentation.parent.component + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.kiero.R +import com.kiero.core.common.extension.noRippleClickable +import com.kiero.core.designsystem.theme.KieroTheme + +@Composable +fun ParentTopbar( + title: String, + onAlarmClick: () -> Unit, + modifier: Modifier = Modifier, + isAlarmActive: Boolean = false, +) { + val alarmRes = when (isAlarmActive) { + true -> R.drawable.ic_parent_alarm_activate + false -> R.drawable.ic_parent_alarm_default + } + + Row( + modifier = modifier + .fillMaxWidth() + .background( + color = KieroTheme.colors.black + ) + .padding(vertical = 8.dp, horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = title, + color = KieroTheme.colors.white, + style = KieroTheme.typography.bold.headLine2 + ) + + Spacer(modifier = Modifier.weight(1f)) + + Icon( + imageVector = ImageVector.vectorResource(id = alarmRes), + contentDescription = null, + tint = Color.Unspecified, + modifier = Modifier + .noRippleClickable(onClick = onAlarmClick) + ) + } +} + +@Preview +@Composable +private fun ParentTopbarPreview() { + KieroTheme { + ParentTopbar( + title = "일정", + onAlarmClick = {}, + isAlarmActive = true + ) + } +} diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/ParentScheduleScreen.kt b/app/src/main/java/com/kiero/presentation/parent/schedule/ParentScheduleScreen.kt index bb5b2cda..6c97fad2 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/ParentScheduleScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/schedule/ParentScheduleScreen.kt @@ -6,9 +6,12 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -22,25 +25,19 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.kiero.core.common.extension.collectSideEffect import com.kiero.core.common.extension.statusBarColor -import com.kiero.core.common.util.successData -import com.kiero.core.designsystem.component.dialog.KieroDialog -import com.kiero.core.designsystem.component.dialog.action.KieroCancelAction -import com.kiero.core.designsystem.component.dialog.action.KieroConfirmAction import com.kiero.core.designsystem.component.indicator.KieroLoadingIndicator import com.kiero.core.designsystem.theme.Gray900 import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.model.UiState -import com.kiero.presentation.parent.component.MissionTabFab -import com.kiero.presentation.parent.component.ParentTabRow -import com.kiero.presentation.parent.component.ParentUserSection +import com.kiero.core.model.trigger.RefreshState +import com.kiero.core.trigger.LocalRefreshState +import com.kiero.presentation.parent.component.ParentTopbar import com.kiero.presentation.parent.component.PlanTabFab -import com.kiero.presentation.parent.schedule.mission.ParentMissionRoute import com.kiero.presentation.parent.schedule.model.TabItem import com.kiero.presentation.parent.schedule.plan.ParentPlanScreen import com.kiero.presentation.parent.schedule.plan.state.ParentScheduleState import com.kiero.presentation.parent.schedule.viewmodel.ParentScheduleViewModel import com.kiero.presentation.signup.parent.state.ParentSignUpSideEffect -import com.kiero.presentation.signup.parent.state.ParentSignUpState import java.time.LocalDate @Composable @@ -49,8 +46,7 @@ fun ParentScheduleRoute( navigateUp: () -> Unit, navigateToSelection: () -> Unit, navigateToScheduleAdd: (String, Boolean) -> Unit, - navigateToMissionAdd: () -> Unit, - navigateToAutoMissionAdd: (Long) -> Unit, + navigateToAlarm: () -> Unit, viewModel: ParentScheduleViewModel = hiltViewModel(), ) { @@ -84,11 +80,7 @@ fun ParentScheduleRoute( is UiState.Success -> { ParentScheduleScreen( paddingValues = paddingValues, - state = authState, scheduleState = state.data, - childId = childId, - selectedTabIndex = selectedTabIndex, - onTabSelected = viewModel::updateTabIndex, onDateChange = viewModel::onDateChange, onResetToToday = viewModel::resetToday, navigateToScheduleAdd = { @@ -97,9 +89,7 @@ fun ParentScheduleRoute( state.data.isFireLit ) }, - navigateToMissionAdd = navigateToMissionAdd, - navigateToAutoMissionAdd = navigateToAutoMissionAdd, - onUserNameClick = viewModel::onProfileClick + navigateToAlarm = navigateToAlarm, ) } @@ -110,60 +100,28 @@ fun ParentScheduleRoute( is UiState.Empty -> { ParentScheduleScreen( paddingValues = paddingValues, - state = authState, - childId = childId, scheduleState = ParentScheduleState(), - selectedTabIndex = selectedTabIndex, - onTabSelected = viewModel::updateTabIndex, onResetToToday = viewModel::resetToday, onDateChange = viewModel::onDateChange, - onUserNameClick = viewModel::onProfileClick, navigateToScheduleAdd = { navigateToScheduleAdd(LocalDate.now().toString(), false) }, - navigateToMissionAdd = navigateToMissionAdd, - navigateToAutoMissionAdd = navigateToAutoMissionAdd, + navigateToAlarm = navigateToAlarm, ) } } - - if (uiState.successData?.isLogoutDialogVisible == true) { - KieroDialog( - title = "로그아웃", - subDescription = "로그아웃 하시겠습니까?", - onDismiss = viewModel::onLogoutCancel, - confirmAction = KieroConfirmAction( - text = "확인", - onClick = { - viewModel.onLogoutConfirm() - } - ), - cancelAction = KieroCancelAction( - text = "취소", - onClick = viewModel::onLogoutCancel - ), - isDisabled = true, - content = {} - ) - } } } @Composable private fun ParentScheduleScreen( paddingValues: PaddingValues, - state: ParentSignUpState, scheduleState: ParentScheduleState, - childId: Long?, - navigateToAutoMissionAdd: (Long) -> Unit, - selectedTabIndex: Int, modifier: Modifier = Modifier, onResetToToday: () -> Unit, - onTabSelected: (Int) -> Unit, onDateChange: (Boolean) -> Unit, - onUserNameClick: () -> Unit, navigateToScheduleAdd: () -> Unit, - navigateToMissionAdd: () -> Unit, + navigateToAlarm: () -> Unit, ) { val tabs = remember { TabItem.entries.map { it.title } } var isMissionFabExpanded by remember { mutableStateOf(false) } @@ -178,32 +136,21 @@ private fun ParentScheduleScreen( .statusBarColor(backgroundColor = Gray900) .padding(paddingValues) ) { - ParentUserSection( - userName = state.parentInfo.parentName, - profileImage = state.parentInfo.parentProfileImage, - onUserNameClick = onUserNameClick, - modifier = Modifier - .background(color = KieroTheme.colors.gray900) - ) + Spacer(modifier = Modifier.height(16.dp)) - ParentTabRow( - tabs = tabs, - selectedTabIndex = selectedTabIndex, - onTabSelected = onTabSelected + ParentTopbar( + title = "일정", + onAlarmClick = {} ) - when (selectedTabIndex) { - 0 -> ParentPlanScreen( - state = scheduleState, - onDateChange = onDateChange, - onResetToday = onResetToToday, - ) - - 1 -> ParentMissionRoute(paddingValues) - } + ParentPlanScreen( + state = scheduleState, + onDateChange = onDateChange, + onResetToday = onResetToToday, + ) } - if (selectedTabIndex == 1 && isMissionFabExpanded) { + if (isMissionFabExpanded) { Box( modifier = Modifier .fillMaxSize() @@ -217,26 +164,12 @@ private fun ParentScheduleScreen( ) } - when (selectedTabIndex) { - 0 -> PlanTabFab( - onScheduleAdd = { navigateToScheduleAdd() }, - modifier = Modifier - .align(Alignment.BottomEnd) - .padding(16.dp) - ) - - 1 -> MissionTabFab( - isExpanded = isMissionFabExpanded, - onExpandedChange = { isMissionFabExpanded = it }, - onMissionAdd = navigateToMissionAdd, - onMissionRecommend = { - childId?.let { navigateToAutoMissionAdd(it) } - }, - modifier = Modifier - .align(Alignment.BottomEnd) - .padding(end = 16.dp, bottom = 52.dp) - ) - } + PlanTabFab( + onScheduleAdd = { navigateToScheduleAdd() }, + modifier = Modifier + .align(Alignment.BottomEnd) + .padding(16.dp) + ) } } @@ -244,13 +177,18 @@ private fun ParentScheduleScreen( @Preview private fun ParentScheduleScreenPreview() { KieroTheme { - ParentScheduleRoute( - paddingValues = PaddingValues(), - navigateUp = {}, - navigateToScheduleAdd = { _, _ -> }, - navigateToMissionAdd = {}, - navigateToAutoMissionAdd = {}, - navigateToSelection = {} - ) + CompositionLocalProvider( + LocalRefreshState provides RefreshState() + ) { + ParentScheduleScreen( + paddingValues = PaddingValues(), + scheduleState = ParentScheduleState(), + onDateChange = {}, + onResetToToday = {}, + navigateToScheduleAdd = {}, + navigateToAlarm = {} + ) + } + } } diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleTimeUtil.kt b/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleTimeUtil.kt index 56134e32..6acfb454 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleTimeUtil.kt +++ b/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleTimeUtil.kt @@ -73,19 +73,6 @@ fun ScheduleEvent.toScheduleBlocks(dayIndex: Int): List { return blocks } -fun String.toDayIndex(): Int { - return when (this) { - "MON" -> 0 - "TUE" -> 1 - "WED" -> 2 - "THU" -> 3 - "FRI" -> 4 - "SAT" -> 5 - "SUN" -> 6 - else -> 0 - } -} - fun parseTime(timeString: String): Pair { val parts = timeString.split(":") return Pair(parts[0].toInt(), parts[1].toInt()) diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/navigation/ParentScheduleNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/schedule/navigation/ParentScheduleNavigation.kt index 36bf3b04..95abfa8c 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/navigation/ParentScheduleNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/schedule/navigation/ParentScheduleNavigation.kt @@ -18,18 +18,16 @@ fun NavGraphBuilder.parentScheduleNavGraph( paddingValues: PaddingValues, navigateUp: () -> Unit, navigateToScheduleAdd: (String, Boolean) -> Unit, - navigateToMissionAdd: () -> Unit, - navigateToAutoMissionAdd: (Long) -> Unit, - navigateToSelection: () -> Unit + navigateToSelection: () -> Unit, + navigateToAlarm: () -> Unit, ) { composable { ParentScheduleRoute( paddingValues = paddingValues, navigateUp = navigateUp, navigateToScheduleAdd = navigateToScheduleAdd, - navigateToMissionAdd = navigateToMissionAdd, - navigateToAutoMissionAdd = navigateToAutoMissionAdd, - navigateToSelection = navigateToSelection + navigateToSelection = navigateToSelection, + navigateToAlarm = navigateToAlarm, ) } } \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentPlanScreen.kt b/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentPlanScreen.kt index c2f50b14..43617a5b 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentPlanScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentPlanScreen.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -17,13 +18,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme +import com.kiero.core.model.trigger.RefreshState import com.kiero.core.trigger.LocalRefreshState +import com.kiero.data.parent.plan.model.toUiModel import com.kiero.presentation.main.navigation.ParentMainTab import com.kiero.presentation.parent.schedule.plan.component.plan.ScheduleDatebar import com.kiero.presentation.parent.schedule.plan.component.plan.ScheduleTimeTable import com.kiero.presentation.parent.schedule.plan.component.plan.ScheduleWeekTopbar import com.kiero.presentation.parent.schedule.plan.state.ParentScheduleState -import com.kiero.presentation.parent.schedule.plan.state.toUiModel @Composable fun ParentPlanScreen( @@ -62,8 +64,6 @@ fun ParentPlanScreen( verticalArrangement = Arrangement.spacedBy(12.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { - Spacer(modifier = Modifier.height(15.dp)) - ScheduleDatebar( date = state.dateRangeText, onPreviousClick = { if (state.canGoPrevious) onDateChange(false) }, @@ -98,10 +98,14 @@ fun ParentPlanScreen( @Composable private fun ParentPlanScreenPreview() { KieroTheme { - ParentPlanScreen( - state = ParentScheduleState(), - onResetToday = {}, - onDateChange = {} - ) + CompositionLocalProvider( + LocalRefreshState provides RefreshState() + ) { + ParentPlanScreen( + state = ParentScheduleState(), + onResetToday = {}, + onDateChange = {} + ) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanScheduleState.kt b/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanScheduleState.kt index 5dd01ac3..f4bbd3b2 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanScheduleState.kt +++ b/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanScheduleState.kt @@ -82,27 +82,4 @@ data class ParentScheduleState( else -> 0 } } - -} - -fun RecurringScheduleModel.toUiModel() = ScheduleEvent( - id = "recurring_${name}_${startTime}", - name = name, - isRecurring = true, - startTime = startTime, - endTime = endTime, - scheduleColor = colorCode, - dayOfWeek = dayOfWeek, - date = null -) - -fun NormalScheduleModel.toUiModel() = ScheduleEvent( - id = "normal_${name}_${date}", - name = name, - isRecurring = false, - startTime = startTime, - endTime = endTime, - scheduleColor = colorCode, - dayOfWeek = null, - date = date -) \ No newline at end of file +} \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3abb48d0..cd002268 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,10 +1,16 @@ Kiero - 스케쥴 관리 + + 일정 알람 피드 - 오늘의 여정 - 금화 미션 + 오늘의 현황 + 미션 + 보상 + 마이페이지 + + 오늘의 여정 + 금화 미션 소원의 우물 From 1996e30a6355030607e3cfb4b3e8d416d80d6a78 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:47:48 +0900 Subject: [PATCH 06/13] =?UTF-8?q?refactor/#85:=20parent=20=EC=8A=A4?= =?UTF-8?q?=ED=94=84=EB=A6=B0=ED=8A=B8=20=EC=B6=94=EA=B0=80=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parent/journey/ParentJourneyScreen.kt | 32 ++++++++++++++++++ .../navigation/ParentJourneyNavigation.kt | 27 +++++++++++++++ .../navigation/ParentMissionNavigation.kt | 27 +++++++++++++++ .../parent/mypage/ParentMypageScreen.kt | 32 ++++++++++++++++++ .../navigation/ParentMypageNavigation.kt | 27 +++++++++++++++ .../parent/reward/ParentRewardScreen.kt | 33 +++++++++++++++++++ .../navigation/ParentRewardNavigation.kt | 27 +++++++++++++++ 7 files changed, 205 insertions(+) create mode 100644 app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt create mode 100644 app/src/main/java/com/kiero/presentation/parent/journey/navigation/ParentJourneyNavigation.kt create mode 100644 app/src/main/java/com/kiero/presentation/parent/mission/navigation/ParentMissionNavigation.kt create mode 100644 app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt create mode 100644 app/src/main/java/com/kiero/presentation/parent/mypage/navigation/ParentMypageNavigation.kt create mode 100644 app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt create mode 100644 app/src/main/java/com/kiero/presentation/parent/reward/navigation/ParentRewardNavigation.kt diff --git a/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt b/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt new file mode 100644 index 00000000..2cbcb2c2 --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt @@ -0,0 +1,32 @@ +package com.kiero.presentation.parent.journey + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview + +@Composable +fun ParentJourneyRoute( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { + ParentJourneyScreen( + paddingValues = paddingValues, + navigateUp = navigateUp + ) +} + +@Composable +private fun ParentJourneyScreen( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { +} + +@Preview +@Composable +private fun ParentJourneyScreenPreview() { + ParentJourneyScreen( + paddingValues = PaddingValues(), + navigateUp = {} + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/journey/navigation/ParentJourneyNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/journey/navigation/ParentJourneyNavigation.kt new file mode 100644 index 00000000..47655acf --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/journey/navigation/ParentJourneyNavigation.kt @@ -0,0 +1,27 @@ +package com.kiero.presentation.parent.journey.navigation + +import androidx.compose.foundation.layout.PaddingValues +import androidx.navigation.NavController +import androidx.navigation.NavGraphBuilder +import androidx.navigation.NavOptions +import androidx.navigation.compose.composable +import com.kiero.presentation.parent.journey.ParentJourneyRoute +import com.kiero.presentation.parent.navigation.ParentJourney + +fun NavController.navigateToParentJourney( + navOptions: NavOptions? = null, +) { + navigate(ParentJourney, navOptions) +} + +fun NavGraphBuilder.parentJourneyNavGraph( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { + composable { + ParentJourneyRoute( + paddingValues = paddingValues, + navigateUp = navigateUp, + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/navigation/ParentMissionNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/mission/navigation/ParentMissionNavigation.kt new file mode 100644 index 00000000..2619f182 --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/mission/navigation/ParentMissionNavigation.kt @@ -0,0 +1,27 @@ +package com.kiero.presentation.parent.mission.navigation + +import androidx.compose.foundation.layout.PaddingValues +import androidx.navigation.NavController +import androidx.navigation.NavGraphBuilder +import androidx.navigation.NavOptions +import androidx.navigation.compose.composable +import com.kiero.presentation.parent.mission.ParentMissionRoute +import com.kiero.presentation.parent.navigation.ParentMission + +fun NavController.navigateToParentMission( + navOptions: NavOptions? = null, +) { + navigate(ParentMission, navOptions) +} + +fun NavGraphBuilder.parentMissionNavGraph( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { + composable { + ParentMissionRoute( + paddingValues = paddingValues, + navigateUp = navigateUp, + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt b/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt new file mode 100644 index 00000000..8f2db854 --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt @@ -0,0 +1,32 @@ +package com.kiero.presentation.parent.mypage + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview + +@Composable +fun ParentMypageRoute( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { + ParentMypageScreen( + paddingValues = paddingValues, + navigateUp = navigateUp + ) +} + +@Composable +private fun ParentMypageScreen( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { +} + +@Preview +@Composable +private fun ParentMypageScreenPreview() { + ParentMypageScreen( + paddingValues = PaddingValues(), + navigateUp = {} + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/mypage/navigation/ParentMypageNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/mypage/navigation/ParentMypageNavigation.kt new file mode 100644 index 00000000..d0feafba --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/mypage/navigation/ParentMypageNavigation.kt @@ -0,0 +1,27 @@ +package com.kiero.presentation.parent.mypage.navigation + +import androidx.compose.foundation.layout.PaddingValues +import androidx.navigation.NavController +import androidx.navigation.NavGraphBuilder +import androidx.navigation.NavOptions +import androidx.navigation.compose.composable +import com.kiero.presentation.parent.mypage.ParentMypageRoute +import com.kiero.presentation.parent.navigation.Mypage + +fun NavController.navigateToMypage( + navOptions: NavOptions? = null, +) { + navigate(Mypage, navOptions) +} + +fun NavGraphBuilder.parentMypageNavGraph( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { + composable { + ParentMypageRoute( + paddingValues = paddingValues, + navigateUp = navigateUp, + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt b/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt new file mode 100644 index 00000000..ac937979 --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt @@ -0,0 +1,33 @@ +package com.kiero.presentation.parent.reward + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview + + +@Composable +fun ParentRewardRoute( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { + ParentRewardScreen( + paddingValues = paddingValues, + navigateUp = navigateUp + ) +} + +@Composable +private fun ParentRewardScreen( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { +} + +@Preview +@Composable +private fun ParentRewardScreenPreview() { + ParentRewardScreen( + paddingValues = PaddingValues(), + navigateUp = {} + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/reward/navigation/ParentRewardNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/reward/navigation/ParentRewardNavigation.kt new file mode 100644 index 00000000..f6f9da6c --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/reward/navigation/ParentRewardNavigation.kt @@ -0,0 +1,27 @@ +package com.kiero.presentation.parent.reward.navigation + +import androidx.compose.foundation.layout.PaddingValues +import androidx.navigation.NavController +import androidx.navigation.NavGraphBuilder +import androidx.navigation.NavOptions +import androidx.navigation.compose.composable +import com.kiero.presentation.parent.navigation.Reward +import com.kiero.presentation.parent.reward.ParentRewardRoute + +fun NavController.navigateToReward( + navOptions: NavOptions? = null, +) { + navigate(Reward, navOptions) +} + +fun NavGraphBuilder.parentRewardNavGraph( + paddingValues: PaddingValues, + navigateUp: () -> Unit, +) { + composable { + ParentRewardRoute( + paddingValues = paddingValues, + navigateUp = navigateUp, + ) + } +} \ No newline at end of file From bff2476ab109a82a80a8f21aec2291a064820c95 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:48:09 +0900 Subject: [PATCH 07/13] =?UTF-8?q?refactor/#85:=20parent=20bottom=20bar=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/main/navigation/MainTab.kt | 45 ++++++++++++++----- .../navigation/component/MainBottomBar.kt | 39 +++++++++++++++- 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/kiero/presentation/main/navigation/MainTab.kt b/app/src/main/java/com/kiero/presentation/main/navigation/MainTab.kt index e21ea7f9..5a5df160 100644 --- a/app/src/main/java/com/kiero/presentation/main/navigation/MainTab.kt +++ b/app/src/main/java/com/kiero/presentation/main/navigation/MainTab.kt @@ -7,10 +7,12 @@ import com.kiero.presentation.kid.navigation.Journey import com.kiero.presentation.kid.navigation.KidTab import com.kiero.presentation.kid.navigation.Mission import com.kiero.presentation.kid.navigation.Wish - import com.kiero.presentation.main.navigation.component.BottomBarTab -import com.kiero.presentation.parent.navigation.Alarm +import com.kiero.presentation.parent.navigation.Mypage +import com.kiero.presentation.parent.navigation.ParentJourney +import com.kiero.presentation.parent.navigation.ParentMission import com.kiero.presentation.parent.navigation.ParentTab +import com.kiero.presentation.parent.navigation.Reward import com.kiero.presentation.parent.navigation.Schedule enum class ParentMainTab( @@ -19,17 +21,38 @@ enum class ParentMainTab( @param:StringRes override val labelRes: Int, val route: ParentTab, ) : BottomBarTab { + + JOURNEY( + iconRes = R.drawable.ic_parent_tab_today, + contentDescription = R.string.parent_journey_tab_content_description, + labelRes = R.string.parent_journey_tab_content_description, + route = ParentJourney, + ), SCHEDULE( iconRes = R.drawable.ic_parent_tab_schedule, contentDescription = R.string.schedule_tab_content_description, labelRes = R.string.schedule_tab_content_description, route = Schedule, ), - ALARM( - iconRes = R.drawable.ic_parent_tab_alarm, - contentDescription = R.string.alarm_tab_content_description, - labelRes = R.string.alarm_tab_content_description, - route = Alarm, + + MISSION( + iconRes = R.drawable.ic_parent_tab_mission, + contentDescription = R.string.parent_mission_tab_content_description, + labelRes = R.string.parent_mission_tab_content_description, + route = ParentMission, + ), + + REWARD( + iconRes = R.drawable.ic_parent_tab_reward, + contentDescription = R.string.reward_tab_content_description, + labelRes = R.string.reward_tab_content_description, + route = Reward, + ), + MYPAGE( + iconRes = R.drawable.ic_parent_tab_mypage, + contentDescription = R.string.mypage_tab_content_description, + labelRes = R.string.mypage_tab_content_description, + route = Mypage, ); companion object { @@ -52,14 +75,14 @@ enum class KidMainTab( ) : BottomBarTab { JOURNEY( iconRes = R.drawable.ic_kid_tab_journey, - contentDescription = R.string.journey_tab_content_description, - labelRes = R.string.journey_tab_content_description, + contentDescription = R.string.kid_journey_tab_content_description, + labelRes = R.string.kid_journey_tab_content_description, route = Journey, ), MISSION( iconRes = R.drawable.ic_kid_tab_mission, - contentDescription = R.string.mission_tab_content_description, - labelRes = R.string.mission_tab_content_description, + contentDescription = R.string.kid_mission_tab_content_description, + labelRes = R.string.kid_mission_tab_content_description, route = Mission, ), WISH( diff --git a/app/src/main/java/com/kiero/presentation/main/navigation/component/MainBottomBar.kt b/app/src/main/java/com/kiero/presentation/main/navigation/component/MainBottomBar.kt index daa21b3a..c263443b 100644 --- a/app/src/main/java/com/kiero/presentation/main/navigation/component/MainBottomBar.kt +++ b/app/src/main/java/com/kiero/presentation/main/navigation/component/MainBottomBar.kt @@ -28,10 +28,14 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme +import com.kiero.presentation.main.navigation.KidMainTab +import com.kiero.presentation.main.navigation.ParentMainTab import kotlinx.collections.immutable.ImmutableList +import kotlinx.collections.immutable.persistentListOf @Composable fun MainBottomBar( @@ -83,7 +87,8 @@ fun MainBottomBar( MainNavigationBarItem( selected = tab == currentTab, tab = tab, - onClick = { onTabSelected(tab) } + onClick = { onTabSelected(tab) }, + modifier = Modifier.weight(1f) ) } } @@ -108,7 +113,7 @@ private fun MainNavigationBarItem( Column( modifier = modifier .noRippleClickable(onClick) - .padding(horizontal = 12.dp, vertical = 8.dp), + .padding(vertical = 8.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { @@ -127,4 +132,34 @@ private fun MainNavigationBarItem( textAlign = TextAlign.Center ) } +} + +@Preview(name = "Parent Mode") +@Composable +private fun PreviewMainBottomBarParent() { + KieroTheme { + MainBottomBar( + isVisible = true, + isParentMode = true, + containerShape = RoundedCornerShape(12.dp), + tabs = persistentListOf(*ParentMainTab.entries.toTypedArray()), + currentTab = ParentMainTab.SCHEDULE, + onTabSelected = {} + ) + } +} + +@Preview(name = "Kid Mode") +@Composable +private fun PreviewMainBottomBarKid() { + KieroTheme { + MainBottomBar( + isVisible = true, + isParentMode = false, + containerShape = RoundedCornerShape(12.dp), + tabs = persistentListOf(*KidMainTab.entries.toTypedArray()), + currentTab = KidMainTab.MISSION, + onTabSelected = {} + ) + } } \ No newline at end of file From 093622557169bf8894d54f07fc8da64794acd8e6 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Mon, 23 Feb 2026 16:48:21 +0900 Subject: [PATCH 08/13] =?UTF-8?q?refactor/#85:=20parent=20navigation=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/navigation/KieroNavHost.kt | 4 +- .../main/navigation/MainAppState.kt | 36 +++++++++++++--- .../parent/navigation/ParentNavigation.kt | 43 ++++++++++++++++--- 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/kiero/presentation/main/navigation/KieroNavHost.kt b/app/src/main/java/com/kiero/presentation/main/navigation/KieroNavHost.kt index 46e958a9..e3388dfb 100644 --- a/app/src/main/java/com/kiero/presentation/main/navigation/KieroNavHost.kt +++ b/app/src/main/java/com/kiero/presentation/main/navigation/KieroNavHost.kt @@ -15,7 +15,6 @@ import com.kiero.presentation.kid.navigation.kidNavGraph import com.kiero.presentation.parent.navigation.parentNavGraph import com.kiero.presentation.signup.parent.navigation.parentSignUpNavGraph import com.kiero.presentation.splash.navigation.splashNavGraph -import timber.log.Timber @Composable fun KieroNavHost( @@ -89,7 +88,8 @@ fun KieroNavHost( navController = appState.navController, paddingValues = paddingValues, navigateUp = appState::navigateUp, - navigateToSelection = appState::navigateToSelection + navigateToSelection = appState::navigateToSelection, + navigateToAlarm = appState::navigateToAlarm ) kidNavGraph( diff --git a/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt b/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt index a647e39f..fbeac03b 100644 --- a/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt +++ b/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt @@ -26,10 +26,17 @@ import com.kiero.presentation.kid.navigation.Wish import com.kiero.presentation.kid.onboarding.navigation.navigateToKidOnboarding import com.kiero.presentation.kid.wish.navigation.navigateToWish import com.kiero.presentation.parent.alarm.navigation.navigateToAlarm -import com.kiero.presentation.parent.navigation.Alarm +import com.kiero.presentation.parent.journey.navigation.navigateToParentJourney +import com.kiero.presentation.parent.mission.navigation.navigateToMissionAdd +import com.kiero.presentation.parent.mission.navigation.navigateToParentMission +import com.kiero.presentation.parent.mypage.navigation.navigateToMypage +import com.kiero.presentation.parent.navigation.Mypage import com.kiero.presentation.parent.navigation.ParentGraph +import com.kiero.presentation.parent.navigation.ParentJourney +import com.kiero.presentation.parent.navigation.ParentMission +import com.kiero.presentation.parent.navigation.Reward import com.kiero.presentation.parent.navigation.Schedule -import com.kiero.presentation.parent.schedule.mission.navigation.navigateToMissionAdd +import com.kiero.presentation.parent.reward.navigation.navigateToReward import com.kiero.presentation.parent.schedule.navigation.navigateToSchedule import com.kiero.presentation.parent.schedule.plan.navigation.navigateToScheduleAdd import com.kiero.presentation.signup.parent.navigation.navigateToParentSignUp @@ -149,7 +156,7 @@ class MainAppState( } fun navigateToAuth( - navOptions: NavOptions? = null + navOptions: NavOptions? = null, ) { navController.navigate(AuthGraph) { popUpTo(0) { @@ -166,8 +173,11 @@ class MainAppState( restoreState = true } when (tab) { + ParentMainTab.JOURNEY -> navController.navigate(ParentJourney, navOptions) ParentMainTab.SCHEDULE -> navController.navigate(Schedule, navOptions) - ParentMainTab.ALARM -> navController.navigate(Alarm, navOptions) + ParentMainTab.MISSION -> navController.navigate(ParentMission, navOptions) + ParentMainTab.REWARD -> navController.navigate(Reward, navOptions) + ParentMainTab.MYPAGE -> navController.navigate(Mypage, navOptions) } } @@ -199,6 +209,12 @@ class MainAppState( fun navigateToWish(navOptions: NavOptions? = null) = navController.navigateToWish(navOptions) + fun navigateToMypage(navOptions: NavOptions? = null) = + navController.navigateToMypage(navOptions) + + fun navigateToReward(navOptions: NavOptions? = null) = + navController.navigateToReward(navOptions) + fun navigateToScheduleAdd( initialDate: String, isFireLit: Boolean, @@ -211,7 +227,7 @@ class MainAppState( fun navigateToCamera( scheduleDetailId: Long, stoneType: StoneUiType, - navOptions: NavOptions? = null + navOptions: NavOptions? = null, ) = navController.navigateToCamera( scheduleDetailId = scheduleDetailId, stoneType = stoneType, @@ -221,7 +237,7 @@ class MainAppState( fun navigateToFire( date: String, stones: Int, - navOptions: NavOptions? = null + navOptions: NavOptions? = null, ) = navController.navigateToFire( date = date, stones = stones, @@ -230,12 +246,18 @@ class MainAppState( fun navigateToFireResult( date: String, - navOptions: NavOptions? = null + navOptions: NavOptions? = null, ) = navController.navigateToFireResult( date = date, navOptions = navOptions ) + fun navigateToParentMission(navOptions: NavOptions? = null) = + navController.navigateToParentMission(navOptions) + + fun navigateToParentJourney(navOptions: NavOptions? = null) = + navController.navigateToParentJourney(navOptions) + fun navigateToMissionAdd(navOptions: NavOptions? = null) = navController.navigateToMissionAdd(navOptions) diff --git a/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt index 3e9d7a8b..5b50b9aa 100644 --- a/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt @@ -8,10 +8,11 @@ import androidx.navigation.NavOptions import androidx.navigation.compose.navigation import com.kiero.core.navigation.Route import com.kiero.presentation.parent.alarm.navigation.parentAlarmNavGraph -import com.kiero.presentation.parent.schedule.mission.auto.navigation.navigateToAutoMissionAdd -import com.kiero.presentation.parent.schedule.mission.auto.navigation.parentAutoMissionAddNavGraph -import com.kiero.presentation.parent.schedule.mission.navigation.navigateToMissionAdd -import com.kiero.presentation.parent.schedule.mission.navigation.parentMissionAddNavGraph +import com.kiero.presentation.parent.journey.navigation.parentJourneyNavGraph +import com.kiero.presentation.parent.mission.auto.navigation.parentAutoMissionAddNavGraph +import com.kiero.presentation.parent.mission.navigation.parentMissionAddNavGraph +import com.kiero.presentation.parent.mypage.navigation.parentMypageNavGraph +import com.kiero.presentation.parent.reward.navigation.parentRewardNavGraph import com.kiero.presentation.parent.schedule.navigation.parentScheduleNavGraph import com.kiero.presentation.parent.schedule.plan.navigation.navigateToScheduleAdd import com.kiero.presentation.parent.schedule.plan.navigation.parentScheduleAddNavGraph @@ -28,6 +29,19 @@ data object Schedule : ParentTab @Serializable data object Alarm : ParentTab +@Serializable +data object ParentJourney : ParentTab + +@Serializable +data object ParentMission : ParentTab + +@Serializable +data object Reward : ParentTab + +@Serializable +data object Mypage : ParentTab + + fun NavController.navigateToParent( navOptions: NavOptions? = null, ) { @@ -39,6 +53,7 @@ fun NavGraphBuilder.parentNavGraph( paddingValues: PaddingValues, navigateUp: () -> Unit, navigateToSelection: () -> Unit, + navigateToAlarm: () -> Unit, ) { navigation( startDestination = Schedule @@ -52,9 +67,8 @@ fun NavGraphBuilder.parentNavGraph( isFireLit = fireLit ) }, - navigateToMissionAdd = navController::navigateToMissionAdd, - navigateToAutoMissionAdd = navController::navigateToAutoMissionAdd, - navigateToSelection = navigateToSelection + navigateToSelection = navigateToSelection, + navigateToAlarm = navigateToAlarm ) parentScheduleAddNavGraph( @@ -77,5 +91,20 @@ fun NavGraphBuilder.parentNavGraph( navigateUp = navigateUp, navigateToSelection = navigateToSelection ) + + parentJourneyNavGraph( + paddingValues = paddingValues, + navigateUp = navigateUp, + ) + + parentRewardNavGraph( + paddingValues = paddingValues, + navigateUp = navigateUp, + ) + + parentMypageNavGraph( + paddingValues = paddingValues, + navigateUp = navigateUp, + ) } } From 79b66328a41ab3dfc58172312214856795699c32 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Tue, 24 Feb 2026 12:33:06 +0900 Subject: [PATCH 09/13] =?UTF-8?q?refactor/#85:=20preview=20theme=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parent/journey/ParentJourneyScreen.kt | 11 +++++++---- .../presentation/parent/mypage/ParentMypageScreen.kt | 11 +++++++---- .../presentation/parent/reward/ParentRewardScreen.kt | 11 +++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt b/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt index 2cbcb2c2..926c048d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt @@ -3,6 +3,7 @@ package com.kiero.presentation.parent.journey import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview +import com.kiero.core.designsystem.theme.KieroTheme @Composable fun ParentJourneyRoute( @@ -25,8 +26,10 @@ private fun ParentJourneyScreen( @Preview @Composable private fun ParentJourneyScreenPreview() { - ParentJourneyScreen( - paddingValues = PaddingValues(), - navigateUp = {} - ) + KieroTheme { + ParentJourneyScreen( + paddingValues = PaddingValues(), + navigateUp = {} + ) + } } \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt b/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt index 8f2db854..84bf5e85 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt @@ -3,6 +3,7 @@ package com.kiero.presentation.parent.mypage import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview +import com.kiero.core.designsystem.theme.KieroTheme @Composable fun ParentMypageRoute( @@ -25,8 +26,10 @@ private fun ParentMypageScreen( @Preview @Composable private fun ParentMypageScreenPreview() { - ParentMypageScreen( - paddingValues = PaddingValues(), - navigateUp = {} - ) + KieroTheme { + ParentMypageScreen( + paddingValues = PaddingValues(), + navigateUp = {} + ) + } } \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt b/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt index ac937979..512e2c2e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt @@ -3,6 +3,7 @@ package com.kiero.presentation.parent.reward import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview +import com.kiero.core.designsystem.theme.KieroTheme @Composable @@ -26,8 +27,10 @@ private fun ParentRewardScreen( @Preview @Composable private fun ParentRewardScreenPreview() { - ParentRewardScreen( - paddingValues = PaddingValues(), - navigateUp = {} - ) + KieroTheme{ + ParentRewardScreen( + paddingValues = PaddingValues(), + navigateUp = {} + ) + } } \ No newline at end of file From 3a406d272128d2eaa3d5c877691b8906985753a3 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Wed, 25 Feb 2026 09:28:25 +0900 Subject: [PATCH 10/13] =?UTF-8?q?refactor/#85:=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parent/plan/model/PlanContentModel.kt | 2 +- .../main/navigation/MainAppState.kt | 16 ++++++------ .../parent/component/ParentFloatingButton.kt | 2 +- .../datepicker/model/DownTimeStatus.kt | 8 ------ .../parent/navigation/ParentNavigation.kt | 18 ++++++------- .../{mission/component => screen}/.gitkeep | 0 .../alarm/component/ParentAlarmCard.kt | 2 +- .../alarm/component/ParentAlarmDateHeader.kt | 2 +- .../alarm/model/ParentAlarmUiModel.kt | 2 +- .../alarm/navigation/ParentAlarmNavigation.kt | 4 +-- .../alarm/screen/ParentAlarmScreen.kt | 12 ++++----- .../alarm/state/ParentAlarmContract.kt | 5 ++-- .../alarm/viewmodel/ParentAlarmViewModel.kt | 6 ++--- .../journey/ParentJourneyScreen.kt | 2 +- .../navigation/ParentJourneyNavigation.kt | 4 +-- .../{ => screen}/mission/MissionDateGroup.kt | 4 +-- .../mission/ParentAddMissionScreen.kt | 18 ++++++------- .../mission/ParentMissionScreen.kt | 10 ++++---- .../mission/auto/ParentAutoAddScreen.kt | 10 ++++---- .../mission/auto/ParentAutoLoadingScreen.kt | 2 +- .../mission/auto/ParentAutoResultScreen.kt | 16 ++++++------ .../auto/component/ParentAutoInputField.kt | 2 +- .../component/ParentAutoMissionAwardInfo.kt | 2 +- .../component/ParentAutoMissionAwardSelect.kt | 4 +-- .../component/ParentAutoMissionCalendar.kt | 2 +- .../component/ParentAutoMissionEditForm.kt | 4 +-- .../component/ParentAutoMissionNavigator.kt | 2 +- .../component/ParentAutoMissionTextField.kt | 2 +- .../component/ParentLocalKieroSnackbar.kt | 2 +- .../component/ScrollableAutoInputField.kt | 2 +- .../mission/auto/model/MissionUiModel.kt | 2 +- .../navigation/ParentAutoMissionNavigation.kt | 4 +-- .../mission/auto/state/AutoMissionContract.kt | 4 +-- .../auto/state/AutoMissionSideEffect.kt | 2 +- .../auto/viewmodel/AutoMissionViewModel.kt | 12 +++++---- .../parent/screen/mission/component/.gitkeep | 0 .../datepicker/component/BasicCalendar.kt | 12 ++++----- .../component/CalendarBottomSheet.kt | 6 ++--- .../component/CalendarMontHeader.kt | 2 +- .../component/datepicker/component/DayItem.kt | 10 ++++---- .../datepicker/component/DaysOfWeekTitle.kt | 4 +-- .../datepicker/component/KieroCalendar.kt | 10 ++++---- .../component/datepicker/model/CalendarDay.kt | 2 +- .../datepicker/model/CalendarDisplayMode.kt | 2 +- .../datepicker/model/CalendarMonth.kt | 2 +- .../component/datepicker/model/DayStatus.kt | 2 +- .../datepicker/model/DownTimeStatus.kt | 8 ++++++ .../datepicker/util/CalendarCalCulator.kt | 2 +- .../datepicker/util/DateExtenstions.kt | 2 +- .../component/datepicker/util/MonthData.kt | 8 +++--- .../missionadd/MissionAwardButton.kt | 4 +-- .../component/missionadd/MissionAwardInfo.kt | 2 +- .../component/missionadd/MissionTextField.kt | 2 +- .../component/missionmain/MissionCalendar.kt | 2 +- .../missionmain/MissionFabContent.kt | 2 +- .../component/missionmain/MissionListItem.kt | 2 +- .../component/model/MissionAwardModel.kt | 2 +- .../component/model/MissionListModel.kt | 2 +- .../navigation/MissionAddNavigation.kt | 4 +-- .../navigation/ParentMissionNavigation.kt | 4 +-- .../mission/state/ParentAddMissionState.kt | 2 +- .../mission/state/ParentMissionState.kt | 2 +- .../viewmodel/ParentAddMissionViewModel.kt | 10 ++++---- .../viewmodel/ParentMissionViewModel.kt | 6 ++--- .../{ => screen}/mypage/ParentMypageScreen.kt | 2 +- .../navigation/ParentMypageNavigation.kt | 4 +-- .../{ => screen}/reward/ParentRewardScreen.kt | 2 +- .../navigation/ParentRewardNavigation.kt | 4 +-- .../schedule/ParentScheduleScreen.kt | 10 ++++---- .../schedule/model/ScheduleData.kt | 4 ++- .../schedule/model/ScheduleModel.kt | 2 +- .../schedule/model/ScheduleTimeUtil.kt | 2 +- .../navigation/ParentScheduleNavigation.kt | 4 +-- .../schedule/plan/ParentAddPlanScreen.kt | 20 +++++++-------- .../schedule/plan/ParentPlanScreen.kt | 10 ++++---- .../plan/component/picker/ColorPicker.kt | 4 +-- .../plan/component/picker/PickerTopbar.kt | 2 +- .../plan/component/picker/TimePicker.kt | 2 +- .../component/picker/TimePickerConstatnt.kt | 2 +- .../plan/component/plan/ScheduleBlock.kt | 6 ++--- .../plan/component/plan/ScheduleDatebar.kt | 2 +- .../plan/component/plan/SchedulePlanner.kt | 25 ++++++++++++++----- .../plan/component/plan/ScheduleTimeColumn.kt | 2 +- .../plan/component/plan/ScheduleWeekTopbar.kt | 2 +- .../plan/component/select/ColorSelectArea.kt | 4 +-- .../component/select/ScheduleTextField.kt | 2 +- .../plan/component/select/TimeSelectArea.kt | 4 +-- .../plan/component/select/WeekSelectArea.kt | 2 +- .../schedule/plan/model/PlanModel.kt | 4 +-- .../plan/navigation/ScheduleAddNavigation.kt | 4 +-- .../schedule/plan/state/PlanScheduleState.kt | 17 +++++++------ .../schedule/plan/state/PlanState.kt | 6 ++--- .../plan/viewmodel/ParentPlanViewModel.kt | 10 ++++---- .../viewmodel/ParentScheduleViewModel.kt | 4 +-- 94 files changed, 247 insertions(+), 230 deletions(-) delete mode 100644 app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt rename app/src/main/java/com/kiero/presentation/parent/{mission/component => screen}/.gitkeep (100%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/alarm/component/ParentAlarmCard.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/alarm/component/ParentAlarmDateHeader.kt (92%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/alarm/model/ParentAlarmUiModel.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/alarm/navigation/ParentAlarmNavigation.kt (84%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/alarm/screen/ParentAlarmScreen.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/alarm/state/ParentAlarmContract.kt (95%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/alarm/viewmodel/ParentAlarmViewModel.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/journey/ParentJourneyScreen.kt (93%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/journey/navigation/ParentJourneyNavigation.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/MissionDateGroup.kt (86%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/ParentAddMissionScreen.kt (87%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/ParentMissionScreen.kt (91%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/ParentAutoAddScreen.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/ParentAutoLoadingScreen.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/ParentAutoResultScreen.kt (92%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentAutoInputField.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentAutoMissionAwardInfo.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentAutoMissionAwardSelect.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentAutoMissionCalendar.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentAutoMissionEditForm.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentAutoMissionNavigator.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentAutoMissionTextField.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ParentLocalKieroSnackbar.kt (93%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/component/ScrollableAutoInputField.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/model/MissionUiModel.kt (74%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/navigation/ParentAutoMissionNavigation.kt (84%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/state/AutoMissionContract.kt (90%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/state/AutoMissionSideEffect.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/auto/viewmodel/AutoMissionViewModel.kt (96%) create mode 100644 app/src/main/java/com/kiero/presentation/parent/screen/mission/component/.gitkeep rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/component/BasicCalendar.kt (81%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/component/CalendarBottomSheet.kt (91%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/component/CalendarMontHeader.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/component/DayItem.kt (91%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/component/DaysOfWeekTitle.kt (92%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/component/KieroCalendar.kt (82%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/model/CalendarDay.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/model/CalendarDisplayMode.kt (91%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/model/CalendarMonth.kt (75%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/model/DayStatus.kt (76%) create mode 100644 app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/DownTimeStatus.kt rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/util/CalendarCalCulator.kt (56%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/util/DateExtenstions.kt (90%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/datepicker/util/MonthData.kt (81%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/missionadd/MissionAwardButton.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/missionadd/MissionAwardInfo.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/missionadd/MissionTextField.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/missionmain/MissionCalendar.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/missionmain/MissionFabContent.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/missionmain/MissionListItem.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/model/MissionAwardModel.kt (90%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/component/model/MissionListModel.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/navigation/MissionAddNavigation.kt (84%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/navigation/ParentMissionNavigation.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/state/ParentAddMissionState.kt (92%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/state/ParentMissionState.kt (86%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/viewmodel/ParentAddMissionViewModel.kt (95%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mission/viewmodel/ParentMissionViewModel.kt (88%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mypage/ParentMypageScreen.kt (93%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/mypage/navigation/ParentMypageNavigation.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/reward/ParentRewardScreen.kt (93%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/reward/navigation/ParentRewardNavigation.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/ParentScheduleScreen.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/model/ScheduleData.kt (93%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/model/ScheduleModel.kt (87%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/model/ScheduleTimeUtil.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/navigation/ParentScheduleNavigation.kt (87%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/ParentAddPlanScreen.kt (87%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/ParentPlanScreen.kt (89%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/picker/ColorPicker.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/picker/PickerTopbar.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/picker/TimePicker.kt (99%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/picker/TimePickerConstatnt.kt (88%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/plan/ScheduleBlock.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/plan/ScheduleDatebar.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/plan/SchedulePlanner.kt (83%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/plan/ScheduleTimeColumn.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/plan/ScheduleWeekTopbar.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/select/ColorSelectArea.kt (94%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/select/ScheduleTextField.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/select/TimeSelectArea.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/component/select/WeekSelectArea.kt (98%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/model/PlanModel.kt (97%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/navigation/ScheduleAddNavigation.kt (86%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/state/PlanScheduleState.kt (82%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/state/PlanState.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/plan/viewmodel/ParentPlanViewModel.kt (96%) rename app/src/main/java/com/kiero/presentation/parent/{ => screen}/schedule/viewmodel/ParentScheduleViewModel.kt (98%) diff --git a/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt b/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt index 675264c3..0472e209 100644 --- a/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt +++ b/app/src/main/java/com/kiero/data/parent/plan/model/PlanContentModel.kt @@ -4,7 +4,7 @@ import NormalScheduleDto import PlanAllResponseDto import RecurringScheduleDto import com.kiero.data.parent.plan.remote.dto.response.PlanColorResponseDto -import com.kiero.presentation.parent.schedule.model.ScheduleEvent +import com.kiero.presentation.parent.screen.schedule.model.ScheduleEvent data class PlanColorModel( val scheduleColor : String, diff --git a/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt b/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt index fbeac03b..7d080a8c 100644 --- a/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt +++ b/app/src/main/java/com/kiero/presentation/main/navigation/MainAppState.kt @@ -25,20 +25,20 @@ import com.kiero.presentation.kid.navigation.Mission import com.kiero.presentation.kid.navigation.Wish import com.kiero.presentation.kid.onboarding.navigation.navigateToKidOnboarding import com.kiero.presentation.kid.wish.navigation.navigateToWish -import com.kiero.presentation.parent.alarm.navigation.navigateToAlarm -import com.kiero.presentation.parent.journey.navigation.navigateToParentJourney -import com.kiero.presentation.parent.mission.navigation.navigateToMissionAdd -import com.kiero.presentation.parent.mission.navigation.navigateToParentMission -import com.kiero.presentation.parent.mypage.navigation.navigateToMypage +import com.kiero.presentation.parent.screen.alarm.navigation.navigateToAlarm +import com.kiero.presentation.parent.screen.journey.navigation.navigateToParentJourney +import com.kiero.presentation.parent.screen.mypage.navigation.navigateToMypage import com.kiero.presentation.parent.navigation.Mypage import com.kiero.presentation.parent.navigation.ParentGraph import com.kiero.presentation.parent.navigation.ParentJourney import com.kiero.presentation.parent.navigation.ParentMission import com.kiero.presentation.parent.navigation.Reward import com.kiero.presentation.parent.navigation.Schedule -import com.kiero.presentation.parent.reward.navigation.navigateToReward -import com.kiero.presentation.parent.schedule.navigation.navigateToSchedule -import com.kiero.presentation.parent.schedule.plan.navigation.navigateToScheduleAdd +import com.kiero.presentation.parent.screen.mission.navigation.navigateToMissionAdd +import com.kiero.presentation.parent.screen.mission.navigation.navigateToParentMission +import com.kiero.presentation.parent.screen.reward.navigation.navigateToReward +import com.kiero.presentation.parent.screen.schedule.navigation.navigateToSchedule +import com.kiero.presentation.parent.screen.schedule.plan.navigation.navigateToScheduleAdd import com.kiero.presentation.signup.parent.navigation.navigateToParentSignUp import com.kiero.presentation.splash.navigation.Splash import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt b/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt index 9b6fd9f8..65a812c1 100644 --- a/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt +++ b/app/src/main/java/com/kiero/presentation/parent/component/ParentFloatingButton.kt @@ -30,7 +30,7 @@ import androidx.compose.ui.window.PopupProperties import androidx.compose.ui.zIndex import com.kiero.R import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.missionmain.MissionFabContent +import com.kiero.presentation.parent.screen.mission.component.missionmain.MissionFabContent @Composable fun ParentFloatingButton( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt b/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt deleted file mode 100644 index ff269ae0..00000000 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DownTimeStatus.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.kiero.presentation.parent.mission.component.datepicker.model - - -enum class DateState { - PAST, - TODAY, - FUTURE -} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt index 5b50b9aa..0c0e9333 100644 --- a/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/navigation/ParentNavigation.kt @@ -7,15 +7,15 @@ import androidx.navigation.NavHostController import androidx.navigation.NavOptions import androidx.navigation.compose.navigation import com.kiero.core.navigation.Route -import com.kiero.presentation.parent.alarm.navigation.parentAlarmNavGraph -import com.kiero.presentation.parent.journey.navigation.parentJourneyNavGraph -import com.kiero.presentation.parent.mission.auto.navigation.parentAutoMissionAddNavGraph -import com.kiero.presentation.parent.mission.navigation.parentMissionAddNavGraph -import com.kiero.presentation.parent.mypage.navigation.parentMypageNavGraph -import com.kiero.presentation.parent.reward.navigation.parentRewardNavGraph -import com.kiero.presentation.parent.schedule.navigation.parentScheduleNavGraph -import com.kiero.presentation.parent.schedule.plan.navigation.navigateToScheduleAdd -import com.kiero.presentation.parent.schedule.plan.navigation.parentScheduleAddNavGraph +import com.kiero.presentation.parent.screen.alarm.navigation.parentAlarmNavGraph +import com.kiero.presentation.parent.screen.journey.navigation.parentJourneyNavGraph +import com.kiero.presentation.parent.screen.mission.auto.navigation.parentAutoMissionAddNavGraph +import com.kiero.presentation.parent.screen.mission.navigation.parentMissionAddNavGraph +import com.kiero.presentation.parent.screen.mypage.navigation.parentMypageNavGraph +import com.kiero.presentation.parent.screen.reward.navigation.parentRewardNavGraph +import com.kiero.presentation.parent.screen.schedule.navigation.parentScheduleNavGraph +import com.kiero.presentation.parent.screen.schedule.plan.navigation.navigateToScheduleAdd +import com.kiero.presentation.parent.screen.schedule.plan.navigation.parentScheduleAddNavGraph import kotlinx.serialization.Serializable sealed interface ParentTab : Route diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/.gitkeep b/app/src/main/java/com/kiero/presentation/parent/screen/.gitkeep similarity index 100% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/.gitkeep rename to app/src/main/java/com/kiero/presentation/parent/screen/.gitkeep diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/component/ParentAlarmCard.kt b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/component/ParentAlarmCard.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/alarm/component/ParentAlarmCard.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/alarm/component/ParentAlarmCard.kt index e3412d1d..0f5f7b26 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/component/ParentAlarmCard.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/component/ParentAlarmCard.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.alarm.component +package com.kiero.presentation.parent.screen.alarm.component import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/component/ParentAlarmDateHeader.kt b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/component/ParentAlarmDateHeader.kt similarity index 92% rename from app/src/main/java/com/kiero/presentation/parent/alarm/component/ParentAlarmDateHeader.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/alarm/component/ParentAlarmDateHeader.kt index cbf07a91..61d9f667 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/component/ParentAlarmDateHeader.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/component/ParentAlarmDateHeader.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.alarm.component +package com.kiero.presentation.parent.screen.alarm.component import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/model/ParentAlarmUiModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/model/ParentAlarmUiModel.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/alarm/model/ParentAlarmUiModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/alarm/model/ParentAlarmUiModel.kt index 30c0c5ed..f85a924f 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/model/ParentAlarmUiModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/model/ParentAlarmUiModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.alarm.model +package com.kiero.presentation.parent.screen.alarm.model import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/navigation/ParentAlarmNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/navigation/ParentAlarmNavigation.kt similarity index 84% rename from app/src/main/java/com/kiero/presentation/parent/alarm/navigation/ParentAlarmNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/alarm/navigation/ParentAlarmNavigation.kt index 899f028d..d403f397 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/navigation/ParentAlarmNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/navigation/ParentAlarmNavigation.kt @@ -1,11 +1,11 @@ -package com.kiero.presentation.parent.alarm.navigation +package com.kiero.presentation.parent.screen.alarm.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import com.kiero.presentation.parent.alarm.screen.ParentAlarmRoute +import com.kiero.presentation.parent.screen.alarm.screen.ParentAlarmRoute import com.kiero.presentation.parent.navigation.Alarm fun NavController.navigateToAlarm( diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/screen/ParentAlarmScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/screen/ParentAlarmScreen.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/alarm/screen/ParentAlarmScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/alarm/screen/ParentAlarmScreen.kt index 8c0e8cae..5202fab8 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/screen/ParentAlarmScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/screen/ParentAlarmScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.alarm.screen +package com.kiero.presentation.parent.screen.alarm.screen import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -40,11 +40,11 @@ import com.kiero.core.designsystem.component.indicator.KieroLoadingIndicator import com.kiero.core.designsystem.component.pulltorefresh.KieroPullToRefresh import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.trigger.LocalRefreshState -import com.kiero.presentation.parent.alarm.component.ParentAlarmCard -import com.kiero.presentation.parent.alarm.component.ParentAlarmDateHeader -import com.kiero.presentation.parent.alarm.model.ParentAlarmUiModel -import com.kiero.presentation.parent.alarm.state.AlarmFeedState -import com.kiero.presentation.parent.alarm.viewmodel.ParentAlarmViewModel +import com.kiero.presentation.parent.screen.alarm.component.ParentAlarmCard +import com.kiero.presentation.parent.screen.alarm.component.ParentAlarmDateHeader +import com.kiero.presentation.parent.screen.alarm.model.ParentAlarmUiModel +import com.kiero.presentation.parent.screen.alarm.state.AlarmFeedState +import com.kiero.presentation.parent.screen.alarm.viewmodel.ParentAlarmViewModel import com.kiero.presentation.parent.component.ParentUserSection import com.kiero.presentation.signup.parent.state.ParentSignUpSideEffect import com.kiero.presentation.signup.parent.state.ParentSignUpState diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/state/ParentAlarmContract.kt b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/state/ParentAlarmContract.kt similarity index 95% rename from app/src/main/java/com/kiero/presentation/parent/alarm/state/ParentAlarmContract.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/alarm/state/ParentAlarmContract.kt index df82496f..9e223134 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/state/ParentAlarmContract.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/state/ParentAlarmContract.kt @@ -1,10 +1,9 @@ -package com.kiero.presentation.parent.alarm.state +package com.kiero.presentation.parent.screen.alarm.state import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color -import com.kiero.R -import com.kiero.presentation.parent.alarm.model.ParentAlarmUiModel +import com.kiero.presentation.parent.screen.alarm.model.ParentAlarmUiModel import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/app/src/main/java/com/kiero/presentation/parent/alarm/viewmodel/ParentAlarmViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/viewmodel/ParentAlarmViewModel.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/alarm/viewmodel/ParentAlarmViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/alarm/viewmodel/ParentAlarmViewModel.kt index 746d0740..f2992874 100644 --- a/app/src/main/java/com/kiero/presentation/parent/alarm/viewmodel/ParentAlarmViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/alarm/viewmodel/ParentAlarmViewModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.alarm.viewmodel +package com.kiero.presentation.parent.screen.alarm.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -9,8 +9,8 @@ import com.kiero.core.localstorage.info.UserInfoManager import com.kiero.data.parent.alarm.repository.AlarmRepository import com.kiero.data.auth.repository.AuthRepository import com.kiero.data.sse.manager.SseManager -import com.kiero.presentation.parent.alarm.model.toUiModel -import com.kiero.presentation.parent.alarm.state.AlarmFeedState +import com.kiero.presentation.parent.screen.alarm.model.toUiModel +import com.kiero.presentation.parent.screen.alarm.state.AlarmFeedState import com.kiero.presentation.signup.parent.state.ParentSignUpSideEffect import com.kiero.presentation.signup.parent.state.ParentSignUpState import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/journey/ParentJourneyScreen.kt similarity index 93% rename from app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/journey/ParentJourneyScreen.kt index 926c048d..682c8587 100644 --- a/app/src/main/java/com/kiero/presentation/parent/journey/ParentJourneyScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/journey/ParentJourneyScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.journey +package com.kiero.presentation.parent.screen.journey import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/journey/navigation/ParentJourneyNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/journey/navigation/ParentJourneyNavigation.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/journey/navigation/ParentJourneyNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/journey/navigation/ParentJourneyNavigation.kt index 47655acf..9e5147fc 100644 --- a/app/src/main/java/com/kiero/presentation/parent/journey/navigation/ParentJourneyNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/journey/navigation/ParentJourneyNavigation.kt @@ -1,11 +1,11 @@ -package com.kiero.presentation.parent.journey.navigation +package com.kiero.presentation.parent.screen.journey.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import com.kiero.presentation.parent.journey.ParentJourneyRoute +import com.kiero.presentation.parent.screen.journey.ParentJourneyRoute import com.kiero.presentation.parent.navigation.ParentJourney fun NavController.navigateToParentJourney( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/MissionDateGroup.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/MissionDateGroup.kt similarity index 86% rename from app/src/main/java/com/kiero/presentation/parent/mission/MissionDateGroup.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/MissionDateGroup.kt index 529c0159..8e38002e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/MissionDateGroup.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/MissionDateGroup.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission +package com.kiero.presentation.parent.screen.mission import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -8,7 +8,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.presentation.kid.mission.model.KidMissionListUiModel -import com.kiero.presentation.parent.mission.component.missionmain.MissionListItem +import com.kiero.presentation.parent.screen.mission.component.missionmain.MissionListItem @Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/ParentAddMissionScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/ParentAddMissionScreen.kt similarity index 87% rename from app/src/main/java/com/kiero/presentation/parent/mission/ParentAddMissionScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/ParentAddMissionScreen.kt index 9304f2f3..e1a7c97d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/ParentAddMissionScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/ParentAddMissionScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission +package com.kiero.presentation.parent.screen.mission import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -28,14 +28,14 @@ import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.model.UiState import com.kiero.core.model.trigger.SnackbarState import com.kiero.core.trigger.LocalGlobalUiEventTrigger -import com.kiero.presentation.parent.mission.component.datepicker.component.CalendarBottomSheet -import com.kiero.presentation.parent.mission.component.missionadd.MissionAwardInfo -import com.kiero.presentation.parent.mission.component.missionadd.MissionAwardSelect -import com.kiero.presentation.parent.mission.component.missionmain.MissionCalendar -import com.kiero.presentation.parent.mission.state.ParentAddMissionSideEffect -import com.kiero.presentation.parent.mission.state.ParentAddMissionState -import com.kiero.presentation.parent.mission.viewmodel.ParentAddMissionViewModel -import com.kiero.presentation.parent.schedule.plan.component.select.ScheduleTextField +import com.kiero.presentation.parent.screen.mission.component.datepicker.component.CalendarBottomSheet +import com.kiero.presentation.parent.screen.mission.component.missionadd.MissionAwardInfo +import com.kiero.presentation.parent.screen.mission.component.missionadd.MissionAwardSelect +import com.kiero.presentation.parent.screen.mission.component.missionmain.MissionCalendar +import com.kiero.presentation.parent.screen.mission.state.ParentAddMissionSideEffect +import com.kiero.presentation.parent.screen.mission.state.ParentAddMissionState +import com.kiero.presentation.parent.screen.mission.viewmodel.ParentAddMissionViewModel +import com.kiero.presentation.parent.screen.schedule.plan.component.select.ScheduleTextField @Composable fun ParentAddMissionRoute( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/ParentMissionScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/ParentMissionScreen.kt similarity index 91% rename from app/src/main/java/com/kiero/presentation/parent/mission/ParentMissionScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/ParentMissionScreen.kt index 7ed8fdf4..03a160d1 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/ParentMissionScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/ParentMissionScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission +package com.kiero.presentation.parent.screen.mission import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -28,10 +28,10 @@ import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.model.UiState import com.kiero.core.trigger.LocalRefreshState import com.kiero.presentation.main.navigation.ParentMainTab -import com.kiero.presentation.parent.mission.component.missionmain.MissionInfo -import com.kiero.presentation.parent.mission.component.missionmain.MissionListItem -import com.kiero.presentation.parent.mission.state.ParentMissionState -import com.kiero.presentation.parent.mission.viewmodel.ParentMissionViewModel +import com.kiero.presentation.parent.screen.mission.component.missionmain.MissionInfo +import com.kiero.presentation.parent.screen.mission.component.missionmain.MissionListItem +import com.kiero.presentation.parent.screen.mission.state.ParentMissionState +import com.kiero.presentation.parent.screen.mission.viewmodel.ParentMissionViewModel @Composable fun ParentMissionRoute( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoAddScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoAddScreen.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoAddScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoAddScreen.kt index e146003b..2afa1e4b 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoAddScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoAddScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto +package com.kiero.presentation.parent.screen.mission.auto import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures @@ -33,10 +33,10 @@ import com.kiero.core.designsystem.component.KieroTopbar import com.kiero.core.designsystem.component.button.KieroButtonMedium import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.trigger.LocalGlobalUiEventTrigger -import com.kiero.presentation.parent.mission.auto.component.ScrollableAutoInputField -import com.kiero.presentation.parent.mission.auto.state.AutoMissionSideEffect -import com.kiero.presentation.parent.mission.auto.state.AutoMissionState -import com.kiero.presentation.parent.mission.auto.viewmodel.AutoMissionViewModel +import com.kiero.presentation.parent.screen.mission.auto.component.ScrollableAutoInputField +import com.kiero.presentation.parent.screen.mission.auto.state.AutoMissionSideEffect +import com.kiero.presentation.parent.screen.mission.auto.state.AutoMissionState +import com.kiero.presentation.parent.screen.mission.auto.viewmodel.AutoMissionViewModel import timber.log.Timber @Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoLoadingScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoLoadingScreen.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoLoadingScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoLoadingScreen.kt index 8089e5dc..6c586b39 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoLoadingScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoLoadingScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto +package com.kiero.presentation.parent.screen.mission.auto import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoResultScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoResultScreen.kt similarity index 92% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoResultScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoResultScreen.kt index 45d6f0a0..28fb4c93 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/ParentAutoResultScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/ParentAutoResultScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto +package com.kiero.presentation.parent.screen.mission.auto import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures @@ -28,13 +28,13 @@ import com.kiero.R import com.kiero.core.designsystem.component.KieroTopbar import com.kiero.core.designsystem.component.button.KieroButtonMedium import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.auto.component.ParentAutoMissionEditForm -import com.kiero.presentation.parent.mission.auto.component.ParentMissionNavigator -import com.kiero.presentation.parent.mission.auto.model.MissionUiModel -import com.kiero.presentation.parent.mission.auto.state.AutoMissionSideEffect -import com.kiero.presentation.parent.mission.auto.state.AutoMissionState -import com.kiero.presentation.parent.mission.auto.viewmodel.AutoMissionViewModel -import com.kiero.presentation.parent.mission.component.datepicker.component.CalendarBottomSheet +import com.kiero.presentation.parent.screen.mission.auto.component.ParentAutoMissionEditForm +import com.kiero.presentation.parent.screen.mission.auto.component.ParentMissionNavigator +import com.kiero.presentation.parent.screen.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.screen.mission.auto.state.AutoMissionSideEffect +import com.kiero.presentation.parent.screen.mission.auto.state.AutoMissionState +import com.kiero.presentation.parent.screen.mission.auto.viewmodel.AutoMissionViewModel +import com.kiero.presentation.parent.screen.mission.component.datepicker.component.CalendarBottomSheet import timber.log.Timber import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoInputField.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoInputField.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoInputField.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoInputField.kt index bd451dab..c3855401 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoInputField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoInputField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.shape.RoundedCornerShape diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardInfo.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionAwardInfo.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardInfo.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionAwardInfo.kt index 66326b30..b25421a3 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardInfo.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionAwardInfo.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.Image import androidx.compose.foundation.background diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardSelect.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionAwardSelect.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardSelect.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionAwardSelect.kt index 0bc8becb..bfa55bae 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionAwardSelect.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionAwardSelect.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.screen.mission.component.model.MissionAwardDefaults @Composable fun ParentAutoMissionAwardSelect( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionCalendar.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionCalendar.kt index 69f73a57..1a8181e8 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionEditForm.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionEditForm.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionEditForm.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionEditForm.kt index 870526b1..8d39d9b5 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionEditForm.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionEditForm.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -24,7 +24,7 @@ import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.screen.mission.auto.model.MissionUiModel import java.time.LocalDate import java.time.format.DateTimeFormatter import java.util.Locale diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionNavigator.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionNavigator.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionNavigator.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionNavigator.kt index c5f99338..af6b990d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionNavigator.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionNavigator.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionTextField.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionTextField.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionTextField.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionTextField.kt index c12ca556..fb609f47 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentAutoMissionTextField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentAutoMissionTextField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentLocalKieroSnackbar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentLocalKieroSnackbar.kt similarity index 93% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentLocalKieroSnackbar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentLocalKieroSnackbar.kt index 5c740350..581b3a8d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ParentLocalKieroSnackbar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ParentLocalKieroSnackbar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ScrollableAutoInputField.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ScrollableAutoInputField.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ScrollableAutoInputField.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ScrollableAutoInputField.kt index 694bc1aa..1afa7529 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/component/ScrollableAutoInputField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/component/ScrollableAutoInputField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.component +package com.kiero.presentation.parent.screen.mission.auto.component import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.BoxWithConstraints diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/model/MissionUiModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/model/MissionUiModel.kt similarity index 74% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/model/MissionUiModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/model/MissionUiModel.kt index a339957e..0e1faba8 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/model/MissionUiModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/model/MissionUiModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.model +package com.kiero.presentation.parent.screen.mission.auto.model import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/navigation/ParentAutoMissionNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/navigation/ParentAutoMissionNavigation.kt similarity index 84% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/navigation/ParentAutoMissionNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/navigation/ParentAutoMissionNavigation.kt index 6a956b3c..5dec9649 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/navigation/ParentAutoMissionNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/navigation/ParentAutoMissionNavigation.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.navigation +package com.kiero.presentation.parent.screen.mission.auto.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.kiero.core.navigation.Route -import com.kiero.presentation.parent.mission.auto.ParentAutoAddRoute +import com.kiero.presentation.parent.screen.mission.auto.ParentAutoAddRoute import kotlinx.serialization.Serializable fun NavController.navigateToAutoMissionAdd( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionContract.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/state/AutoMissionContract.kt similarity index 90% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionContract.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/state/AutoMissionContract.kt index fb9cc556..14100ac0 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionContract.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/state/AutoMissionContract.kt @@ -1,7 +1,7 @@ -package com.kiero.presentation.parent.mission.auto.state +package com.kiero.presentation.parent.screen.mission.auto.state import androidx.compose.runtime.Immutable -import com.kiero.presentation.parent.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.screen.mission.auto.model.MissionUiModel import java.time.LocalDate import java.time.format.DateTimeFormatter import java.util.Locale diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionSideEffect.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/state/AutoMissionSideEffect.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionSideEffect.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/state/AutoMissionSideEffect.kt index 716386fb..5bb8f577 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/state/AutoMissionSideEffect.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/state/AutoMissionSideEffect.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.state +package com.kiero.presentation.parent.screen.mission.auto.state sealed interface AutoMissionSideEffect { data class ShowToast(val message: String) : AutoMissionSideEffect diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/auto/viewmodel/AutoMissionViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/viewmodel/AutoMissionViewModel.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/auto/viewmodel/AutoMissionViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/viewmodel/AutoMissionViewModel.kt index dbb3d270..004f5eb3 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/auto/viewmodel/AutoMissionViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/auto/viewmodel/AutoMissionViewModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.auto.viewmodel +package com.kiero.presentation.parent.screen.mission.auto.viewmodel import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.snapshotFlow @@ -7,10 +7,10 @@ import androidx.lifecycle.viewModelScope import com.kiero.core.localstorage.info.UserInfoManager import com.kiero.data.parent.mission.model.SuggestedMissionModel import com.kiero.data.parent.mission.repository.AutoMissionRepository -import com.kiero.presentation.parent.mission.auto.model.MissionUiModel -import com.kiero.presentation.parent.mission.auto.state.AutoMissionSideEffect -import com.kiero.presentation.parent.mission.auto.state.AutoMissionState -import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.screen.mission.auto.model.MissionUiModel +import com.kiero.presentation.parent.screen.mission.auto.state.AutoMissionSideEffect +import com.kiero.presentation.parent.screen.mission.auto.state.AutoMissionState +import com.kiero.presentation.parent.screen.mission.component.model.MissionAwardDefaults import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay @@ -25,6 +25,8 @@ import kotlinx.coroutines.launch import timber.log.Timber import java.time.LocalDate import javax.inject.Inject +import kotlin.collections.indexOfFirst +import kotlin.collections.toMutableList @HiltViewModel class AutoMissionViewModel @Inject constructor( diff --git a/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/.gitkeep b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/BasicCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/BasicCalendar.kt similarity index 81% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/BasicCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/BasicCalendar.kt index 98f273a9..f482a9dd 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/BasicCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/BasicCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.component +package com.kiero.presentation.parent.screen.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -12,11 +12,11 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarMonth -import com.kiero.presentation.parent.mission.component.datepicker.util.daysOfWeek -import com.kiero.presentation.parent.mission.component.datepicker.util.generateMonthData +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarMonth +import com.kiero.presentation.parent.screen.mission.component.datepicker.util.daysOfWeek +import com.kiero.presentation.parent.screen.mission.component.datepicker.util.generateMonthData import kotlinx.collections.immutable.toImmutableList import java.time.DayOfWeek import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarBottomSheet.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/CalendarBottomSheet.kt similarity index 91% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarBottomSheet.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/CalendarBottomSheet.kt index dfb75964..47a15832 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarBottomSheet.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/CalendarBottomSheet.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.component +package com.kiero.presentation.parent.screen.mission.component.datepicker.component import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Column @@ -19,8 +19,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.R import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode -import com.kiero.presentation.parent.schedule.plan.component.picker.PickerTopbar +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.screen.schedule.plan.component.picker.PickerTopbar import java.time.LocalDate import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarMontHeader.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/CalendarMontHeader.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarMontHeader.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/CalendarMontHeader.kt index 2e5b9aed..c50a9dab 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/CalendarMontHeader.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/CalendarMontHeader.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.component +package com.kiero.presentation.parent.screen.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DayItem.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/DayItem.kt similarity index 91% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DayItem.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/DayItem.kt index 8a1b66b1..c5a59003 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DayItem.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/DayItem.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.component +package com.kiero.presentation.parent.screen.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -20,10 +20,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.mission.component.datepicker.model.DateState -import com.kiero.presentation.parent.mission.component.datepicker.model.DateTextStyle -import com.kiero.presentation.parent.mission.component.datepicker.model.getDateState +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.DateState +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.DateTextStyle +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.getDateState import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DaysOfWeekTitle.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/DaysOfWeekTitle.kt similarity index 92% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DaysOfWeekTitle.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/DaysOfWeekTitle.kt index 6c65fecb..23971121 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/DaysOfWeekTitle.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/DaysOfWeekTitle.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.component +package com.kiero.presentation.parent.screen.mission.component.datepicker.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.datepicker.util.daysOfWeek +import com.kiero.presentation.parent.screen.mission.component.datepicker.util.daysOfWeek import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import java.time.DayOfWeek diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/KieroCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/KieroCalendar.kt similarity index 82% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/KieroCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/KieroCalendar.kt index d4a626d0..b407ea5f 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/component/KieroCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/component/KieroCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.component +package com.kiero.presentation.parent.screen.mission.component.datepicker.component import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable @@ -9,10 +9,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode -import com.kiero.presentation.parent.mission.component.datepicker.util.nextMonth -import com.kiero.presentation.parent.mission.component.datepicker.util.previousMonth +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.screen.mission.component.datepicker.util.nextMonth +import com.kiero.presentation.parent.screen.mission.component.datepicker.util.previousMonth import java.time.LocalDate import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDay.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarDay.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDay.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarDay.kt index 8eed69ff..13695e8e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDay.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarDay.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.model +package com.kiero.presentation.parent.screen.mission.component.datepicker.model import androidx.compose.runtime.Immutable import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDisplayMode.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarDisplayMode.kt similarity index 91% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDisplayMode.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarDisplayMode.kt index 9d1f364c..43b45d8e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarDisplayMode.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarDisplayMode.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.model +package com.kiero.presentation.parent.screen.mission.component.datepicker.model import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarMonth.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarMonth.kt similarity index 75% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarMonth.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarMonth.kt index f6a3732d..72b45319 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/CalendarMonth.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/CalendarMonth.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.model +package com.kiero.presentation.parent.screen.mission.component.datepicker.model import androidx.compose.runtime.Immutable import kotlinx.collections.immutable.ImmutableList diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DayStatus.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/DayStatus.kt similarity index 76% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DayStatus.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/DayStatus.kt index 0089fbce..e9939b20 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/model/DayStatus.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/DayStatus.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.model +package com.kiero.presentation.parent.screen.mission.component.datepicker.model import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/DownTimeStatus.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/DownTimeStatus.kt new file mode 100644 index 00000000..e58311fb --- /dev/null +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/model/DownTimeStatus.kt @@ -0,0 +1,8 @@ +package com.kiero.presentation.parent.screen.mission.component.datepicker.model + + +enum class DateState { + PAST, + TODAY, + FUTURE +} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/CalendarCalCulator.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/CalendarCalCulator.kt similarity index 56% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/CalendarCalCulator.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/CalendarCalCulator.kt index cbb1cec9..88f0e9e3 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/CalendarCalCulator.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/CalendarCalCulator.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.util +package com.kiero.presentation.parent.screen.mission.component.datepicker.util import java.time.DayOfWeek diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/DateExtenstions.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/DateExtenstions.kt similarity index 90% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/DateExtenstions.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/DateExtenstions.kt index cb465d13..47de7d9d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/DateExtenstions.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/DateExtenstions.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.datepicker.util +package com.kiero.presentation.parent.screen.mission.component.datepicker.util import java.time.DayOfWeek import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/MonthData.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/MonthData.kt similarity index 81% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/MonthData.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/MonthData.kt index 569ae356..fcfed4db 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/datepicker/util/MonthData.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/datepicker/util/MonthData.kt @@ -1,8 +1,8 @@ -package com.kiero.presentation.parent.mission.component.datepicker.util +package com.kiero.presentation.parent.screen.mission.component.datepicker.util -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDay -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarDisplayMode -import com.kiero.presentation.parent.mission.component.datepicker.model.CalendarMonth +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDay +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarDisplayMode +import com.kiero.presentation.parent.screen.mission.component.datepicker.model.CalendarMonth import kotlinx.collections.immutable.toImmutableList import java.time.DayOfWeek import java.time.YearMonth diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardButton.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionAwardButton.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardButton.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionAwardButton.kt index 96b763bf..96059a2a 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardButton.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionAwardButton.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.missionadd +package com.kiero.presentation.parent.screen.mission.component.missionadd import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.screen.mission.component.model.MissionAwardDefaults @Composable fun MissionAwardSelect( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardInfo.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionAwardInfo.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardInfo.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionAwardInfo.kt index 98a27a3b..e258ed6c 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionAwardInfo.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionAwardInfo.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.missionadd +package com.kiero.presentation.parent.screen.mission.component.missionadd import androidx.compose.foundation.Image import androidx.compose.foundation.background diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionTextField.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionTextField.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionTextField.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionTextField.kt index 7d6213e6..4984315e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionadd/MissionTextField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionadd/MissionTextField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.missionadd +package com.kiero.presentation.parent.screen.mission.component.missionadd import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionCalendar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionCalendar.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionCalendar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionCalendar.kt index 9627dee4..19bb2e05 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionCalendar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionCalendar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.missionmain +package com.kiero.presentation.parent.screen.mission.component.missionmain import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionFabContent.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionFabContent.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionFabContent.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionFabContent.kt index c7f81f13..8d8def05 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionFabContent.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionFabContent.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.missionmain +package com.kiero.presentation.parent.screen.mission.component.missionmain import androidx.annotation.DrawableRes import androidx.compose.foundation.background diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionListItem.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionListItem.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionListItem.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionListItem.kt index f23ccc11..3b025af3 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/missionmain/MissionListItem.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/missionmain/MissionListItem.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.missionmain +package com.kiero.presentation.parent.screen.mission.component.missionmain import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionAwardModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/model/MissionAwardModel.kt similarity index 90% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionAwardModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/model/MissionAwardModel.kt index 3b573d9d..3378405e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionAwardModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/model/MissionAwardModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.model +package com.kiero.presentation.parent.screen.mission.component.model data class MissionAwardValue( val value: Int diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionListModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/model/MissionListModel.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionListModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/component/model/MissionListModel.kt index dc1bd589..09b80a95 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/component/model/MissionListModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/component/model/MissionListModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.component.model +package com.kiero.presentation.parent.screen.mission.component.model import androidx.compose.runtime.Immutable import com.kiero.data.parent.mission.model.MissionByDateModel diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/navigation/MissionAddNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/navigation/MissionAddNavigation.kt similarity index 84% rename from app/src/main/java/com/kiero/presentation/parent/mission/navigation/MissionAddNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/navigation/MissionAddNavigation.kt index d92d7df9..05b34573 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/navigation/MissionAddNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/navigation/MissionAddNavigation.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.navigation +package com.kiero.presentation.parent.screen.mission.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.kiero.core.navigation.Route -import com.kiero.presentation.parent.mission.ParentAddMissionRoute +import com.kiero.presentation.parent.screen.mission.ParentAddMissionRoute import kotlinx.serialization.Serializable fun NavController.navigateToMissionAdd( diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/navigation/ParentMissionNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/navigation/ParentMissionNavigation.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/mission/navigation/ParentMissionNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/navigation/ParentMissionNavigation.kt index 2619f182..7a4734d5 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/navigation/ParentMissionNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/navigation/ParentMissionNavigation.kt @@ -1,12 +1,12 @@ -package com.kiero.presentation.parent.mission.navigation +package com.kiero.presentation.parent.screen.mission.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import com.kiero.presentation.parent.mission.ParentMissionRoute import com.kiero.presentation.parent.navigation.ParentMission +import com.kiero.presentation.parent.screen.mission.ParentMissionRoute fun NavController.navigateToParentMission( navOptions: NavOptions? = null, diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentAddMissionState.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/state/ParentAddMissionState.kt similarity index 92% rename from app/src/main/java/com/kiero/presentation/parent/mission/state/ParentAddMissionState.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/state/ParentAddMissionState.kt index 928c591e..fd6d2422 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentAddMissionState.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/state/ParentAddMissionState.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.state +package com.kiero.presentation.parent.screen.mission.state import androidx.compose.runtime.Immutable import com.kiero.data.parent.mission.model.ParentMissionAddModel diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentMissionState.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/state/ParentMissionState.kt similarity index 86% rename from app/src/main/java/com/kiero/presentation/parent/mission/state/ParentMissionState.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/state/ParentMissionState.kt index a9dbfc6b..cfbe20da 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/state/ParentMissionState.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/state/ParentMissionState.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.state +package com.kiero.presentation.parent.screen.mission.state import androidx.compose.runtime.Immutable import com.kiero.presentation.kid.mission.model.KidMissionByDateUiModel diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentAddMissionViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/viewmodel/ParentAddMissionViewModel.kt similarity index 95% rename from app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentAddMissionViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/viewmodel/ParentAddMissionViewModel.kt index 0ca07661..8a1ed08d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentAddMissionViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/viewmodel/ParentAddMissionViewModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mission.viewmodel +package com.kiero.presentation.parent.screen.mission.viewmodel import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd @@ -8,10 +8,10 @@ import androidx.lifecycle.viewModelScope import com.kiero.core.common.extension.formatWithDayOfWeek import com.kiero.core.localstorage.info.UserInfoManager import com.kiero.data.parent.mission.repository.ParentMissionAddRepository -import com.kiero.presentation.parent.mission.component.model.MissionAwardDefaults -import com.kiero.presentation.parent.mission.component.model.ParentMissionAddValid -import com.kiero.presentation.parent.mission.state.ParentAddMissionSideEffect -import com.kiero.presentation.parent.mission.state.ParentAddMissionState +import com.kiero.presentation.parent.screen.mission.component.model.MissionAwardDefaults +import com.kiero.presentation.parent.screen.mission.component.model.ParentMissionAddValid +import com.kiero.presentation.parent.screen.mission.state.ParentAddMissionSideEffect +import com.kiero.presentation.parent.screen.mission.state.ParentAddMissionState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentMissionViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mission/viewmodel/ParentMissionViewModel.kt similarity index 88% rename from app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentMissionViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mission/viewmodel/ParentMissionViewModel.kt index e3e44d8a..17541d51 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mission/viewmodel/ParentMissionViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mission/viewmodel/ParentMissionViewModel.kt @@ -1,12 +1,12 @@ -package com.kiero.presentation.parent.mission.viewmodel +package com.kiero.presentation.parent.screen.mission.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.kiero.core.model.UiState import com.kiero.data.parent.mission.repository.MissionRepository import com.kiero.presentation.kid.mission.model.toUiModel -import com.kiero.presentation.parent.mission.state.ParentMissionSideEffect -import com.kiero.presentation.parent.mission.state.ParentMissionState +import com.kiero.presentation.parent.screen.mission.state.ParentMissionSideEffect +import com.kiero.presentation.parent.screen.mission.state.ParentMissionState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mypage/ParentMypageScreen.kt similarity index 93% rename from app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mypage/ParentMypageScreen.kt index 84bf5e85..a9a6c7e7 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mypage/ParentMypageScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mypage/ParentMypageScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.mypage +package com.kiero.presentation.parent.screen.mypage import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/mypage/navigation/ParentMypageNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/mypage/navigation/ParentMypageNavigation.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/mypage/navigation/ParentMypageNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/mypage/navigation/ParentMypageNavigation.kt index d0feafba..8b23f158 100644 --- a/app/src/main/java/com/kiero/presentation/parent/mypage/navigation/ParentMypageNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/mypage/navigation/ParentMypageNavigation.kt @@ -1,11 +1,11 @@ -package com.kiero.presentation.parent.mypage.navigation +package com.kiero.presentation.parent.screen.mypage.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import com.kiero.presentation.parent.mypage.ParentMypageRoute +import com.kiero.presentation.parent.screen.mypage.ParentMypageRoute import com.kiero.presentation.parent.navigation.Mypage fun NavController.navigateToMypage( diff --git a/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/reward/ParentRewardScreen.kt similarity index 93% rename from app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/reward/ParentRewardScreen.kt index 512e2c2e..9d7d775e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/reward/ParentRewardScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/reward/ParentRewardScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.reward +package com.kiero.presentation.parent.screen.reward import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/reward/navigation/ParentRewardNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/reward/navigation/ParentRewardNavigation.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/reward/navigation/ParentRewardNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/reward/navigation/ParentRewardNavigation.kt index f6f9da6c..47382ce5 100644 --- a/app/src/main/java/com/kiero/presentation/parent/reward/navigation/ParentRewardNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/reward/navigation/ParentRewardNavigation.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.reward.navigation +package com.kiero.presentation.parent.screen.reward.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.kiero.presentation.parent.navigation.Reward -import com.kiero.presentation.parent.reward.ParentRewardRoute +import com.kiero.presentation.parent.screen.reward.ParentRewardRoute fun NavController.navigateToReward( navOptions: NavOptions? = null, diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/ParentScheduleScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/ParentScheduleScreen.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/schedule/ParentScheduleScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/ParentScheduleScreen.kt index 6c97fad2..bfae0a5b 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/ParentScheduleScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/ParentScheduleScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule +package com.kiero.presentation.parent.screen.schedule import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -33,10 +33,10 @@ import com.kiero.core.model.trigger.RefreshState import com.kiero.core.trigger.LocalRefreshState import com.kiero.presentation.parent.component.ParentTopbar import com.kiero.presentation.parent.component.PlanTabFab -import com.kiero.presentation.parent.schedule.model.TabItem -import com.kiero.presentation.parent.schedule.plan.ParentPlanScreen -import com.kiero.presentation.parent.schedule.plan.state.ParentScheduleState -import com.kiero.presentation.parent.schedule.viewmodel.ParentScheduleViewModel +import com.kiero.presentation.parent.screen.schedule.model.TabItem +import com.kiero.presentation.parent.screen.schedule.plan.ParentPlanScreen +import com.kiero.presentation.parent.screen.schedule.plan.state.ParentScheduleState +import com.kiero.presentation.parent.screen.schedule.viewmodel.ParentScheduleViewModel import com.kiero.presentation.signup.parent.state.ParentSignUpSideEffect import java.time.LocalDate diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleData.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleData.kt similarity index 93% rename from app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleData.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleData.kt index 44fcc856..e4c3b736 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleData.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleData.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.model +package com.kiero.presentation.parent.screen.schedule.model import androidx.compose.ui.graphics.Color @@ -13,6 +13,8 @@ data class ScheduleEvent( val date: String?, ){ companion object { + fun empty(): List = emptyList() + fun mock() = listOf( ScheduleEvent( id = "1", diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleModel.kt similarity index 87% rename from app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleModel.kt index 6ee83d65..5fb13a39 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.model +package com.kiero.presentation.parent.screen.schedule.model import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleTimeUtil.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleTimeUtil.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleTimeUtil.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleTimeUtil.kt index 6acfb454..348be528 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/model/ScheduleTimeUtil.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/model/ScheduleTimeUtil.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.model +package com.kiero.presentation.parent.screen.schedule.model import androidx.compose.ui.graphics.Color import androidx.core.graphics.toColorInt diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/navigation/ParentScheduleNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/navigation/ParentScheduleNavigation.kt similarity index 87% rename from app/src/main/java/com/kiero/presentation/parent/schedule/navigation/ParentScheduleNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/navigation/ParentScheduleNavigation.kt index 95abfa8c..27b2fe45 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/navigation/ParentScheduleNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/navigation/ParentScheduleNavigation.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.navigation +package com.kiero.presentation.parent.screen.schedule.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.kiero.presentation.parent.navigation.Schedule -import com.kiero.presentation.parent.schedule.ParentScheduleRoute +import com.kiero.presentation.parent.screen.schedule.ParentScheduleRoute fun NavController.navigateToSchedule( navOptions: NavOptions? = null, diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentAddPlanScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/ParentAddPlanScreen.kt similarity index 87% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentAddPlanScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/ParentAddPlanScreen.kt index 66fc2c31..782501fe 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentAddPlanScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/ParentAddPlanScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan +package com.kiero.presentation.parent.screen.schedule.plan import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -25,15 +25,15 @@ import com.kiero.core.designsystem.component.KieroTopbar import com.kiero.core.designsystem.theme.KieroTheme import com.kiero.core.model.trigger.SnackbarState import com.kiero.core.trigger.LocalGlobalUiEventTrigger -import com.kiero.presentation.parent.schedule.plan.component.picker.ColorPickerBottomSheet -import com.kiero.presentation.parent.schedule.plan.component.plan.ScheduleDatebar -import com.kiero.presentation.parent.schedule.plan.component.select.ColorSelectArea -import com.kiero.presentation.parent.schedule.plan.component.select.ScheduleTextField -import com.kiero.presentation.parent.schedule.plan.component.select.TimeSelectArea -import com.kiero.presentation.parent.schedule.plan.component.select.WeekSelectArea -import com.kiero.presentation.parent.schedule.plan.model.ColorType -import com.kiero.presentation.parent.schedule.plan.state.ParentPlanSideEffect -import com.kiero.presentation.parent.schedule.plan.viewmodel.ParentPlanViewModel +import com.kiero.presentation.parent.screen.schedule.plan.component.picker.ColorPickerBottomSheet +import com.kiero.presentation.parent.screen.schedule.plan.component.plan.ScheduleDatebar +import com.kiero.presentation.parent.screen.schedule.plan.component.select.ColorSelectArea +import com.kiero.presentation.parent.screen.schedule.plan.component.select.ScheduleTextField +import com.kiero.presentation.parent.screen.schedule.plan.component.select.TimeSelectArea +import com.kiero.presentation.parent.screen.schedule.plan.component.select.WeekSelectArea +import com.kiero.presentation.parent.screen.schedule.plan.model.ColorType +import com.kiero.presentation.parent.screen.schedule.plan.state.ParentPlanSideEffect +import com.kiero.presentation.parent.screen.schedule.plan.viewmodel.ParentPlanViewModel @Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentPlanScreen.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/ParentPlanScreen.kt similarity index 89% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentPlanScreen.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/ParentPlanScreen.kt index 43617a5b..9d715f0a 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/ParentPlanScreen.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/ParentPlanScreen.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan +package com.kiero.presentation.parent.screen.schedule.plan import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -22,10 +22,10 @@ import com.kiero.core.model.trigger.RefreshState import com.kiero.core.trigger.LocalRefreshState import com.kiero.data.parent.plan.model.toUiModel import com.kiero.presentation.main.navigation.ParentMainTab -import com.kiero.presentation.parent.schedule.plan.component.plan.ScheduleDatebar -import com.kiero.presentation.parent.schedule.plan.component.plan.ScheduleTimeTable -import com.kiero.presentation.parent.schedule.plan.component.plan.ScheduleWeekTopbar -import com.kiero.presentation.parent.schedule.plan.state.ParentScheduleState +import com.kiero.presentation.parent.screen.schedule.plan.component.plan.ScheduleDatebar +import com.kiero.presentation.parent.screen.schedule.plan.component.plan.ScheduleTimeTable +import com.kiero.presentation.parent.screen.schedule.plan.component.plan.ScheduleWeekTopbar +import com.kiero.presentation.parent.screen.schedule.plan.state.ParentScheduleState @Composable fun ParentPlanScreen( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/ColorPicker.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/ColorPicker.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/ColorPicker.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/ColorPicker.kt index ece4cc11..16babe07 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/ColorPicker.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/ColorPicker.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.picker +package com.kiero.presentation.parent.screen.schedule.plan.component.picker import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp import com.kiero.R import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.plan.model.ColorType +import com.kiero.presentation.parent.screen.schedule.plan.model.ColorType @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/PickerTopbar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/PickerTopbar.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/PickerTopbar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/PickerTopbar.kt index c461de2a..10a9b27a 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/PickerTopbar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/PickerTopbar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.picker +package com.kiero.presentation.parent.screen.schedule.plan.component.picker import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/TimePicker.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/TimePicker.kt similarity index 99% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/TimePicker.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/TimePicker.kt index f9d89997..98c3890a 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/TimePicker.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/TimePicker.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.picker +package com.kiero.presentation.parent.screen.schedule.plan.component.picker import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/TimePickerConstatnt.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/TimePickerConstatnt.kt similarity index 88% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/TimePickerConstatnt.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/TimePickerConstatnt.kt index 3f4dfc19..77a3394c 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/picker/TimePickerConstatnt.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/picker/TimePickerConstatnt.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.picker +package com.kiero.presentation.parent.screen.schedule.plan.component.picker import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleBlock.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleBlock.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleBlock.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleBlock.kt index cd550566..8c6310e0 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleBlock.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleBlock.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.plan +package com.kiero.presentation.parent.screen.schedule.plan.component.plan import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -32,8 +32,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.model.BlockPosition -import com.kiero.presentation.parent.schedule.model.ScheduleBlock +import com.kiero.presentation.parent.screen.schedule.model.BlockPosition +import com.kiero.presentation.parent.screen.schedule.model.ScheduleBlock @Composable fun ScheduleEventBlock( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleDatebar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleDatebar.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleDatebar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleDatebar.kt index eefa3357..ee732f7b 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleDatebar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleDatebar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.plan +package com.kiero.presentation.parent.screen.schedule.plan.component.plan import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/SchedulePlanner.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/SchedulePlanner.kt similarity index 83% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/SchedulePlanner.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/SchedulePlanner.kt index fe3628d9..77934e4a 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/SchedulePlanner.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/SchedulePlanner.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.plan +package com.kiero.presentation.parent.screen.schedule.plan.component.plan import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement @@ -14,18 +14,23 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.kiero.R import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.model.ScheduleEvent -import com.kiero.presentation.parent.schedule.model.toScheduleBlocks -import com.kiero.presentation.parent.schedule.plan.state.ParentScheduleState +import com.kiero.presentation.parent.screen.schedule.model.ScheduleEvent +import com.kiero.presentation.parent.screen.schedule.model.toScheduleBlocks +import com.kiero.presentation.parent.screen.schedule.plan.state.ParentScheduleState @Composable fun ScheduleTimeTable( @@ -89,8 +94,16 @@ fun SchedulePlanner( ) { Column( horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(8.dp) + verticalArrangement = Arrangement.spacedBy(4.dp) ) { + Icon( + imageVector = ImageVector.vectorResource(id = R.drawable.ic_parent_empty_state), + contentDescription = null, + tint = Color.Unspecified + ) + + Spacer(modifier = Modifier.height(7.dp)) + Text( text = "등록된 일정이 없어요", style = KieroTheme.typography.semiBold.title4, @@ -129,7 +142,7 @@ fun SchedulePlanner( @Preview(showBackground = true, backgroundColor = 0xFF2D2F34) @Composable private fun ScheduleTimeTablePreview() { - val mockEvents = ScheduleEvent.mock() + val mockEvents = ScheduleEvent.empty() KieroTheme { Box(modifier = Modifier.padding(16.dp)) { diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleTimeColumn.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleTimeColumn.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleTimeColumn.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleTimeColumn.kt index f57c78f3..8cdd877f 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleTimeColumn.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleTimeColumn.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.plan +package com.kiero.presentation.parent.screen.schedule.plan.component.plan import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleWeekTopbar.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleWeekTopbar.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleWeekTopbar.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleWeekTopbar.kt index 85b431ba..5cc835c4 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/plan/ScheduleWeekTopbar.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/plan/ScheduleWeekTopbar.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.plan +package com.kiero.presentation.parent.screen.schedule.plan.component.plan import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/ColorSelectArea.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/ColorSelectArea.kt similarity index 94% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/ColorSelectArea.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/ColorSelectArea.kt index 47a8d953..75df799e 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/ColorSelectArea.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/ColorSelectArea.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.select +package com.kiero.presentation.parent.screen.schedule.plan.component.select import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp import com.kiero.R import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.plan.model.ColorType +import com.kiero.presentation.parent.screen.schedule.plan.model.ColorType @Composable fun ColorSelectArea( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/ScheduleTextField.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/ScheduleTextField.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/ScheduleTextField.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/ScheduleTextField.kt index be724393..50f8696d 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/ScheduleTextField.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/ScheduleTextField.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.select +package com.kiero.presentation.parent.screen.schedule.plan.component.select import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/TimeSelectArea.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/TimeSelectArea.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/TimeSelectArea.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/TimeSelectArea.kt index 9433dd60..c6aee903 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/TimeSelectArea.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/TimeSelectArea.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.select +package com.kiero.presentation.parent.screen.schedule.plan.component.select import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp import com.kiero.R import com.kiero.core.common.extension.noRippleClickable import com.kiero.core.designsystem.theme.KieroTheme -import com.kiero.presentation.parent.schedule.plan.component.picker.TimePickerBottomSheet +import com.kiero.presentation.parent.screen.schedule.plan.component.picker.TimePickerBottomSheet @Composable fun TimeSelectArea( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/WeekSelectArea.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/WeekSelectArea.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/WeekSelectArea.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/WeekSelectArea.kt index da6e5708..b105ea34 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/component/select/WeekSelectArea.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/component/select/WeekSelectArea.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.component.select +package com.kiero.presentation.parent.screen.schedule.plan.component.select import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/model/PlanModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/model/PlanModel.kt similarity index 97% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/model/PlanModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/model/PlanModel.kt index 2ac0defc..67d3e206 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/model/PlanModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/model/PlanModel.kt @@ -1,8 +1,8 @@ -package com.kiero.presentation.parent.schedule.plan.model +package com.kiero.presentation.parent.screen.schedule.plan.model import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color -import com.kiero.presentation.parent.schedule.model.ScheduleEvent +import com.kiero.presentation.parent.screen.schedule.model.ScheduleEvent import kotlinx.collections.immutable.persistentListOf @Immutable diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/navigation/ScheduleAddNavigation.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/navigation/ScheduleAddNavigation.kt similarity index 86% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/navigation/ScheduleAddNavigation.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/navigation/ScheduleAddNavigation.kt index b34fe54d..7ede5f27 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/navigation/ScheduleAddNavigation.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/navigation/ScheduleAddNavigation.kt @@ -1,11 +1,11 @@ -package com.kiero.presentation.parent.schedule.plan.navigation +package com.kiero.presentation.parent.screen.schedule.plan.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import com.kiero.presentation.parent.schedule.plan.ParentScheduleAddRoute +import com.kiero.presentation.parent.screen.schedule.plan.ParentScheduleAddRoute import kotlinx.serialization.Serializable fun NavController.navigateToScheduleAdd( diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanScheduleState.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/state/PlanScheduleState.kt similarity index 82% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanScheduleState.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/state/PlanScheduleState.kt index f4bbd3b2..7ea1b8b6 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanScheduleState.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/state/PlanScheduleState.kt @@ -1,10 +1,8 @@ -package com.kiero.presentation.parent.schedule.plan.state +package com.kiero.presentation.parent.screen.schedule.plan.state import androidx.compose.runtime.Immutable -import com.kiero.data.parent.plan.model.NormalScheduleModel import com.kiero.data.parent.plan.model.PlanAllModel -import com.kiero.data.parent.plan.model.RecurringScheduleModel -import com.kiero.presentation.parent.schedule.model.ScheduleEvent +import com.kiero.presentation.parent.screen.schedule.model.ScheduleEvent import com.kiero.presentation.signup.parent.model.ParentInfoUiModel import java.time.DayOfWeek import java.time.LocalDate @@ -17,12 +15,12 @@ data class ParentScheduleState( val parentInfo: ParentInfoUiModel = ParentInfoUiModel(), val currentDate: LocalDate = LocalDate.now(), val isFetching: Boolean = false, - val isFireLit : Boolean = false, + val isFireLit: Boolean = false, val isLogoutDialogVisible: Boolean = false, val isRefreshing: Boolean = false, val isLoading: Boolean = false, -) { + ) { val canGoNext: Boolean get() = ChronoUnit.WEEKS.between(LocalDate.now(), currentDate) < 12 @@ -34,11 +32,13 @@ data class ParentScheduleState( val firstDayOfMonth = currentDate.with(TemporalAdjusters.firstDayOfMonth()) - val firstMondayOfTargetMonthWeek = firstDayOfMonth.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) + val firstMondayOfTargetMonthWeek = + firstDayOfMonth.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) val currentMonday = currentDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) - val weekNum = ChronoUnit.WEEKS.between(firstMondayOfTargetMonthWeek, currentMonday).toInt() + 1 + val weekNum = + ChronoUnit.WEEKS.between(firstMondayOfTargetMonthWeek, currentMonday).toInt() + 1 return "${targetMonth}월 ${weekNum}주차" } @@ -55,6 +55,7 @@ data class ParentScheduleState( currentDate.toString() } } + fun ScheduleEvent.getIndices(): List { return if (isRecurring) { this.dayOfWeek?.split(",")?.mapNotNull { day -> diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanState.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/state/PlanState.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanState.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/state/PlanState.kt index fbad46a5..be1f5e8c 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/state/PlanState.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/state/PlanState.kt @@ -1,8 +1,8 @@ -package com.kiero.presentation.parent.schedule.plan.state +package com.kiero.presentation.parent.screen.schedule.plan.state import androidx.compose.runtime.Immutable -import com.kiero.presentation.parent.schedule.plan.model.ColorType -import com.kiero.presentation.parent.schedule.plan.model.TimeValidationResult +import com.kiero.presentation.parent.screen.schedule.plan.model.ColorType +import com.kiero.presentation.parent.screen.schedule.plan.model.TimeValidationResult import java.time.DayOfWeek import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/viewmodel/ParentPlanViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/viewmodel/ParentPlanViewModel.kt similarity index 96% rename from app/src/main/java/com/kiero/presentation/parent/schedule/plan/viewmodel/ParentPlanViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/viewmodel/ParentPlanViewModel.kt index d2458ec7..fcb56c64 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/plan/viewmodel/ParentPlanViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/plan/viewmodel/ParentPlanViewModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.plan.viewmodel +package com.kiero.presentation.parent.screen.schedule.plan.viewmodel import androidx.compose.foundation.text.input.TextFieldState import androidx.lifecycle.SavedStateHandle @@ -7,10 +7,10 @@ import androidx.lifecycle.viewModelScope import androidx.navigation.toRoute import com.kiero.core.localstorage.info.UserInfoManager import com.kiero.data.parent.plan.repository.PlanRepository -import com.kiero.presentation.parent.schedule.plan.model.ColorType -import com.kiero.presentation.parent.schedule.plan.navigation.ScheduleAdd -import com.kiero.presentation.parent.schedule.plan.state.ParentPlanSideEffect -import com.kiero.presentation.parent.schedule.plan.state.ParentPlanState +import com.kiero.presentation.parent.screen.schedule.plan.model.ColorType +import com.kiero.presentation.parent.screen.schedule.plan.navigation.ScheduleAdd +import com.kiero.presentation.parent.screen.schedule.plan.state.ParentPlanSideEffect +import com.kiero.presentation.parent.screen.schedule.plan.state.ParentPlanState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/kiero/presentation/parent/schedule/viewmodel/ParentScheduleViewModel.kt b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/viewmodel/ParentScheduleViewModel.kt similarity index 98% rename from app/src/main/java/com/kiero/presentation/parent/schedule/viewmodel/ParentScheduleViewModel.kt rename to app/src/main/java/com/kiero/presentation/parent/screen/schedule/viewmodel/ParentScheduleViewModel.kt index 7e0dd85e..1377b1b2 100644 --- a/app/src/main/java/com/kiero/presentation/parent/schedule/viewmodel/ParentScheduleViewModel.kt +++ b/app/src/main/java/com/kiero/presentation/parent/screen/schedule/viewmodel/ParentScheduleViewModel.kt @@ -1,4 +1,4 @@ -package com.kiero.presentation.parent.schedule.viewmodel +package com.kiero.presentation.parent.screen.schedule.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -10,7 +10,7 @@ import com.kiero.core.model.UiState import com.kiero.data.auth.repository.AuthRepository import com.kiero.data.parent.plan.repository.PlanRepository import com.kiero.data.sse.manager.SseManager -import com.kiero.presentation.parent.schedule.plan.state.ParentScheduleState +import com.kiero.presentation.parent.screen.schedule.plan.state.ParentScheduleState import com.kiero.presentation.signup.parent.state.ParentSignUpSideEffect import com.kiero.presentation.signup.parent.state.ParentSignUpState import dagger.hilt.android.lifecycle.HiltViewModel From 7c4aadc8292bf25d3380d8e09fb7eda14d4c9869 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Wed, 25 Feb 2026 09:28:44 +0900 Subject: [PATCH 11/13] =?UTF-8?q?refactor/#85:empty=20view=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=82=AC=ED=95=AD=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/ic_parent_empty_state.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/src/main/res/drawable/ic_parent_empty_state.xml diff --git a/app/src/main/res/drawable/ic_parent_empty_state.xml b/app/src/main/res/drawable/ic_parent_empty_state.xml new file mode 100644 index 00000000..3ee60eb9 --- /dev/null +++ b/app/src/main/res/drawable/ic_parent_empty_state.xml @@ -0,0 +1,10 @@ + + + From e0680002451e0e24c471540ecc50a8e68bc926a9 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Wed, 25 Feb 2026 10:27:29 +0900 Subject: [PATCH 12/13] =?UTF-8?q?refactor/#85:=20dummyfile=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/network/model/DummyBaseResponse.kt | 18 ------------------ .../kiero/data/auth/remote/api/DummyService.kt | 15 --------------- .../auth/remote/datasource/DummyDataSource.kt | 8 -------- .../datasourceimpl/DummyDataSourceImpl.kt | 14 -------------- .../auth/remote/dto/request/DummyRequestDto.kt | 4 ---- .../remote/dto/response/DummyResponseDto.kt | 18 ------------------ 6 files changed, 77 deletions(-) delete mode 100644 app/src/main/java/com/kiero/core/network/model/DummyBaseResponse.kt delete mode 100644 app/src/main/java/com/kiero/data/auth/remote/api/DummyService.kt delete mode 100644 app/src/main/java/com/kiero/data/auth/remote/datasource/DummyDataSource.kt delete mode 100644 app/src/main/java/com/kiero/data/auth/remote/datasourceimpl/DummyDataSourceImpl.kt delete mode 100644 app/src/main/java/com/kiero/data/auth/remote/dto/request/DummyRequestDto.kt delete mode 100644 app/src/main/java/com/kiero/data/auth/remote/dto/response/DummyResponseDto.kt diff --git a/app/src/main/java/com/kiero/core/network/model/DummyBaseResponse.kt b/app/src/main/java/com/kiero/core/network/model/DummyBaseResponse.kt deleted file mode 100644 index 172771e5..00000000 --- a/app/src/main/java/com/kiero/core/network/model/DummyBaseResponse.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.kiero.core.network.model - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class DummyBaseResponse( - @SerialName("data") - val data: T, - @SerialName("page") - val page: Int? = null, - @SerialName("per_page") - val perPage: Int? = null, - @SerialName("total") - val total: Int? = null, - @SerialName("total_pages") - val totalPages: Int? = null -) \ No newline at end of file diff --git a/app/src/main/java/com/kiero/data/auth/remote/api/DummyService.kt b/app/src/main/java/com/kiero/data/auth/remote/api/DummyService.kt deleted file mode 100644 index d2f3ed42..00000000 --- a/app/src/main/java/com/kiero/data/auth/remote/api/DummyService.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.kiero.data.auth.remote.api - -import com.kiero.core.network.model.DummyBaseResponse -import com.kiero.data.auth.remote.dto.response.DummyResponseDto -import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.Query - -interface DummyService { - @GET("api/users") - suspend fun getDummyLists( - @Header("x-api-key") apiKey: String = "reqres-free-v1", - @Query("page") page: Int = 2, - ): DummyBaseResponse> -} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/data/auth/remote/datasource/DummyDataSource.kt b/app/src/main/java/com/kiero/data/auth/remote/datasource/DummyDataSource.kt deleted file mode 100644 index c67ce247..00000000 --- a/app/src/main/java/com/kiero/data/auth/remote/datasource/DummyDataSource.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.kiero.data.auth.remote.datasource - -import com.kiero.core.network.model.DummyBaseResponse -import com.kiero.data.auth.remote.dto.response.DummyResponseDto - -interface DummyDataSource { - suspend fun getDummyList(): DummyBaseResponse> -} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/data/auth/remote/datasourceimpl/DummyDataSourceImpl.kt b/app/src/main/java/com/kiero/data/auth/remote/datasourceimpl/DummyDataSourceImpl.kt deleted file mode 100644 index 9dc71595..00000000 --- a/app/src/main/java/com/kiero/data/auth/remote/datasourceimpl/DummyDataSourceImpl.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.kiero.data.auth.remote.datasourceimpl - -import com.kiero.core.network.model.DummyBaseResponse -import com.kiero.data.auth.remote.api.DummyService -import com.kiero.data.auth.remote.datasource.DummyDataSource -import com.kiero.data.auth.remote.dto.response.DummyResponseDto -import javax.inject.Inject - -class DummyDataSourceImpl @Inject constructor( - private val dummyService: DummyService, -) : DummyDataSource { - override suspend fun getDummyList(): DummyBaseResponse> = - dummyService.getDummyLists() -} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/data/auth/remote/dto/request/DummyRequestDto.kt b/app/src/main/java/com/kiero/data/auth/remote/dto/request/DummyRequestDto.kt deleted file mode 100644 index d5a7b9c8..00000000 --- a/app/src/main/java/com/kiero/data/auth/remote/dto/request/DummyRequestDto.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.kiero.data.auth.remote.dto.request - -class DummyRequestDto { -} \ No newline at end of file diff --git a/app/src/main/java/com/kiero/data/auth/remote/dto/response/DummyResponseDto.kt b/app/src/main/java/com/kiero/data/auth/remote/dto/response/DummyResponseDto.kt deleted file mode 100644 index f636dea9..00000000 --- a/app/src/main/java/com/kiero/data/auth/remote/dto/response/DummyResponseDto.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.kiero.data.auth.remote.dto.response - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class DummyResponseDto( - @SerialName("id") - val id: Int, - @SerialName("email") - val email: String, - @SerialName("first_name") - val firstName: String, - @SerialName("last_name") - val lastName: String, - @SerialName("avatar") - val avatar: String -) \ No newline at end of file From 98fbdbb6fd30077057bb47b0789f097860a89f91 Mon Sep 17 00:00:00 2001 From: Son Juwan Date: Wed, 25 Feb 2026 10:27:40 +0900 Subject: [PATCH 13/13] =?UTF-8?q?refactor/#85:=20=EC=95=B1=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EB=A1=9C=EA=B3=A0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kiero/presentation/auth/AuthScreen.kt | 2 +- app/src/main/res/drawable/ic_logo.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/kiero/presentation/auth/AuthScreen.kt b/app/src/main/java/com/kiero/presentation/auth/AuthScreen.kt index add25316..bb696727 100644 --- a/app/src/main/java/com/kiero/presentation/auth/AuthScreen.kt +++ b/app/src/main/java/com/kiero/presentation/auth/AuthScreen.kt @@ -123,7 +123,7 @@ fun AuthScreen( @Preview @Composable -private fun DummyScreenPreview() { +private fun AuthScreenPreview() { KieroTheme { AuthScreen( paddingValues = PaddingValues(), diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml index 7dc7fc3f..ba2c2088 100644 --- a/app/src/main/res/drawable/ic_logo.xml +++ b/app/src/main/res/drawable/ic_logo.xml @@ -5,18 +5,18 @@ android:viewportHeight="63"> + android:fillColor="#ffffff"/> + android:fillColor="#ffffff"/> + android:fillColor="#ffffff"/> + android:fillColor="#ffffff"/>