From f3689fd96182f0741f4df736c528174f703d8722 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Wed, 25 Feb 2026 21:56:33 +0900 Subject: [PATCH 01/13] =?UTF-8?q?REFACTOR:=20=EA=B0=90=EC=A0=95=EA=B5=AC?= =?UTF-8?q?=EC=8A=AC,=20=EC=84=A4=EB=AA=85=EC=84=9C,=20=ED=99=88=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/threegap/bitnagil/MainNavHost.kt | 4 ++-- .../bitnagil/navigation/home/HomeNavHost.kt | 2 +- .../routinelist/RoutineListViewModel.kt | 2 +- .../component/template/WeeklyDatePicker.kt | 6 ++--- .../routinelist/contract/RoutineListState.kt | 2 +- .../routinelist/model/RoutineUiModel.kt | 4 ++-- .../{ => screen}/emotion/EmotionScreen.kt | 12 +++++----- .../{ => screen}/emotion/EmotionViewModel.kt | 12 +++++----- .../component/atom/EmotionMarbleImage.kt | 4 ++-- .../component/atom/SpeechBubbleText.kt | 2 +- .../component/template/EmotionLoadingView.kt | 10 ++++---- .../template/EmotionRecommendRoutineScreen.kt | 12 +++++----- .../template/SimpleEmotionSelectionScreen.kt | 12 +++++----- .../template/SwipeEmotionSelectionScreen.kt | 15 ++++++------ .../emotion/contract/EmotionSideEffect.kt | 2 +- .../emotion/contract/EmotionState.kt | 8 +++---- .../emotion/model/EmotionImageUiModel.kt | 2 +- .../model/EmotionRecommendRoutineUiModel.kt | 2 +- .../emotion/model/EmotionScreenStep.kt | 2 +- .../emotion/model/EmotionUiModel.kt | 10 ++++---- .../{ => screen}/guide/GuideScreen.kt | 10 ++++---- .../{ => screen}/guide/GuideViewModel.kt | 8 +++---- .../guide/component/atom/GuideButton.kt | 2 +- .../component/template/GuideBottomSheet.kt | 4 ++-- .../guide/contract/GuideSideEffect.kt | 2 +- .../{ => screen}/guide/contract/GuideState.kt | 4 ++-- .../{ => screen}/guide/model/GuideType.kt | 2 +- .../{ => screen}/home/HomeScreen.kt | 24 +++++++++---------- .../{ => screen}/home/HomeViewModel.kt | 16 +++++++------ .../component/atom/EmotionRegisterButton.kt | 2 +- .../home/component/block/RoutineItem.kt | 2 +- .../home/component/block/SubRoutinesItem.kt | 2 +- .../component/template/CollapsibleHeader.kt | 8 +++---- .../component/template/EmptyRoutineView.kt | 2 +- .../home/component/template/RoutineSection.kt | 8 +++---- .../home/component/template/StickyHeader.kt | 2 +- .../component/template/WeeklyDatePicker.kt | 14 +++++------ .../home/contract/HomeSideEffect.kt | 2 +- .../{ => screen}/home/contract/HomeState.kt | 14 +++++------ .../home/model/CollapsibleHeaderState.kt | 2 +- .../home/model/DailyEmotionUiModel.kt | 2 +- .../home/model/DailyRoutinesUiModel.kt | 2 +- .../home/model/RoutineScheduleUiModel.kt | 2 +- .../{ => screen}/home/model/RoutineUiModel.kt | 2 +- .../{ => screen}/home/model/ToggleStrategy.kt | 2 +- .../home/util/LocalDateExtension.kt | 2 +- 46 files changed, 135 insertions(+), 132 deletions(-) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/EmotionScreen.kt (81%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/EmotionViewModel.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/component/atom/EmotionMarbleImage.kt (88%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/component/atom/SpeechBubbleText.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/component/template/EmotionLoadingView.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/component/template/EmotionRecommendRoutineScreen.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/component/template/SimpleEmotionSelectionScreen.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/component/template/SwipeEmotionSelectionScreen.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/contract/EmotionSideEffect.kt (70%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/contract/EmotionState.kt (70%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/model/EmotionImageUiModel.kt (82%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/model/EmotionRecommendRoutineUiModel.kt (89%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/model/EmotionScreenStep.kt (52%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/emotion/model/EmotionUiModel.kt (87%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/guide/GuideScreen.kt (86%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/guide/GuideViewModel.kt (77%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/guide/component/atom/GuideButton.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/guide/component/template/GuideBottomSheet.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/guide/contract/GuideSideEffect.kt (57%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/guide/contract/GuideState.kt (64%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/guide/model/GuideType.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/HomeScreen.kt (89%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/HomeViewModel.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/atom/EmotionRegisterButton.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/block/RoutineItem.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/block/SubRoutinesItem.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/template/CollapsibleHeader.kt (89%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/template/EmptyRoutineView.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/template/RoutineSection.kt (87%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/template/StickyHeader.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/component/template/WeeklyDatePicker.kt (93%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/contract/HomeSideEffect.kt (81%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/contract/HomeState.kt (58%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/model/CollapsibleHeaderState.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/model/DailyEmotionUiModel.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/model/DailyRoutinesUiModel.kt (85%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/model/RoutineScheduleUiModel.kt (88%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/model/RoutineUiModel.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/model/ToggleStrategy.kt (67%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/home/util/LocalDateExtension.kt (96%) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index 0df6644b..1ace0c0b 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -7,8 +7,8 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.toRoute import com.threegap.bitnagil.navigation.home.HomeNavHost -import com.threegap.bitnagil.presentation.emotion.EmotionScreenContainer -import com.threegap.bitnagil.presentation.guide.GuideScreenContainer +import com.threegap.bitnagil.presentation.screen.emotion.EmotionScreenContainer +import com.threegap.bitnagil.presentation.screen.guide.GuideScreenContainer import com.threegap.bitnagil.presentation.login.LoginScreenContainer import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel diff --git a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt index 2f0c962f..9740cd6f 100644 --- a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt @@ -29,7 +29,7 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilFloatingActionM import com.threegap.bitnagil.designsystem.component.atom.FloatingActionItem import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast -import com.threegap.bitnagil.presentation.home.HomeScreenContainer +import com.threegap.bitnagil.presentation.screen.home.HomeScreenContainer import com.threegap.bitnagil.presentation.mypage.MyPageScreenContainer import com.threegap.bitnagil.presentation.recommendroutine.RecommendRoutineScreenContainer import com.threegap.bitnagil.util.setStatusBarContentColor diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt index b2a780d4..7bddca7f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt @@ -8,7 +8,7 @@ import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineForDayUseCase import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineUseCase import com.threegap.bitnagil.domain.routine.usecase.FetchWeeklyRoutinesUseCase import com.threegap.bitnagil.domain.writeroutine.usecase.GetWriteRoutineEventFlowUseCase -import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays +import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListSideEffect import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt index 05a79a39..a944824a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt @@ -22,9 +22,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.home.util.formatDayOfMonth -import com.threegap.bitnagil.presentation.home.util.formatDayOfWeekShort -import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays +import com.threegap.bitnagil.presentation.screen.home.util.formatDayOfMonth +import com.threegap.bitnagil.presentation.screen.home.util.formatDayOfWeekShort +import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays import java.time.LocalDate @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt index fdcf5b88..84a74018 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt @@ -1,6 +1,6 @@ package com.threegap.bitnagil.presentation.routinelist.contract -import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays +import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays import com.threegap.bitnagil.presentation.routinelist.model.RoutineScheduleUiModel import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel import java.time.LocalDate diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineUiModel.kt index a0d20211..9ba560cd 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineUiModel.kt @@ -3,8 +3,8 @@ package com.threegap.bitnagil.presentation.routinelist.model import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.routine.model.DayOfWeek import com.threegap.bitnagil.domain.routine.model.Routine -import com.threegap.bitnagil.presentation.home.util.formatExecutionTime12Hour -import com.threegap.bitnagil.presentation.home.util.toShortDateFormat +import com.threegap.bitnagil.presentation.screen.home.util.formatExecutionTime12Hour +import com.threegap.bitnagil.presentation.screen.home.util.toShortDateFormat data class RoutineUiModel( val routineId: String, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt index dc4c67a1..d2ad8b78 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion +package com.threegap.bitnagil.presentation.screen.emotion import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.BoxWithConstraints @@ -11,11 +11,11 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.presentation.common.dimension.pxToDp import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast -import com.threegap.bitnagil.presentation.emotion.component.template.EmotionRecommendRoutineScreen -import com.threegap.bitnagil.presentation.emotion.component.template.SimpleEmotionSelectionScreen -import com.threegap.bitnagil.presentation.emotion.component.template.SwipeEmotionSelectionScreen -import com.threegap.bitnagil.presentation.emotion.contract.EmotionSideEffect -import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep +import com.threegap.bitnagil.presentation.screen.emotion.component.template.EmotionRecommendRoutineScreen +import com.threegap.bitnagil.presentation.screen.emotion.component.template.SimpleEmotionSelectionScreen +import com.threegap.bitnagil.presentation.screen.emotion.component.template.SwipeEmotionSelectionScreen +import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionSideEffect +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt index 2f6a6c89..ea9ad783 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion +package com.threegap.bitnagil.presentation.screen.emotion import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel @@ -6,10 +6,10 @@ import androidx.lifecycle.viewModelScope import com.threegap.bitnagil.domain.emotion.usecase.GetEmotionsUseCase import com.threegap.bitnagil.domain.emotion.usecase.RegisterEmotionUseCase import com.threegap.bitnagil.domain.onboarding.usecase.RegisterRecommendOnBoardingRoutinesUseCase -import com.threegap.bitnagil.presentation.emotion.contract.EmotionSideEffect -import com.threegap.bitnagil.presentation.emotion.contract.EmotionState -import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep -import com.threegap.bitnagil.presentation.emotion.model.toUiModel +import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionSideEffect +import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionState +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep +import com.threegap.bitnagil.presentation.screen.emotion.model.toUiModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -26,7 +26,7 @@ class EmotionViewModel @Inject constructor( savedStateHandle: SavedStateHandle, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = EmotionState.Init, savedStateHandle = savedStateHandle) + override val container: Container = container(initialState = EmotionState.Companion.Init, savedStateHandle = savedStateHandle) init { loadEmotions() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/EmotionMarbleImage.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/EmotionMarbleImage.kt similarity index 88% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/EmotionMarbleImage.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/EmotionMarbleImage.kt index 3bf89cd4..eed3f8b5 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/EmotionMarbleImage.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/EmotionMarbleImage.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.component.atom +package com.threegap.bitnagil.presentation.screen.emotion.component.atom import androidx.compose.foundation.Image import androidx.compose.runtime.Composable @@ -8,7 +8,7 @@ import androidx.compose.ui.res.painterResource import coil3.compose.AsyncImage import coil3.request.ImageRequest import coil3.request.crossfade -import com.threegap.bitnagil.presentation.emotion.model.EmotionImageUiModel +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionImageUiModel @Composable fun EmotionMarbleImage( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/SpeechBubbleText.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/SpeechBubbleText.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/SpeechBubbleText.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/SpeechBubbleText.kt index 1d90b7a7..5cc3bfb9 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/SpeechBubbleText.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/SpeechBubbleText.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.component.atom +package com.threegap.bitnagil.presentation.screen.emotion.component.atom import androidx.compose.foundation.Canvas import androidx.compose.foundation.background diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/EmotionLoadingView.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/EmotionLoadingView.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt index fb58ed21..0fd19645 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/EmotionLoadingView.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.component.template +package com.threegap.bitnagil.presentation.screen.emotion.component.template import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -25,9 +25,9 @@ import androidx.compose.ui.zIndex import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.presentation.common.dimension.pxToDp -import com.threegap.bitnagil.presentation.emotion.component.atom.EmotionMarbleImage -import com.threegap.bitnagil.presentation.emotion.component.atom.SpeechBubbleText -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel +import com.threegap.bitnagil.presentation.screen.emotion.component.atom.EmotionMarbleImage +import com.threegap.bitnagil.presentation.screen.emotion.component.atom.SpeechBubbleText +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel @Composable fun EmotionLoadingView( @@ -184,7 +184,7 @@ private fun getRecommendRoutineText(emotion: EmotionUiModel): String { private fun EmotionLoadingViewPreview() { BitnagilTheme { EmotionLoadingView( - emotion = EmotionUiModel.Default, + emotion = EmotionUiModel.Companion.Default, ) } } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/EmotionRecommendRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionRecommendRoutineScreen.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/EmotionRecommendRoutineScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionRecommendRoutineScreen.kt index 748cc01a..d7b9c9f6 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/EmotionRecommendRoutineScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionRecommendRoutineScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.component.template +package com.threegap.bitnagil.presentation.screen.emotion.component.template import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -21,11 +21,11 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.atom.BitnagilSelectButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButtonColor -import com.threegap.bitnagil.presentation.emotion.contract.EmotionState -import com.threegap.bitnagil.presentation.emotion.model.EmotionImageUiModel -import com.threegap.bitnagil.presentation.emotion.model.EmotionRecommendRoutineUiModel -import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel +import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionState +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionImageUiModel +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionRecommendRoutineUiModel +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel @Composable fun EmotionRecommendRoutineScreen( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SimpleEmotionSelectionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SimpleEmotionSelectionScreen.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SimpleEmotionSelectionScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SimpleEmotionSelectionScreen.kt index ef890ee5..1c1c8b02 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SimpleEmotionSelectionScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SimpleEmotionSelectionScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.component.template +package com.threegap.bitnagil.presentation.screen.emotion.component.template import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -21,11 +21,11 @@ import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.emotion.component.atom.EmotionMarbleImage -import com.threegap.bitnagil.presentation.emotion.contract.EmotionState -import com.threegap.bitnagil.presentation.emotion.model.EmotionImageUiModel -import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel +import com.threegap.bitnagil.presentation.screen.emotion.component.atom.EmotionMarbleImage +import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionState +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionImageUiModel +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel @Composable fun SimpleEmotionSelectionScreen( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SwipeEmotionSelectionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SwipeEmotionSelectionScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt index f9feab73..ed53efbe 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SwipeEmotionSelectionScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.component.template +package com.threegap.bitnagil.presentation.screen.emotion.component.template import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.EnterTransition @@ -61,13 +61,14 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.presentation.common.dimension.dpToPx -import com.threegap.bitnagil.presentation.emotion.component.atom.EmotionMarbleImage -import com.threegap.bitnagil.presentation.emotion.contract.EmotionState -import com.threegap.bitnagil.presentation.emotion.model.EmotionImageUiModel -import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel +import com.threegap.bitnagil.presentation.screen.emotion.component.atom.EmotionMarbleImage +import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionState +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionImageUiModel +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import kotlin.collections.forEach import kotlin.math.absoluteValue @Composable @@ -79,7 +80,7 @@ fun SwipeEmotionSelectionScreen( val fadeInTransition = remember { fadeIn(animationSpec = tween(150)) } val fadeOutTransition = remember { fadeOut(animationSpec = tween(50)) } - val emotions = remember(state.emotionTypeUiModels) { state.emotionTypeUiModels + EmotionUiModel.Default } + val emotions = remember(state.emotionTypeUiModels) { state.emotionTypeUiModels + EmotionUiModel.Companion.Default } val actualItemCount = emotions.size val pagerState = rememberPagerState( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/contract/EmotionSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/contract/EmotionSideEffect.kt similarity index 70% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/contract/EmotionSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/contract/EmotionSideEffect.kt index 4f5c6e3f..556d079a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/contract/EmotionSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/contract/EmotionSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.contract +package com.threegap.bitnagil.presentation.screen.emotion.contract sealed interface EmotionSideEffect { data object NavigateToBack : EmotionSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/contract/EmotionState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/contract/EmotionState.kt similarity index 70% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/contract/EmotionState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/contract/EmotionState.kt index e780d16d..f53ad875 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/contract/EmotionState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/contract/EmotionState.kt @@ -1,10 +1,10 @@ -package com.threegap.bitnagil.presentation.emotion.contract +package com.threegap.bitnagil.presentation.screen.emotion.contract import android.os.Parcelable import androidx.compose.runtime.Immutable -import com.threegap.bitnagil.presentation.emotion.model.EmotionRecommendRoutineUiModel -import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionRecommendRoutineUiModel +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel import kotlinx.parcelize.Parcelize @Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionImageUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionImageUiModel.kt similarity index 82% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionImageUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionImageUiModel.kt index 44d92fd9..dddfc1a3 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionImageUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionImageUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.model +package com.threegap.bitnagil.presentation.screen.emotion.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionRecommendRoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionRecommendRoutineUiModel.kt similarity index 89% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionRecommendRoutineUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionRecommendRoutineUiModel.kt index 19c09326..e6f735eb 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionRecommendRoutineUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionRecommendRoutineUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.model +package com.threegap.bitnagil.presentation.screen.emotion.model import android.os.Parcelable import com.threegap.bitnagil.domain.emotion.model.EmotionRecommendRoutine diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionScreenStep.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionScreenStep.kt similarity index 52% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionScreenStep.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionScreenStep.kt index 434c06ce..d6525eb7 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionScreenStep.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionScreenStep.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.emotion.model +package com.threegap.bitnagil.presentation.screen.emotion.model enum class EmotionScreenStep { Emotion, RecommendRoutines, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionUiModel.kt similarity index 87% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionUiModel.kt index 39a46e91..28ba9a97 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionUiModel.kt @@ -1,12 +1,12 @@ -package com.threegap.bitnagil.presentation.emotion.model +package com.threegap.bitnagil.presentation.screen.emotion.model import android.os.Parcelable import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.domain.emotion.model.Emotion -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel.Companion.getMessage -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel.Companion.getOfflineBackupImageResourceId -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel.Companion.getSymbolBackgroundColor -import com.threegap.bitnagil.presentation.emotion.model.EmotionUiModel.Companion.getSymbolColor +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel.Companion.getMessage +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel.Companion.getOfflineBackupImageResourceId +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel.Companion.getSymbolBackgroundColor +import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel.Companion.getSymbolColor import kotlinx.parcelize.Parcelize @Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/GuideScreen.kt similarity index 86% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/GuideScreen.kt index aab98164..ae2f555e 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/GuideScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.guide +package com.threegap.bitnagil.presentation.screen.guide import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -14,10 +14,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.guide.component.atom.GuideButton -import com.threegap.bitnagil.presentation.guide.component.template.GuideBottomSheet -import com.threegap.bitnagil.presentation.guide.contract.GuideSideEffect -import com.threegap.bitnagil.presentation.guide.model.GuideType +import com.threegap.bitnagil.presentation.screen.guide.component.atom.GuideButton +import com.threegap.bitnagil.presentation.screen.guide.component.template.GuideBottomSheet +import com.threegap.bitnagil.presentation.screen.guide.contract.GuideSideEffect +import com.threegap.bitnagil.presentation.screen.guide.model.GuideType import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/GuideViewModel.kt similarity index 77% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/GuideViewModel.kt index f12a3ecd..a7e4f7fe 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/GuideViewModel.kt @@ -1,9 +1,9 @@ -package com.threegap.bitnagil.presentation.guide +package com.threegap.bitnagil.presentation.screen.guide import androidx.lifecycle.ViewModel -import com.threegap.bitnagil.presentation.guide.contract.GuideSideEffect -import com.threegap.bitnagil.presentation.guide.contract.GuideState -import com.threegap.bitnagil.presentation.guide.model.GuideType +import com.threegap.bitnagil.presentation.screen.guide.contract.GuideSideEffect +import com.threegap.bitnagil.presentation.screen.guide.contract.GuideState +import com.threegap.bitnagil.presentation.screen.guide.model.GuideType import dagger.hilt.android.lifecycle.HiltViewModel import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/component/atom/GuideButton.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/component/atom/GuideButton.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/guide/component/atom/GuideButton.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/component/atom/GuideButton.kt index ab239a25..b9db1787 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/component/atom/GuideButton.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/component/atom/GuideButton.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.guide.component.atom +package com.threegap.bitnagil.presentation.screen.guide.component.atom import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/component/template/GuideBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/component/template/GuideBottomSheet.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/guide/component/template/GuideBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/component/template/GuideBottomSheet.kt index fefefa47..0fde2898 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/component/template/GuideBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/component/template/GuideBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.guide.component.template +package com.threegap.bitnagil.presentation.screen.guide.component.template import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column @@ -16,7 +16,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme -import com.threegap.bitnagil.presentation.guide.model.GuideType +import com.threegap.bitnagil.presentation.screen.guide.model.GuideType @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/contract/GuideSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/contract/GuideSideEffect.kt similarity index 57% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/guide/contract/GuideSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/contract/GuideSideEffect.kt index b174c955..dc3f007a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/contract/GuideSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/contract/GuideSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.guide.contract +package com.threegap.bitnagil.presentation.screen.guide.contract sealed interface GuideSideEffect { data object NavigateToBack : GuideSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/contract/GuideState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/contract/GuideState.kt similarity index 64% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/guide/contract/GuideState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/contract/GuideState.kt index 2a26eb37..b00331ca 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/contract/GuideState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/contract/GuideState.kt @@ -1,6 +1,6 @@ -package com.threegap.bitnagil.presentation.guide.contract +package com.threegap.bitnagil.presentation.screen.guide.contract -import com.threegap.bitnagil.presentation.guide.model.GuideType +import com.threegap.bitnagil.presentation.screen.guide.model.GuideType data class GuideState( val guideType: GuideType?, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/model/GuideType.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/model/GuideType.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/guide/model/GuideType.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/model/GuideType.kt index f7233621..04941d2f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/model/GuideType.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/guide/model/GuideType.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.guide.model +package com.threegap.bitnagil.presentation.screen.guide.model import androidx.annotation.DrawableRes import com.threegap.bitnagil.designsystem.R diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt similarity index 89% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt index 1eae8747..bffa1577 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home +package com.threegap.bitnagil.presentation.screen.home import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -29,15 +29,15 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.home.component.template.CollapsibleHeader -import com.threegap.bitnagil.presentation.home.component.template.EmptyRoutineView -import com.threegap.bitnagil.presentation.home.component.template.RoutineSection -import com.threegap.bitnagil.presentation.home.component.template.StickyHeader -import com.threegap.bitnagil.presentation.home.component.template.WeeklyDatePicker -import com.threegap.bitnagil.presentation.home.contract.HomeSideEffect -import com.threegap.bitnagil.presentation.home.contract.HomeState -import com.threegap.bitnagil.presentation.home.model.DailyEmotionUiModel -import com.threegap.bitnagil.presentation.home.model.rememberCollapsibleHeaderState +import com.threegap.bitnagil.presentation.screen.home.component.template.CollapsibleHeader +import com.threegap.bitnagil.presentation.screen.home.component.template.EmptyRoutineView +import com.threegap.bitnagil.presentation.screen.home.component.template.RoutineSection +import com.threegap.bitnagil.presentation.screen.home.component.template.StickyHeader +import com.threegap.bitnagil.presentation.screen.home.component.template.WeeklyDatePicker +import com.threegap.bitnagil.presentation.screen.home.contract.HomeSideEffect +import com.threegap.bitnagil.presentation.screen.home.contract.HomeState +import com.threegap.bitnagil.presentation.screen.home.model.DailyEmotionUiModel +import com.threegap.bitnagil.presentation.screen.home.model.rememberCollapsibleHeaderState import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect import java.time.LocalDate @@ -195,9 +195,9 @@ private fun HomeScreen( @Composable private fun HomeScreenPreview() { HomeScreen( - uiState = HomeState.INIT.copy( + uiState = HomeState.Companion.INIT.copy( userNickname = "홍길동", - dailyEmotion = DailyEmotionUiModel.INIT.copy( + dailyEmotion = DailyEmotionUiModel.Companion.INIT.copy( homeMessage = "님, 오셨군요!\n오늘 기분은 어떤가요?", ), ), diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt index c4a9d347..493bf462 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home +package com.threegap.bitnagil.presentation.screen.home import android.util.Log import androidx.lifecycle.ViewModel @@ -12,11 +12,11 @@ import com.threegap.bitnagil.domain.routine.usecase.RoutineCompletionUseCase import com.threegap.bitnagil.domain.routine.usecase.ToggleRoutineUseCase import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase import com.threegap.bitnagil.domain.writeroutine.usecase.GetWriteRoutineEventFlowUseCase -import com.threegap.bitnagil.presentation.home.contract.HomeSideEffect -import com.threegap.bitnagil.presentation.home.contract.HomeState -import com.threegap.bitnagil.presentation.home.model.ToggleStrategy -import com.threegap.bitnagil.presentation.home.model.toUiModel -import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays +import com.threegap.bitnagil.presentation.screen.home.contract.HomeSideEffect +import com.threegap.bitnagil.presentation.screen.home.contract.HomeState +import com.threegap.bitnagil.presentation.screen.home.model.ToggleStrategy +import com.threegap.bitnagil.presentation.screen.home.model.toUiModel +import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.coroutineScope @@ -31,6 +31,8 @@ import org.orbitmvi.orbit.ContainerHost import org.orbitmvi.orbit.viewmodel.container import java.time.LocalDate import javax.inject.Inject +import kotlin.collections.map +import kotlin.collections.plus @HiltViewModel class HomeViewModel @Inject constructor( @@ -44,7 +46,7 @@ class HomeViewModel @Inject constructor( private val toggleRoutineUseCase: ToggleRoutineUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = HomeState.INIT) + override val container: Container = container(initialState = HomeState.Companion.INIT) private val pendingChangesByDate = mutableMapOf>() private val routineSyncTrigger = MutableSharedFlow(extraBufferCapacity = 64) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/atom/EmotionRegisterButton.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/atom/EmotionRegisterButton.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/atom/EmotionRegisterButton.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/atom/EmotionRegisterButton.kt index fdceb3b1..5cbb6e7b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/atom/EmotionRegisterButton.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/atom/EmotionRegisterButton.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.atom +package com.threegap.bitnagil.presentation.screen.home.component.atom import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.height diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/RoutineItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/block/RoutineItem.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/RoutineItem.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/block/RoutineItem.kt index 7ecb619d..da7739bc 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/RoutineItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/block/RoutineItem.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.block +package com.threegap.bitnagil.presentation.screen.home.component.block import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/SubRoutinesItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/block/SubRoutinesItem.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/SubRoutinesItem.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/block/SubRoutinesItem.kt index b713b466..437aa1e8 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/SubRoutinesItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/block/SubRoutinesItem.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.block +package com.threegap.bitnagil.presentation.screen.home.component.block import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/CollapsibleHeader.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt similarity index 89% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/CollapsibleHeader.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt index 0065c6e0..3774d78d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/CollapsibleHeader.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.template +package com.threegap.bitnagil.presentation.screen.home.component.template import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -17,8 +17,8 @@ import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R -import com.threegap.bitnagil.presentation.home.component.atom.EmotionRegisterButton -import com.threegap.bitnagil.presentation.home.model.DailyEmotionUiModel +import com.threegap.bitnagil.presentation.screen.home.component.atom.EmotionRegisterButton +import com.threegap.bitnagil.presentation.screen.home.model.DailyEmotionUiModel @Composable fun CollapsibleHeader( @@ -71,7 +71,7 @@ private fun CollapsibleHeaderPreview() { CollapsibleHeader( modifier = Modifier.fillMaxWidth(), welcomeMessage = "대현님 오셨군요!\n오늘 기분은 어떤가요?!", - dailyEmotion = DailyEmotionUiModel.INIT, + dailyEmotion = DailyEmotionUiModel.Companion.INIT, onRegisterEmotionClick = {}, ) } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/EmptyRoutineView.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/EmptyRoutineView.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/EmptyRoutineView.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/EmptyRoutineView.kt index e0df124c..a0d7045c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/EmptyRoutineView.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/EmptyRoutineView.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.template +package com.threegap.bitnagil.presentation.screen.home.component.template import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineSection.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/RoutineSection.kt similarity index 87% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineSection.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/RoutineSection.kt index 5256e69b..76abc551 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineSection.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/RoutineSection.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.template +package com.threegap.bitnagil.presentation.screen.home.component.template import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row @@ -11,9 +11,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.domain.routine.model.DayOfWeek -import com.threegap.bitnagil.presentation.home.component.block.RoutineItem -import com.threegap.bitnagil.presentation.home.model.RoutineUiModel -import com.threegap.bitnagil.presentation.home.util.formatExecutionTime24Hour +import com.threegap.bitnagil.presentation.screen.home.component.block.RoutineItem +import com.threegap.bitnagil.presentation.screen.home.model.RoutineUiModel +import com.threegap.bitnagil.presentation.screen.home.util.formatExecutionTime24Hour @Composable fun RoutineSection( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/StickyHeader.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/StickyHeader.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/StickyHeader.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/StickyHeader.kt index 17c5be13..591fba47 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/StickyHeader.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/StickyHeader.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.template +package com.threegap.bitnagil.presentation.screen.home.component.template import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/WeeklyDatePicker.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt similarity index 93% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/WeeklyDatePicker.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt index c1c9d83a..3d6bdb0f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/WeeklyDatePicker.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.component.template +package com.threegap.bitnagil.presentation.screen.home.component.template import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.EaseInOutBack @@ -37,11 +37,11 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.home.model.RoutineScheduleUiModel -import com.threegap.bitnagil.presentation.home.util.formatDayOfMonth -import com.threegap.bitnagil.presentation.home.util.formatDayOfWeekShort -import com.threegap.bitnagil.presentation.home.util.formatMonthYear -import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays +import com.threegap.bitnagil.presentation.screen.home.model.RoutineScheduleUiModel +import com.threegap.bitnagil.presentation.screen.home.util.formatDayOfMonth +import com.threegap.bitnagil.presentation.screen.home.util.formatDayOfWeekShort +import com.threegap.bitnagil.presentation.screen.home.util.formatMonthYear +import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays import java.time.LocalDate @Composable @@ -197,7 +197,7 @@ private fun WeeklyDatePickerPreview() { WeeklyDatePicker( selectedDate = selectedDate, weeklyDates = selectedDate.getCurrentWeekDays(), - routines = RoutineScheduleUiModel.INIT, + routines = RoutineScheduleUiModel.Companion.INIT, onDateSelect = { selectedDate = it }, onPreviousWeekClick = { selectedDate = selectedDate.minusWeeks(1) }, onNextWeekClick = { selectedDate = selectedDate.plusWeeks(1) }, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/contract/HomeSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeSideEffect.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/contract/HomeSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeSideEffect.kt index 0d0682c4..128cc9cb 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/contract/HomeSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.contract +package com.threegap.bitnagil.presentation.screen.home.contract sealed interface HomeSideEffect { data object NavigateToGuide : HomeSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/contract/HomeState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt similarity index 58% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/contract/HomeState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt index 5baa825e..770dff7c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/contract/HomeState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt @@ -1,9 +1,9 @@ -package com.threegap.bitnagil.presentation.home.contract +package com.threegap.bitnagil.presentation.screen.home.contract -import com.threegap.bitnagil.presentation.home.model.DailyEmotionUiModel -import com.threegap.bitnagil.presentation.home.model.RoutineScheduleUiModel -import com.threegap.bitnagil.presentation.home.model.RoutineUiModel -import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays +import com.threegap.bitnagil.presentation.screen.home.model.DailyEmotionUiModel +import com.threegap.bitnagil.presentation.screen.home.model.RoutineScheduleUiModel +import com.threegap.bitnagil.presentation.screen.home.model.RoutineUiModel +import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays import java.time.LocalDate data class HomeState( @@ -24,10 +24,10 @@ data class HomeState( val INIT = HomeState( loadingCount = 0, userNickname = "", - dailyEmotion = DailyEmotionUiModel.INIT, + dailyEmotion = DailyEmotionUiModel.Companion.INIT, selectedDate = LocalDate.now(), currentWeeks = LocalDate.now().getCurrentWeekDays(), - routineSchedule = RoutineScheduleUiModel.INIT, + routineSchedule = RoutineScheduleUiModel.Companion.INIT, ) } } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/CollapsibleHeaderState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/CollapsibleHeaderState.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/CollapsibleHeaderState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/CollapsibleHeaderState.kt index f40c986e..bd0d7e26 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/CollapsibleHeaderState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/CollapsibleHeaderState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.model +package com.threegap.bitnagil.presentation.screen.home.model import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animate diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyEmotionUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/DailyEmotionUiModel.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyEmotionUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/DailyEmotionUiModel.kt index c6cd5121..dbf22cec 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyEmotionUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/DailyEmotionUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.model +package com.threegap.bitnagil.presentation.screen.home.model import com.threegap.bitnagil.domain.emotion.model.DailyEmotion import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyRoutinesUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/DailyRoutinesUiModel.kt similarity index 85% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyRoutinesUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/DailyRoutinesUiModel.kt index 5099a92a..f7ebb8a0 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyRoutinesUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/DailyRoutinesUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.model +package com.threegap.bitnagil.presentation.screen.home.model import com.threegap.bitnagil.domain.routine.model.DailyRoutines diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineScheduleUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/RoutineScheduleUiModel.kt similarity index 88% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineScheduleUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/RoutineScheduleUiModel.kt index 9966a0a6..9037eb9f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineScheduleUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/RoutineScheduleUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.model +package com.threegap.bitnagil.presentation.screen.home.model import com.threegap.bitnagil.domain.routine.model.RoutineSchedule diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/RoutineUiModel.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/RoutineUiModel.kt index 07e56276..29e7af3d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/RoutineUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.model +package com.threegap.bitnagil.presentation.screen.home.model import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.routine.model.DayOfWeek diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/ToggleStrategy.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/ToggleStrategy.kt similarity index 67% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/ToggleStrategy.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/ToggleStrategy.kt index 29dbb0d8..9e8b9ad6 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/ToggleStrategy.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/model/ToggleStrategy.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.model +package com.threegap.bitnagil.presentation.screen.home.model sealed interface ToggleStrategy { data object Main : ToggleStrategy diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/util/LocalDateExtension.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/util/LocalDateExtension.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/home/util/LocalDateExtension.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/util/LocalDateExtension.kt index 7cbe1bb1..474a764f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/util/LocalDateExtension.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/util/LocalDateExtension.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.home.util +package com.threegap.bitnagil.presentation.screen.home.util import java.time.DayOfWeek import java.time.LocalDate From b2ce7579fbf86ac4f577fda768378e8aa26ec6c5 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Wed, 25 Feb 2026 22:01:03 +0900 Subject: [PATCH 02/13] =?UTF-8?q?REFACTOR:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8,?= =?UTF-8?q?=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80,=20=EC=98=A8?= =?UTF-8?q?=EB=B3=B4=EB=94=A9,=20=EC=B6=94=EC=B2=9C=20=EB=A3=A8=ED=8B=B4?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/threegap/bitnagil/MainNavHost.kt | 8 ++++---- .../bitnagil/navigation/home/HomeNavHost.kt | 4 ++-- .../mypage/contract/MyPageSideEffect.kt | 3 --- .../model/navarg/OnBoardingScreenArg.kt | 6 ------ .../{ => screen}/login/LoginScreen.kt | 6 +++--- .../{ => screen}/login/LoginViewModel.kt | 8 ++++---- .../login/contract/LoginSideEffect.kt | 2 +- .../{ => screen}/login/contract/LoginState.kt | 2 +- .../login/kakao/KakaoLoginHandler.kt | 2 +- .../login/kakao/KakaoLoginHandlerImpl.kt | 2 +- .../{ => screen}/mypage/MyPageScreen.kt | 4 ++-- .../{ => screen}/mypage/MyPageViewModel.kt | 8 ++++---- .../screen/mypage/contract/MyPageSideEffect.kt | 3 +++ .../mypage/contract/MyPageState.kt | 2 +- .../onboarding/OnBoardingScreen.kt | 18 +++++++++--------- .../onboarding/OnBoardingViewModel.kt | 18 +++++++++--------- .../template/OnBoardingAbstractTemplate.kt | 4 ++-- .../template/OnBoardingIntroTemplate.kt | 2 +- .../template/OnBoardingSelectTemplate.kt | 4 ++-- .../onboarding/component/template/Preview.kt | 4 ++-- .../contract/OnBoardingSideEffect.kt | 2 +- .../onboarding/contract/OnBoardingState.kt | 6 +++--- .../model/OnBoardingAbstractTextItemUiModel.kt | 2 +- .../onboarding/model/OnBoardingItemUiModel.kt | 2 +- .../onboarding/model/OnBoardingPageInfo.kt | 7 +++---- .../onboarding/model/OnBoardingSetType.kt | 4 ++-- .../model/navarg/OnBoardingScreenArg.kt | 6 ++++++ .../recommendroutine/RecommendRoutineScreen.kt | 18 +++++++++--------- .../RecommendRoutineViewModel.kt | 16 ++++++++-------- .../component/atom/RecommendCategoryChip.kt | 2 +- .../block/EmotionRecommendRoutineButton.kt | 2 +- .../component/block/RecommendRoutineItem.kt | 6 +++--- .../template/EmptyRecommendRoutineView.kt | 2 +- .../template/RecommendLevelBottomSheet.kt | 2 +- .../contract/RecommendRoutineSideEffect.kt | 2 +- .../contract/RecommendRoutineState.kt | 4 ++-- .../model/RecommendRoutineUiModel.kt | 2 +- .../model/RecommendRoutinesUiModel.kt | 2 +- .../model/RecommendSubRoutineUiModel.kt | 2 +- 39 files changed, 99 insertions(+), 100 deletions(-) delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageSideEffect.kt delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/navarg/OnBoardingScreenArg.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/login/LoginScreen.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/login/LoginViewModel.kt (87%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/login/contract/LoginSideEffect.kt (69%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/login/contract/LoginState.kt (76%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/login/kakao/KakaoLoginHandler.kt (83%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/login/kakao/KakaoLoginHandlerImpl.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/mypage/MyPageScreen.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/mypage/MyPageViewModel.kt (78%) create mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/contract/MyPageSideEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/mypage/contract/MyPageState.kt (75%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/OnBoardingScreen.kt (89%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/OnBoardingViewModel.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/component/template/OnBoardingAbstractTemplate.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/component/template/OnBoardingIntroTemplate.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/component/template/OnBoardingSelectTemplate.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/component/template/Preview.kt (85%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/contract/OnBoardingSideEffect.kt (76%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/contract/OnBoardingState.kt (75%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/model/OnBoardingAbstractTextItemUiModel.kt (87%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/model/OnBoardingItemUiModel.kt (93%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/model/OnBoardingPageInfo.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/onboarding/model/OnBoardingSetType.kt (85%) create mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/navarg/OnBoardingScreenArg.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/RecommendRoutineScreen.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/RecommendRoutineViewModel.kt (85%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/component/atom/RecommendCategoryChip.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/component/block/EmotionRecommendRoutineButton.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/component/block/RecommendRoutineItem.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/component/template/EmptyRecommendRoutineView.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/component/template/RecommendLevelBottomSheet.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/contract/RecommendRoutineSideEffect.kt (72%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/contract/RecommendRoutineState.kt (85%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/model/RecommendRoutineUiModel.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/model/RecommendRoutinesUiModel.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/recommendroutine/model/RecommendSubRoutineUiModel.kt (81%) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index 1ace0c0b..22c54c7f 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -9,10 +9,10 @@ import androidx.navigation.toRoute import com.threegap.bitnagil.navigation.home.HomeNavHost import com.threegap.bitnagil.presentation.screen.emotion.EmotionScreenContainer import com.threegap.bitnagil.presentation.screen.guide.GuideScreenContainer -import com.threegap.bitnagil.presentation.login.LoginScreenContainer -import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer -import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel -import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg +import com.threegap.bitnagil.presentation.screen.login.LoginScreenContainer +import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingScreenContainer +import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingViewModel +import com.threegap.bitnagil.presentation.screen.onboarding.model.navarg.OnBoardingScreenArg import com.threegap.bitnagil.presentation.report.ReportScreenContainer import com.threegap.bitnagil.presentation.reportdetail.ReportDetailScreenContainer import com.threegap.bitnagil.presentation.reportdetail.ReportDetailViewModel diff --git a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt index 9740cd6f..3e0b0a79 100644 --- a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt @@ -30,8 +30,8 @@ import com.threegap.bitnagil.designsystem.component.atom.FloatingActionItem import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast import com.threegap.bitnagil.presentation.screen.home.HomeScreenContainer -import com.threegap.bitnagil.presentation.mypage.MyPageScreenContainer -import com.threegap.bitnagil.presentation.recommendroutine.RecommendRoutineScreenContainer +import com.threegap.bitnagil.presentation.screen.mypage.MyPageScreenContainer +import com.threegap.bitnagil.presentation.screen.recommendroutine.RecommendRoutineScreenContainer import com.threegap.bitnagil.util.setStatusBarContentColor @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageSideEffect.kt deleted file mode 100644 index 196446a0..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageSideEffect.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.threegap.bitnagil.presentation.mypage.contract - -sealed interface MyPageSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/navarg/OnBoardingScreenArg.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/navarg/OnBoardingScreenArg.kt deleted file mode 100644 index 6d485070..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/navarg/OnBoardingScreenArg.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.threegap.bitnagil.presentation.onboarding.model.navarg - -enum class OnBoardingScreenArg { - NEW, RESET, - ; -} diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginScreen.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginScreen.kt index f753ee89..21c1eccc 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.login +package com.threegap.bitnagil.presentation.screen.login import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -31,8 +31,8 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.login.contract.LoginSideEffect -import com.threegap.bitnagil.presentation.login.kakao.KakaoLoginHandlerImpl +import com.threegap.bitnagil.presentation.screen.login.contract.LoginSideEffect +import com.threegap.bitnagil.presentation.screen.login.kakao.KakaoLoginHandlerImpl import org.orbitmvi.orbit.compose.collectSideEffect @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt similarity index 87% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt index 686f7d37..9e86ca4f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt @@ -1,12 +1,12 @@ -package com.threegap.bitnagil.presentation.login +package com.threegap.bitnagil.presentation.screen.login import android.util.Log import androidx.lifecycle.ViewModel import com.kakao.sdk.auth.model.OAuthToken import com.threegap.bitnagil.domain.auth.model.UserRole import com.threegap.bitnagil.domain.auth.usecase.LoginUseCase -import com.threegap.bitnagil.presentation.login.contract.LoginSideEffect -import com.threegap.bitnagil.presentation.login.contract.LoginState +import com.threegap.bitnagil.presentation.screen.login.contract.LoginSideEffect +import com.threegap.bitnagil.presentation.screen.login.contract.LoginState import dagger.hilt.android.lifecycle.HiltViewModel import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost @@ -18,7 +18,7 @@ class LoginViewModel @Inject constructor( private val loginUseCase: LoginUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = LoginState.INIT) + override val container: Container = container(initialState = LoginState.Companion.INIT) fun kakaoLogin(token: OAuthToken?, error: Throwable?) { intent { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginSideEffect.kt similarity index 69% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginSideEffect.kt index ba5f64ef..b83a216e 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.login.contract +package com.threegap.bitnagil.presentation.screen.login.contract sealed interface LoginSideEffect { data object NavigateToHome : LoginSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginState.kt similarity index 76% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginState.kt index 13d451c4..f6ec6f0c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.login.contract +package com.threegap.bitnagil.presentation.screen.login.contract data class LoginState( val isLoading: Boolean, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandler.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandler.kt similarity index 83% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandler.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandler.kt index 74c2de78..a9373546 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandler.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandler.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.login.kakao +package com.threegap.bitnagil.presentation.screen.login.kakao import android.content.Context import com.kakao.sdk.auth.model.OAuthToken diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandlerImpl.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandlerImpl.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandlerImpl.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandlerImpl.kt index 03a1f95d..b6c223a1 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandlerImpl.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandlerImpl.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.login.kakao +package com.threegap.bitnagil.presentation.screen.login.kakao import android.content.Context import com.kakao.sdk.auth.model.OAuthToken diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageScreen.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageScreen.kt index 0111e740..260a7b8b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.mypage +package com.threegap.bitnagil.presentation.screen.mypage import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -28,7 +28,7 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton import com.threegap.bitnagil.designsystem.component.block.BitnagilOptionButton import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.mypage.contract.MyPageState +import com.threegap.bitnagil.presentation.screen.mypage.contract.MyPageState import org.orbitmvi.orbit.compose.collectAsState @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt similarity index 78% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt index 3ab9725a..271da73b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt @@ -1,9 +1,9 @@ -package com.threegap.bitnagil.presentation.mypage +package com.threegap.bitnagil.presentation.screen.mypage import androidx.lifecycle.ViewModel import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase -import com.threegap.bitnagil.presentation.mypage.contract.MyPageSideEffect -import com.threegap.bitnagil.presentation.mypage.contract.MyPageState +import com.threegap.bitnagil.presentation.screen.mypage.contract.MyPageSideEffect +import com.threegap.bitnagil.presentation.screen.mypage.contract.MyPageState import dagger.hilt.android.lifecycle.HiltViewModel import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost @@ -14,7 +14,7 @@ import javax.inject.Inject class MyPageViewModel @Inject constructor( private val fetchUserProfileUseCase: FetchUserProfileUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = MyPageState.INIT) + override val container: Container = container(initialState = MyPageState.Companion.INIT) init { loadMyPageInfo() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/contract/MyPageSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/contract/MyPageSideEffect.kt new file mode 100644 index 00000000..50365abf --- /dev/null +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/contract/MyPageSideEffect.kt @@ -0,0 +1,3 @@ +package com.threegap.bitnagil.presentation.screen.mypage.contract + +sealed interface MyPageSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/contract/MyPageState.kt similarity index 75% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/contract/MyPageState.kt index 76e68dfe..9d7ba853 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/contract/MyPageState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.mypage.contract +package com.threegap.bitnagil.presentation.screen.mypage.contract data class MyPageState( val name: String, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingScreen.kt similarity index 89% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingScreen.kt index 39bff7ef..8e489a78 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding +package com.threegap.bitnagil.presentation.screen.onboarding import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -12,14 +12,14 @@ import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.block.BitnagilProgressTopBar import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast -import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingAbstractTemplate -import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingIntroTemplate -import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingSelectTemplate -import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingSideEffect -import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingState -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingSetType +import com.threegap.bitnagil.presentation.screen.onboarding.component.template.OnBoardingAbstractTemplate +import com.threegap.bitnagil.presentation.screen.onboarding.component.template.OnBoardingIntroTemplate +import com.threegap.bitnagil.presentation.screen.onboarding.component.template.OnBoardingSelectTemplate +import com.threegap.bitnagil.presentation.screen.onboarding.contract.OnBoardingSideEffect +import com.threegap.bitnagil.presentation.screen.onboarding.contract.OnBoardingState +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingItemUiModel +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingPageInfo +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingSetType import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingViewModel.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingViewModel.kt index 76191453..bdace991 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingViewModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding +package com.threegap.bitnagil.presentation.screen.onboarding import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel @@ -9,13 +9,13 @@ import com.threegap.bitnagil.domain.onboarding.usecase.GetRecommendOnBoardingRou import com.threegap.bitnagil.domain.onboarding.usecase.GetUserOnBoardingUseCase import com.threegap.bitnagil.domain.onboarding.usecase.RegisterRecommendOnBoardingRoutinesUseCase import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase -import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingSideEffect -import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingState -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingSetType -import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg -import com.threegap.bitnagil.presentation.onboarding.model.toUiModel +import com.threegap.bitnagil.presentation.screen.onboarding.contract.OnBoardingSideEffect +import com.threegap.bitnagil.presentation.screen.onboarding.contract.OnBoardingState +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingItemUiModel +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingPageInfo +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingSetType +import com.threegap.bitnagil.presentation.screen.onboarding.model.navarg.OnBoardingScreenArg +import com.threegap.bitnagil.presentation.screen.onboarding.model.toUiModel import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject @@ -58,7 +58,7 @@ class OnBoardingViewModel @AssistedInject constructor( } private fun loadInitData() { - val onBoardingSetType = OnBoardingSetType.fromOnBoardingScreenArg(onBoardingArg) + val onBoardingSetType = OnBoardingSetType.Companion.fromOnBoardingScreenArg(onBoardingArg) when (onBoardingSetType) { OnBoardingSetType.NEW -> { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingAbstractTemplate.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingAbstractTemplate.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingAbstractTemplate.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingAbstractTemplate.kt index 5c92dc8d..09f9f42f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingAbstractTemplate.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingAbstractTemplate.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding.component.template +package com.threegap.bitnagil.presentation.screen.onboarding.component.template import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -38,7 +38,7 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.presentation.common.ninepatch.ninePatchBackgroundNode -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingAbstractTextItemUiModel +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingAbstractTextItemUiModel @Composable fun OnBoardingAbstractTemplate( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingIntroTemplate.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingIntroTemplate.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingIntroTemplate.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingIntroTemplate.kt index f54c46ec..ac939e5f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingIntroTemplate.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingIntroTemplate.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding.component.template +package com.threegap.bitnagil.presentation.screen.onboarding.component.template import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingSelectTemplate.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingSelectTemplate.kt index c0305dd7..5f11ad80 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingSelectTemplate.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding.component.template +package com.threegap.bitnagil.presentation.screen.onboarding.component.template import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -16,7 +16,7 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.atom.BitnagilSelectButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButtonColor -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingItemUiModel @Composable fun OnBoardingSelectTemplate( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/Preview.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/Preview.kt similarity index 85% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/Preview.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/Preview.kt index def6e45c..e2cef238 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/Preview.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/Preview.kt @@ -1,8 +1,8 @@ -package com.threegap.bitnagil.presentation.onboarding.component.template +package com.threegap.bitnagil.presentation.screen.onboarding.component.template import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingItemUiModel @Preview(showBackground = true) @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/contract/OnBoardingSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/contract/OnBoardingSideEffect.kt similarity index 76% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/contract/OnBoardingSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/contract/OnBoardingSideEffect.kt index 6f17298d..4b6badd2 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/contract/OnBoardingSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/contract/OnBoardingSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding.contract +package com.threegap.bitnagil.presentation.screen.onboarding.contract sealed interface OnBoardingSideEffect { data object MoveToPreviousScreen : OnBoardingSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/contract/OnBoardingState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/contract/OnBoardingState.kt similarity index 75% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/contract/OnBoardingState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/contract/OnBoardingState.kt index 7f8f76b4..5ab18bad 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/contract/OnBoardingState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/contract/OnBoardingState.kt @@ -1,8 +1,8 @@ -package com.threegap.bitnagil.presentation.onboarding.contract +package com.threegap.bitnagil.presentation.screen.onboarding.contract import android.os.Parcelable -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingSetType +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingPageInfo +import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingSetType import kotlinx.parcelize.Parcelize @Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingAbstractTextItemUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingAbstractTextItemUiModel.kt similarity index 87% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingAbstractTextItemUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingAbstractTextItemUiModel.kt index 08b5debe..c66b14d8 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingAbstractTextItemUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingAbstractTextItemUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding.model +package com.threegap.bitnagil.presentation.screen.onboarding.model import android.os.Parcelable import com.threegap.bitnagil.domain.onboarding.model.OnBoardingAbstractTextItem diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingItemUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingItemUiModel.kt similarity index 93% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingItemUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingItemUiModel.kt index 0f265884..a0bcc26d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingItemUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingItemUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.onboarding.model +package com.threegap.bitnagil.presentation.screen.onboarding.model import android.os.Parcelable import com.threegap.bitnagil.domain.onboarding.model.OnBoardingItem diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingPageInfo.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingPageInfo.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingPageInfo.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingPageInfo.kt index a0dd4ad2..0c92e123 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingPageInfo.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingPageInfo.kt @@ -1,9 +1,8 @@ -package com.threegap.bitnagil.presentation.onboarding.model +package com.threegap.bitnagil.presentation.screen.onboarding.model import android.os.Parcelable import androidx.compose.runtime.Stable import com.threegap.bitnagil.domain.onboarding.model.OnBoarding -import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo.SelectOnBoarding import kotlinx.parcelize.Parcelize @Parcelize @@ -88,8 +87,8 @@ sealed class OnBoardingPageInfo : Parcelable { } } -internal fun OnBoarding.toUiModel(): SelectOnBoarding = - SelectOnBoarding( +internal fun OnBoarding.toUiModel(): OnBoardingPageInfo.SelectOnBoarding = + OnBoardingPageInfo.SelectOnBoarding( id = this.id, title = this.title, description = this.description, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingSetType.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingSetType.kt similarity index 85% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingSetType.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingSetType.kt index 181aacd4..51ec373e 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingSetType.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/OnBoardingSetType.kt @@ -1,6 +1,6 @@ -package com.threegap.bitnagil.presentation.onboarding.model +package com.threegap.bitnagil.presentation.screen.onboarding.model -import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg +import com.threegap.bitnagil.presentation.screen.onboarding.model.navarg.OnBoardingScreenArg enum class OnBoardingSetType( val subText: String, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/navarg/OnBoardingScreenArg.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/navarg/OnBoardingScreenArg.kt new file mode 100644 index 00000000..31703214 --- /dev/null +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/navarg/OnBoardingScreenArg.kt @@ -0,0 +1,6 @@ +package com.threegap.bitnagil.presentation.screen.onboarding.model.navarg + +enum class OnBoardingScreenArg { + NEW, RESET, + ; +} diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt index 68323038..9dbc8894 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine +package com.threegap.bitnagil.presentation.screen.recommendroutine import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -35,13 +35,13 @@ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.presentation.common.extension.displayLevel import com.threegap.bitnagil.presentation.common.extension.displayTitle import com.threegap.bitnagil.presentation.common.extension.isVisible -import com.threegap.bitnagil.presentation.recommendroutine.component.atom.RecommendCategoryChip -import com.threegap.bitnagil.presentation.recommendroutine.component.block.EmotionRecommendRoutineButton -import com.threegap.bitnagil.presentation.recommendroutine.component.block.RecommendRoutineItem -import com.threegap.bitnagil.presentation.recommendroutine.component.template.EmptyRecommendRoutineView -import com.threegap.bitnagil.presentation.recommendroutine.component.template.RecommendLevelBottomSheet -import com.threegap.bitnagil.presentation.recommendroutine.contract.RecommendRoutineSideEffect -import com.threegap.bitnagil.presentation.recommendroutine.contract.RecommendRoutineState +import com.threegap.bitnagil.presentation.screen.recommendroutine.component.atom.RecommendCategoryChip +import com.threegap.bitnagil.presentation.screen.recommendroutine.component.block.EmotionRecommendRoutineButton +import com.threegap.bitnagil.presentation.screen.recommendroutine.component.block.RecommendRoutineItem +import com.threegap.bitnagil.presentation.screen.recommendroutine.component.template.EmptyRecommendRoutineView +import com.threegap.bitnagil.presentation.screen.recommendroutine.component.template.RecommendLevelBottomSheet +import com.threegap.bitnagil.presentation.screen.recommendroutine.contract.RecommendRoutineSideEffect +import com.threegap.bitnagil.presentation.screen.recommendroutine.contract.RecommendRoutineState import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect @@ -207,7 +207,7 @@ private fun RecommendRoutineScreen( @Composable private fun RoutineRecommendScreenPreview() { RecommendRoutineScreen( - uiState = RecommendRoutineState.INIT, + uiState = RecommendRoutineState.Companion.INIT, onCategorySelected = {}, onShowDifficultyBottomSheet = {}, onRecommendRoutineByEmotionClick = {}, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineViewModel.kt similarity index 85% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineViewModel.kt index dc663b41..548ffcbc 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineViewModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine +package com.threegap.bitnagil.presentation.screen.recommendroutine import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -6,11 +6,11 @@ import com.threegap.bitnagil.domain.emotion.usecase.GetEmotionChangeEventFlowUse import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel import com.threegap.bitnagil.domain.recommendroutine.usecase.FetchRecommendRoutinesUseCase -import com.threegap.bitnagil.presentation.recommendroutine.contract.RecommendRoutineSideEffect -import com.threegap.bitnagil.presentation.recommendroutine.contract.RecommendRoutineState -import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendRoutineUiModel -import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendRoutinesUiModel -import com.threegap.bitnagil.presentation.recommendroutine.model.toUiModel +import com.threegap.bitnagil.presentation.screen.recommendroutine.contract.RecommendRoutineSideEffect +import com.threegap.bitnagil.presentation.screen.recommendroutine.contract.RecommendRoutineState +import com.threegap.bitnagil.presentation.screen.recommendroutine.model.RecommendRoutineUiModel +import com.threegap.bitnagil.presentation.screen.recommendroutine.model.RecommendRoutinesUiModel +import com.threegap.bitnagil.presentation.screen.recommendroutine.model.toUiModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import org.orbitmvi.orbit.Container @@ -25,14 +25,14 @@ class RecommendRoutineViewModel @Inject constructor( ) : ContainerHost, ViewModel() { override val container: Container = - container(initialState = RecommendRoutineState.INIT) + container(initialState = RecommendRoutineState.Companion.INIT) init { loadRecommendRoutines() observeEmotionChangeEvent() } - private var recommendRoutines: RecommendRoutinesUiModel = RecommendRoutinesUiModel.INIT + private var recommendRoutines: RecommendRoutinesUiModel = RecommendRoutinesUiModel.Companion.INIT fun updateRoutineCategory(category: RecommendCategory) { intent { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/atom/RecommendCategoryChip.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/atom/RecommendCategoryChip.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/atom/RecommendCategoryChip.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/atom/RecommendCategoryChip.kt index 843ee5e5..719c3c35 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/atom/RecommendCategoryChip.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/atom/RecommendCategoryChip.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.component.atom +package com.threegap.bitnagil.presentation.screen.recommendroutine.component.atom import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/EmotionRecommendRoutineButton.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/EmotionRecommendRoutineButton.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/EmotionRecommendRoutineButton.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/EmotionRecommendRoutineButton.kt index a19f00da..3d73b5b1 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/EmotionRecommendRoutineButton.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/EmotionRecommendRoutineButton.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.component.block +package com.threegap.bitnagil.presentation.screen.recommendroutine.component.block import androidx.compose.foundation.Image import androidx.compose.foundation.background diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/RecommendRoutineItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/RecommendRoutineItem.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/RecommendRoutineItem.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/RecommendRoutineItem.kt index 0adfaefd..d4725d52 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/RecommendRoutineItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/RecommendRoutineItem.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.component.block +package com.threegap.bitnagil.presentation.screen.recommendroutine.component.block import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -24,8 +24,8 @@ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel import com.threegap.bitnagil.presentation.common.extension.displayColor import com.threegap.bitnagil.presentation.common.extension.displayIcon -import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendRoutineUiModel -import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendSubRoutineUiModel +import com.threegap.bitnagil.presentation.screen.recommendroutine.model.RecommendRoutineUiModel +import com.threegap.bitnagil.presentation.screen.recommendroutine.model.RecommendSubRoutineUiModel @Composable fun RecommendRoutineItem( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/template/EmptyRecommendRoutineView.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/EmptyRecommendRoutineView.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/template/EmptyRecommendRoutineView.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/EmptyRecommendRoutineView.kt index 0236c35f..fc0a1509 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/template/EmptyRecommendRoutineView.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/EmptyRecommendRoutineView.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.component.template +package com.threegap.bitnagil.presentation.screen.recommendroutine.component.template import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/template/RecommendLevelBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/RecommendLevelBottomSheet.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/template/RecommendLevelBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/RecommendLevelBottomSheet.kt index 4c5c38e2..da46db34 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/template/RecommendLevelBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/RecommendLevelBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.component.template +package com.threegap.bitnagil.presentation.screen.recommendroutine.component.template import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/contract/RecommendRoutineSideEffect.kt similarity index 72% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/contract/RecommendRoutineSideEffect.kt index 2b170381..5c99c789 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/contract/RecommendRoutineSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.contract +package com.threegap.bitnagil.presentation.screen.recommendroutine.contract sealed interface RecommendRoutineSideEffect { data object NavigateToEmotion : RecommendRoutineSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/contract/RecommendRoutineState.kt similarity index 85% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/contract/RecommendRoutineState.kt index e206eca9..18294133 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/contract/RecommendRoutineState.kt @@ -1,9 +1,9 @@ -package com.threegap.bitnagil.presentation.recommendroutine.contract +package com.threegap.bitnagil.presentation.screen.recommendroutine.contract import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel -import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendRoutineUiModel +import com.threegap.bitnagil.presentation.screen.recommendroutine.model.RecommendRoutineUiModel data class RecommendRoutineState( val isLoading: Boolean, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendRoutineUiModel.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutineUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendRoutineUiModel.kt index 8e1982de..d3989a4a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutineUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendRoutineUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.model +package com.threegap.bitnagil.presentation.screen.recommendroutine.model import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutinesUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendRoutinesUiModel.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutinesUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendRoutinesUiModel.kt index c6f270a1..a8067565 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutinesUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendRoutinesUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.model +package com.threegap.bitnagil.presentation.screen.recommendroutine.model import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendSubRoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendSubRoutineUiModel.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendSubRoutineUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendSubRoutineUiModel.kt index 043a1458..173dee61 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendSubRoutineUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/model/RecommendSubRoutineUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.recommendroutine.model +package com.threegap.bitnagil.presentation.screen.recommendroutine.model import com.threegap.bitnagil.domain.recommendroutine.model.RecommendSubRoutine From 5e9f3879fa17cee91e42137d2c5151b793c3ba62 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Wed, 25 Feb 2026 22:09:29 +0900 Subject: [PATCH 03/13] =?UTF-8?q?REFACTOR:=20=EC=A0=9C=EB=B3=B4=20?= =?UTF-8?q?=EC=83=81=EC=84=B8,=20=EC=A0=9C=EB=B3=B4=20=EB=AA=A9=EB=A1=9D,?= =?UTF-8?q?=20=EC=A0=9C=EB=B3=B4=20=EC=9E=91=EC=84=B1=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/threegap/bitnagil/MainNavHost.kt | 10 +++---- .../presentation/report/model/SubmitState.kt | 3 -- .../contract/ReportDetailSideEffect.kt | 3 -- .../contract/ReportHistorySideEffect.kt | 3 -- .../reportdetail/ReportDetailScreen.kt | 12 ++++---- .../reportdetail/ReportDetailViewModel.kt | 10 +++---- .../component/atom/ReportProcessBadge.kt | 2 +- .../block/ReportDetailLabeledContent.kt | 2 +- .../contract/ReportDetailSideEffect.kt | 3 ++ .../contract/ReportDetailState.kt | 2 +- .../model/navarg/ReportDetailScreenArg.kt | 2 +- .../reportdetail/util/LocalDateUtils.kt | 2 +- .../reporthistory/ReportHistoryScreen.kt | 19 +++++++------ .../reporthistory/ReportHistoryViewModel.kt | 14 +++++----- .../component/block/ReportHistoryItem.kt | 6 ++-- .../template/ReportCategoryBottomSheet.kt | 2 +- .../contract/ReportHistorySideEffect.kt | 3 ++ .../contract/ReportHistoryState.kt | 10 +++---- .../model/ReportHistoriesPerDayUiModel.kt | 2 +- .../model/ReportHistoryUiModel.kt | 2 +- .../reporthistory/model/ReportStatusFilter.kt | 2 +- .../model/ReportStatusFilterWithCount.kt | 2 +- .../reporthistory/util/LocalDateUtils.kt | 2 +- .../reportwrite}/ReportScreen.kt | 28 +++++++++---------- .../reportwrite}/ReportViewModel.kt | 10 +++---- .../reportwrite}/component/AddPhotoButton.kt | 2 +- .../component/CompleteReportCard.kt | 2 +- .../component/CurrentLocationInput.kt | 2 +- .../component/ImageSourceBottomSheet.kt | 2 +- .../reportwrite}/component/PhotoItem.kt | 2 +- .../component/ReportCategoryBottomSheet.kt | 2 +- .../component/ReportCategorySelector.kt | 2 +- .../reportwrite}/component/ReportField.kt | 2 +- .../template/CompleteReportContent.kt | 6 ++-- .../template/SubmittingReportContent.kt | 2 +- .../reportwrite}/contract/ReportSideEffect.kt | 2 +- .../reportwrite}/contract/ReportState.kt | 4 +-- .../screen/reportwrite/model/SubmitState.kt | 3 ++ 38 files changed, 95 insertions(+), 94 deletions(-) delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/report/model/SubmitState.kt delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailSideEffect.kt delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistorySideEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reportdetail/ReportDetailScreen.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reportdetail/ReportDetailViewModel.kt (80%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reportdetail/component/atom/ReportProcessBadge.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reportdetail/component/block/ReportDetailLabeledContent.kt (94%) create mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailSideEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reportdetail/contract/ReportDetailState.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reportdetail/model/navarg/ReportDetailScreenArg.kt (61%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reportdetail/util/LocalDateUtils.kt (79%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/ReportHistoryScreen.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/ReportHistoryViewModel.kt (82%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/component/block/ReportHistoryItem.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/component/template/ReportCategoryBottomSheet.kt (98%) create mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistorySideEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/contract/ReportHistoryState.kt (81%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/model/ReportHistoriesPerDayUiModel.kt (66%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/model/ReportHistoryUiModel.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/model/ReportStatusFilter.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/model/ReportStatusFilterWithCount.kt (83%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/reporthistory/util/LocalDateUtils.kt (78%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/ReportScreen.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/ReportViewModel.kt (93%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/AddPhotoButton.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/CompleteReportCard.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/CurrentLocationInput.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/ImageSourceBottomSheet.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/PhotoItem.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/ReportCategoryBottomSheet.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/ReportCategorySelector.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/ReportField.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/template/CompleteReportContent.kt (93%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/component/template/SubmittingReportContent.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/contract/ReportSideEffect.kt (66%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{report => screen/reportwrite}/contract/ReportState.kt (91%) create mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/model/SubmitState.kt diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index 22c54c7f..dc5fe60b 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -13,11 +13,11 @@ import com.threegap.bitnagil.presentation.screen.login.LoginScreenContainer import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingScreenContainer import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingViewModel import com.threegap.bitnagil.presentation.screen.onboarding.model.navarg.OnBoardingScreenArg -import com.threegap.bitnagil.presentation.report.ReportScreenContainer -import com.threegap.bitnagil.presentation.reportdetail.ReportDetailScreenContainer -import com.threegap.bitnagil.presentation.reportdetail.ReportDetailViewModel -import com.threegap.bitnagil.presentation.reportdetail.model.navarg.ReportDetailScreenArg -import com.threegap.bitnagil.presentation.reporthistory.ReportHistoryScreenContainer +import com.threegap.bitnagil.presentation.screen.reportwrite.ReportScreenContainer +import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailScreenContainer +import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewModel +import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg +import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer import com.threegap.bitnagil.presentation.setting.SettingScreenContainer import com.threegap.bitnagil.presentation.splash.SplashScreenContainer diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/model/SubmitState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/report/model/SubmitState.kt deleted file mode 100644 index fe0212bd..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/model/SubmitState.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.threegap.bitnagil.presentation.report.model - -enum class SubmitState { IDLE, SUBMITTING, COMPLETE } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailSideEffect.kt deleted file mode 100644 index 6cdb8a22..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailSideEffect.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.threegap.bitnagil.presentation.reportdetail.contract - -interface ReportDetailSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistorySideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistorySideEffect.kt deleted file mode 100644 index 5a0b6908..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistorySideEffect.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.threegap.bitnagil.presentation.reporthistory.contract - -sealed interface ReportHistorySideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt index 1fdfe9d4..87ca29e5 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reportdetail +package com.threegap.bitnagil.presentation.screen.reportdetail import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -28,10 +28,10 @@ import coil3.request.ImageRequest import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.reportdetail.component.atom.ReportProcessBadge -import com.threegap.bitnagil.presentation.reportdetail.component.block.ReportDetailLabeledContent -import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailState -import com.threegap.bitnagil.presentation.reportdetail.util.toPresentationFormatInReportDetail +import com.threegap.bitnagil.presentation.screen.reportdetail.component.atom.ReportProcessBadge +import com.threegap.bitnagil.presentation.screen.reportdetail.component.block.ReportDetailLabeledContent +import com.threegap.bitnagil.presentation.screen.reportdetail.contract.ReportDetailState +import com.threegap.bitnagil.presentation.screen.reportdetail.util.toPresentationFormatInReportDetail import org.orbitmvi.orbit.compose.collectAsState @Composable @@ -141,7 +141,7 @@ private fun ReportDetailScreen( private fun ReportDetailScreenPreview() { BitnagilTheme { ReportDetailScreen( - state = ReportDetailState.Init.copy( + state = ReportDetailState.Companion.Init.copy( reportContent = "Lorem ipsum dolor sit amet, " + "consectetur adipiscing elit," + " sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " + diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt similarity index 80% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt index 532fe214..77a5faff 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt @@ -1,10 +1,10 @@ -package com.threegap.bitnagil.presentation.reportdetail +package com.threegap.bitnagil.presentation.screen.reportdetail import androidx.lifecycle.ViewModel import com.threegap.bitnagil.domain.report.usecase.GetReportUseCase -import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailSideEffect -import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailState -import com.threegap.bitnagil.presentation.reportdetail.model.navarg.ReportDetailScreenArg +import com.threegap.bitnagil.presentation.screen.reportdetail.contract.ReportDetailSideEffect +import com.threegap.bitnagil.presentation.screen.reportdetail.contract.ReportDetailState +import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject @@ -18,7 +18,7 @@ class ReportDetailViewModel @AssistedInject constructor( private val getReportDetailUseCase: GetReportUseCase, @Assisted private val reportDetailArg: ReportDetailScreenArg, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = ReportDetailState.Init) + override val container: Container = container(initialState = ReportDetailState.Companion.Init) @AssistedFactory interface Factory { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/atom/ReportProcessBadge.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/atom/ReportProcessBadge.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.kt index e2e1a3d5..6972df6b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/atom/ReportProcessBadge.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reportdetail.component.atom +package com.threegap.bitnagil.presentation.screen.reportdetail.component.atom import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/block/ReportDetailLabeledContent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/block/ReportDetailLabeledContent.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/block/ReportDetailLabeledContent.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/block/ReportDetailLabeledContent.kt index e623068c..647b308b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/block/ReportDetailLabeledContent.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/block/ReportDetailLabeledContent.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reportdetail.component.block +package com.threegap.bitnagil.presentation.screen.reportdetail.component.block import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailSideEffect.kt new file mode 100644 index 00000000..22717861 --- /dev/null +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailSideEffect.kt @@ -0,0 +1,3 @@ +package com.threegap.bitnagil.presentation.screen.reportdetail.contract + +interface ReportDetailSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailState.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailState.kt index 66292845..890b8a99 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reportdetail.contract +package com.threegap.bitnagil.presentation.screen.reportdetail.contract import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.model.ReportStatus diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/model/navarg/ReportDetailScreenArg.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/model/navarg/ReportDetailScreenArg.kt similarity index 61% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/model/navarg/ReportDetailScreenArg.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/model/navarg/ReportDetailScreenArg.kt index 60a68ad1..fd5d547f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/model/navarg/ReportDetailScreenArg.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/model/navarg/ReportDetailScreenArg.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reportdetail.model.navarg +package com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg import kotlinx.serialization.Serializable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/util/LocalDateUtils.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/util/LocalDateUtils.kt similarity index 79% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/util/LocalDateUtils.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/util/LocalDateUtils.kt index 67f3c93f..0ae77cae 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/util/LocalDateUtils.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/util/LocalDateUtils.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reportdetail.util +package com.threegap.bitnagil.presentation.screen.reportdetail.util import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt index d84eb94d..ac917788 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory +package com.threegap.bitnagil.presentation.screen.reporthistory import androidx.compose.foundation.background import androidx.compose.foundation.horizontalScroll @@ -35,15 +35,16 @@ import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.model.ReportStatus import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.reporthistory.component.block.ReportHistoryItem -import com.threegap.bitnagil.presentation.reporthistory.component.template.ReportCategoryBottomSheet -import com.threegap.bitnagil.presentation.reporthistory.contract.ReportHistoryState -import com.threegap.bitnagil.presentation.reporthistory.model.ReportHistoriesPerDayUiModel -import com.threegap.bitnagil.presentation.reporthistory.model.ReportHistoryUiModel -import com.threegap.bitnagil.presentation.reporthistory.model.ReportStatusFilter -import com.threegap.bitnagil.presentation.reporthistory.util.toPresentationFormat +import com.threegap.bitnagil.presentation.screen.reporthistory.component.block.ReportHistoryItem +import com.threegap.bitnagil.presentation.screen.reporthistory.component.template.ReportCategoryBottomSheet +import com.threegap.bitnagil.presentation.screen.reporthistory.contract.ReportHistoryState +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportHistoriesPerDayUiModel +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportHistoryUiModel +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportStatusFilter +import com.threegap.bitnagil.presentation.screen.reporthistory.util.toPresentationFormat import org.orbitmvi.orbit.compose.collectAsState import java.time.LocalDate +import kotlin.collections.forEach @Composable fun ReportHistoryScreenContainer( @@ -198,7 +199,7 @@ private fun ReportHistoryScreen( private fun ReportHistoryScreenPreview() { BitnagilTheme { ReportHistoryScreen( - state = ReportHistoryState.Init.copy( + state = ReportHistoryState.Companion.Init.copy( reportHistoriesPerDays = List(10) { ReportHistoriesPerDayUiModel( date = LocalDate.now(), diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryViewModel.kt similarity index 82% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryViewModel.kt index 63e00c58..d996a513 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryViewModel.kt @@ -1,13 +1,13 @@ -package com.threegap.bitnagil.presentation.reporthistory +package com.threegap.bitnagil.presentation.screen.reporthistory import androidx.lifecycle.ViewModel import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.usecase.GetReportHistoriesUseCase -import com.threegap.bitnagil.presentation.reporthistory.contract.ReportHistorySideEffect -import com.threegap.bitnagil.presentation.reporthistory.contract.ReportHistoryState -import com.threegap.bitnagil.presentation.reporthistory.model.ReportHistoriesPerDayUiModel -import com.threegap.bitnagil.presentation.reporthistory.model.ReportStatusFilter -import com.threegap.bitnagil.presentation.reporthistory.model.toUiModel +import com.threegap.bitnagil.presentation.screen.reporthistory.contract.ReportHistorySideEffect +import com.threegap.bitnagil.presentation.screen.reporthistory.contract.ReportHistoryState +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportHistoriesPerDayUiModel +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportStatusFilter +import com.threegap.bitnagil.presentation.screen.reporthistory.model.toUiModel import dagger.hilt.android.lifecycle.HiltViewModel import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost @@ -18,7 +18,7 @@ import javax.inject.Inject class ReportHistoryViewModel @Inject constructor( private val getReportHistoriesUseCase: GetReportHistoriesUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = ReportHistoryState.Init) + override val container: Container = container(initialState = ReportHistoryState.Companion.Init) init { loadReportHistories() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/component/block/ReportHistoryItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/block/ReportHistoryItem.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/component/block/ReportHistoryItem.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/block/ReportHistoryItem.kt index 8732c60f..3a203048 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/component/block/ReportHistoryItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/block/ReportHistoryItem.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory.component.block +package com.threegap.bitnagil.presentation.screen.reporthistory.component.block import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -28,8 +28,8 @@ import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.model.ReportStatus import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.reportdetail.component.atom.ReportProcessBadge -import com.threegap.bitnagil.presentation.reporthistory.model.ReportHistoryUiModel +import com.threegap.bitnagil.presentation.screen.reportdetail.component.atom.ReportProcessBadge +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportHistoryUiModel @Composable fun ReportHistoryItem( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/component/template/ReportCategoryBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/template/ReportCategoryBottomSheet.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/component/template/ReportCategoryBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/template/ReportCategoryBottomSheet.kt index af4603c7..9427bc5b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/component/template/ReportCategoryBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/template/ReportCategoryBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory.component.template +package com.threegap.bitnagil.presentation.screen.reporthistory.component.template import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistorySideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistorySideEffect.kt new file mode 100644 index 00000000..e0931bdf --- /dev/null +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistorySideEffect.kt @@ -0,0 +1,3 @@ +package com.threegap.bitnagil.presentation.screen.reporthistory.contract + +sealed interface ReportHistorySideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistoryState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistoryState.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistoryState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistoryState.kt index 50ba53f7..7da025d5 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistoryState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistoryState.kt @@ -1,9 +1,9 @@ -package com.threegap.bitnagil.presentation.reporthistory.contract +package com.threegap.bitnagil.presentation.screen.reporthistory.contract import com.threegap.bitnagil.domain.report.model.ReportCategory -import com.threegap.bitnagil.presentation.reporthistory.model.ReportHistoriesPerDayUiModel -import com.threegap.bitnagil.presentation.reporthistory.model.ReportStatusFilter -import com.threegap.bitnagil.presentation.reporthistory.model.ReportStatusFilterWithCount +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportHistoriesPerDayUiModel +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportStatusFilter +import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportStatusFilterWithCount data class ReportHistoryState( val selectedReportCategory: ReportCategory?, @@ -32,7 +32,7 @@ data class ReportHistoryState( } val reportStatusFilterWithCounts: List = - ReportStatusFilter.values().map { filter -> + ReportStatusFilter.Companion.values().map { filter -> val count = reportHistoriesPerDays.sumOf { day -> day.reports.count { report -> filter.matches(report.status) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoriesPerDayUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportHistoriesPerDayUiModel.kt similarity index 66% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoriesPerDayUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportHistoriesPerDayUiModel.kt index 4f233ba4..5b73c857 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoriesPerDayUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportHistoriesPerDayUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory.model +package com.threegap.bitnagil.presentation.screen.reporthistory.model import java.time.LocalDate diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoryUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportHistoryUiModel.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoryUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportHistoryUiModel.kt index b89977e2..da72c5af 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoryUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportHistoryUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory.model +package com.threegap.bitnagil.presentation.screen.reporthistory.model import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.model.ReportItem diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportStatusFilter.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilter.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportStatusFilter.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilter.kt index 711d4a2a..b331a37c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportStatusFilter.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilter.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory.model +package com.threegap.bitnagil.presentation.screen.reporthistory.model import com.threegap.bitnagil.domain.report.model.ReportStatus import com.threegap.bitnagil.presentation.common.extension.displayTitle diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportStatusFilterWithCount.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilterWithCount.kt similarity index 83% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportStatusFilterWithCount.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilterWithCount.kt index 99286100..c398487a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportStatusFilterWithCount.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilterWithCount.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory.model +package com.threegap.bitnagil.presentation.screen.reporthistory.model data class ReportStatusFilterWithCount( val filter: ReportStatusFilter, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/util/LocalDateUtils.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/util/LocalDateUtils.kt similarity index 78% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/util/LocalDateUtils.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/util/LocalDateUtils.kt index 9d9b54fd..7ea5d916 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/util/LocalDateUtils.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/util/LocalDateUtils.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.reporthistory.util +package com.threegap.bitnagil.presentation.screen.reporthistory.util import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt index a40d8767..3b6b42ce 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report +package com.threegap.bitnagil.presentation.screen.reportwrite import android.Manifest import android.net.Uri @@ -55,19 +55,19 @@ import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.presentation.common.extension.displayTitle import com.threegap.bitnagil.presentation.common.file.createCameraImageUri import com.threegap.bitnagil.presentation.common.premission.rememberPermissionHandler -import com.threegap.bitnagil.presentation.report.component.AddPhotoButton -import com.threegap.bitnagil.presentation.report.component.CurrentLocationInput -import com.threegap.bitnagil.presentation.report.component.ImageSourceBottomSheet -import com.threegap.bitnagil.presentation.report.component.PhotoItem -import com.threegap.bitnagil.presentation.report.component.ReportCategoryBottomSheet -import com.threegap.bitnagil.presentation.report.component.ReportCategorySelector -import com.threegap.bitnagil.presentation.report.component.ReportField -import com.threegap.bitnagil.presentation.report.component.template.CompleteReportContent -import com.threegap.bitnagil.presentation.report.component.template.SubmittingReportContent -import com.threegap.bitnagil.presentation.report.contract.ReportSideEffect -import com.threegap.bitnagil.presentation.report.contract.ReportState -import com.threegap.bitnagil.presentation.report.contract.ReportState.Companion.MAX_IMAGE_COUNT -import com.threegap.bitnagil.presentation.report.model.SubmitState +import com.threegap.bitnagil.presentation.screen.reportwrite.component.AddPhotoButton +import com.threegap.bitnagil.presentation.screen.reportwrite.component.CurrentLocationInput +import com.threegap.bitnagil.presentation.screen.reportwrite.component.ImageSourceBottomSheet +import com.threegap.bitnagil.presentation.screen.reportwrite.component.PhotoItem +import com.threegap.bitnagil.presentation.screen.reportwrite.component.ReportCategoryBottomSheet +import com.threegap.bitnagil.presentation.screen.reportwrite.component.ReportCategorySelector +import com.threegap.bitnagil.presentation.screen.reportwrite.component.ReportField +import com.threegap.bitnagil.presentation.screen.reportwrite.component.template.CompleteReportContent +import com.threegap.bitnagil.presentation.screen.reportwrite.component.template.SubmittingReportContent +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportSideEffect +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState.Companion.MAX_IMAGE_COUNT +import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState import kotlinx.coroutines.delay import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt similarity index 93% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt index d5d3de75..65bc3565 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report +package com.threegap.bitnagil.presentation.screen.reportwrite import android.content.Context import android.net.Uri @@ -9,10 +9,10 @@ import com.threegap.bitnagil.domain.report.model.Report import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.usecase.SubmitReportUseCase import com.threegap.bitnagil.presentation.common.file.convertUriToImageFile -import com.threegap.bitnagil.presentation.report.contract.ReportSideEffect -import com.threegap.bitnagil.presentation.report.contract.ReportState -import com.threegap.bitnagil.presentation.report.contract.ReportState.Companion.MAX_IMAGE_COUNT -import com.threegap.bitnagil.presentation.report.model.SubmitState +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportSideEffect +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState.Companion.MAX_IMAGE_COUNT +import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.async diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/AddPhotoButton.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/AddPhotoButton.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/AddPhotoButton.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/AddPhotoButton.kt index 7636f45e..8bd157d6 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/AddPhotoButton.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/AddPhotoButton.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CompleteReportCard.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CompleteReportCard.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt index 0d8efc66..46f57bdd 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CompleteReportCard.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CurrentLocationInput.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CurrentLocationInput.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CurrentLocationInput.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CurrentLocationInput.kt index 4018576f..c5933b24 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CurrentLocationInput.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CurrentLocationInput.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ImageSourceBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ImageSourceBottomSheet.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ImageSourceBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ImageSourceBottomSheet.kt index 52229094..3a9252cb 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ImageSourceBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ImageSourceBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/PhotoItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/PhotoItem.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/PhotoItem.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/PhotoItem.kt index 44b0f581..7d9d2f98 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/PhotoItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/PhotoItem.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import android.net.Uri import androidx.compose.foundation.background diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategoryBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategoryBottomSheet.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategoryBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategoryBottomSheet.kt index 7b1a96cc..0cf5acf2 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategoryBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategoryBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategorySelector.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategorySelector.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategorySelector.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategorySelector.kt index daeaa1cb..b1f4f09d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategorySelector.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategorySelector.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportField.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportField.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportField.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportField.kt index d7321e5b..f23bae5b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportField.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportField.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component +package com.threegap.bitnagil.presentation.screen.reportwrite.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/template/CompleteReportContent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt similarity index 93% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/template/CompleteReportContent.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt index c1bcad01..345c025f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/template/CompleteReportContent.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component.template +package com.threegap.bitnagil.presentation.screen.reportwrite.component.template import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -24,8 +24,8 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButtonColor -import com.threegap.bitnagil.presentation.report.component.CompleteReportCard -import com.threegap.bitnagil.presentation.report.contract.ReportState +import com.threegap.bitnagil.presentation.screen.reportwrite.component.CompleteReportCard +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState @Composable fun CompleteReportContent( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/template/SubmittingReportContent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/SubmittingReportContent.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/template/SubmittingReportContent.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/SubmittingReportContent.kt index 84b75644..c451da35 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/template/SubmittingReportContent.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/SubmittingReportContent.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.component.template +package com.threegap.bitnagil.presentation.screen.reportwrite.component.template import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/contract/ReportSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportSideEffect.kt similarity index 66% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/contract/ReportSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportSideEffect.kt index 348a6d5a..6ede534a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/contract/ReportSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.report.contract +package com.threegap.bitnagil.presentation.screen.reportwrite.contract sealed interface ReportSideEffect { data object NavigateToBack : ReportSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/contract/ReportState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportState.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/report/contract/ReportState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportState.kt index 02661936..43bfd23a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/report/contract/ReportState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportState.kt @@ -1,8 +1,8 @@ -package com.threegap.bitnagil.presentation.report.contract +package com.threegap.bitnagil.presentation.screen.reportwrite.contract import android.net.Uri import com.threegap.bitnagil.domain.report.model.ReportCategory -import com.threegap.bitnagil.presentation.report.model.SubmitState +import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState data class ReportState( val reportImages: List, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/model/SubmitState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/model/SubmitState.kt new file mode 100644 index 00000000..3fcd0481 --- /dev/null +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/model/SubmitState.kt @@ -0,0 +1,3 @@ +package com.threegap.bitnagil.presentation.screen.reportwrite.model + +enum class SubmitState { IDLE, SUBMITTING, COMPLETE } From 704cfb03a49361a07f2c57773dc4c0f6c870de48 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Wed, 25 Feb 2026 22:14:37 +0900 Subject: [PATCH 04/13] =?UTF-8?q?REFACTOR:=20=EB=A3=A8=ED=8B=B4=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D,=20=EB=A3=A8=ED=8B=B4=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/threegap/bitnagil/MainNavHost.kt | 8 ++--- .../routinelist/RoutineListScreen.kt | 20 ++++++------ .../routinelist/RoutineListViewModel.kt | 10 +++--- .../template/DeleteConfirmBottomSheet.kt | 2 +- .../template/EditConfirmBottomSheet.kt | 2 +- .../template/EmptyRoutineListView.kt | 2 +- .../component/template/RoutineDetailsCard.kt | 4 +-- .../component/template/WeeklyDatePicker.kt | 2 +- .../contract/RoutineListSideEffect.kt | 2 +- .../routinelist/contract/RoutineListState.kt | 6 ++-- .../routinelist/model/DailyRoutinesUiModel.kt | 2 +- .../model/RoutineListStatePreviewProvider.kt | 4 +-- .../model/RoutineScheduleUiModel.kt | 2 +- .../routinelist/model/RoutineUiModel.kt | 2 +- .../routinewrite}/WriteRoutineScreen.kt | 32 +++++++++---------- .../routinewrite}/WriteRoutineViewModel.kt | 24 +++++++------- .../component/atom/namefield/NameField.kt | 2 +- .../component/atom/selectcell/SelectCell.kt | 2 +- .../writeroutinebutton/WriteRoutineButton.kt | 2 +- .../expandablecontent/ExpandableContent.kt | 2 +- .../block/labeledcheckbox/LabeledCheckBox.kt | 2 +- .../routinedetailrow/RoutineDetailRow.kt | 4 +-- .../block/subroutinefield/SubRoutineField.kt | 5 +-- .../DatePickerBottomSheet.kt | 6 ++-- .../model/CalendarUtils.kt | 2 +- .../TimePickerBottomSheet.kt | 2 +- .../contract/WriteRoutineSideEffect.kt | 2 +- .../contract/WriteRoutineState.kt | 14 ++++---- .../routinewrite}/model/Date.kt | 2 +- .../routinewrite}/model/Day.kt | 2 +- .../routinewrite}/model/RepeatType.kt | 2 +- .../routinewrite}/model/SelectableDay.kt | 2 +- .../routinewrite}/model/SubRoutineUiModel.kt | 2 +- .../routinewrite}/model/Time.kt | 2 +- .../routinewrite}/model/WriteRoutineType.kt | 2 +- .../model/navarg/WriteRoutineScreenArg.kt | 2 +- 36 files changed, 93 insertions(+), 92 deletions(-) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/RoutineListScreen.kt (86%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/RoutineListViewModel.kt (93%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/component/template/DeleteConfirmBottomSheet.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/component/template/EditConfirmBottomSheet.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/component/template/EmptyRoutineListView.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/component/template/RoutineDetailsCard.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/component/template/WeeklyDatePicker.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/contract/RoutineListSideEffect.kt (83%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/contract/RoutineListState.kt (79%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/model/DailyRoutinesUiModel.kt (80%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/model/RoutineListStatePreviewProvider.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/model/RoutineScheduleUiModel.kt (87%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/routinelist/model/RoutineUiModel.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/WriteRoutineScreen.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/WriteRoutineViewModel.kt (93%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/atom/namefield/NameField.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/atom/selectcell/SelectCell.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/atom/writeroutinebutton/WriteRoutineButton.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/block/expandablecontent/ExpandableContent.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/block/labeledcheckbox/LabeledCheckBox.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/block/routinedetailrow/RoutineDetailRow.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/block/subroutinefield/SubRoutineField.kt (93%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/template/datepickerbottomsheet/DatePickerBottomSheet.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/template/datepickerbottomsheet/model/CalendarUtils.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/contract/WriteRoutineSideEffect.kt (71%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/contract/WriteRoutineState.kt (86%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/Date.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/Day.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/RepeatType.kt (65%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/SelectableDay.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/SubRoutineUiModel.kt (81%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/Time.kt (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/WriteRoutineType.kt (80%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{writeroutine => screen/routinewrite}/model/navarg/WriteRoutineScreenArg.kt (80%) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index dc5fe60b..92377cd4 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -18,15 +18,15 @@ import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailScreen import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewModel import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer -import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer +import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer import com.threegap.bitnagil.presentation.setting.SettingScreenContainer import com.threegap.bitnagil.presentation.splash.SplashScreenContainer import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen import com.threegap.bitnagil.presentation.withdrawal.WithdrawalScreenContainer -import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineScreenContainer -import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineViewModel -import com.threegap.bitnagil.presentation.writeroutine.model.navarg.WriteRoutineScreenArg +import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer +import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel +import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg @Composable fun MainNavHost( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt similarity index 86% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt index 5425b596..779a8c93 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist +package com.threegap.bitnagil.presentation.screen.routinelist import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -22,15 +22,15 @@ import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast -import com.threegap.bitnagil.presentation.routinelist.component.template.DeleteConfirmBottomSheet -import com.threegap.bitnagil.presentation.routinelist.component.template.EditConfirmBottomSheet -import com.threegap.bitnagil.presentation.routinelist.component.template.EmptyRoutineListView -import com.threegap.bitnagil.presentation.routinelist.component.template.RoutineDetailsCard -import com.threegap.bitnagil.presentation.routinelist.component.template.WeeklyDatePicker -import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListSideEffect -import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState -import com.threegap.bitnagil.presentation.routinelist.model.RoutineListStatePreviewProvider -import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel +import com.threegap.bitnagil.presentation.screen.routinelist.component.template.DeleteConfirmBottomSheet +import com.threegap.bitnagil.presentation.screen.routinelist.component.template.EditConfirmBottomSheet +import com.threegap.bitnagil.presentation.screen.routinelist.component.template.EmptyRoutineListView +import com.threegap.bitnagil.presentation.screen.routinelist.component.template.RoutineDetailsCard +import com.threegap.bitnagil.presentation.screen.routinelist.component.template.WeeklyDatePicker +import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListSideEffect +import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListState +import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineListStatePreviewProvider +import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect import java.time.LocalDate diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListViewModel.kt similarity index 93% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListViewModel.kt index 7bddca7f..aa9707bb 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListViewModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist +package com.threegap.bitnagil.presentation.screen.routinelist import android.util.Log import androidx.lifecycle.SavedStateHandle @@ -9,10 +9,10 @@ import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineUseCase import com.threegap.bitnagil.domain.routine.usecase.FetchWeeklyRoutinesUseCase import com.threegap.bitnagil.domain.writeroutine.usecase.GetWriteRoutineEventFlowUseCase import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays -import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListSideEffect -import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState -import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel -import com.threegap.bitnagil.presentation.routinelist.model.toUiModel +import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListSideEffect +import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListState +import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel +import com.threegap.bitnagil.presentation.screen.routinelist.model.toUiModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import org.orbitmvi.orbit.Container diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/DeleteConfirmBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/DeleteConfirmBottomSheet.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/DeleteConfirmBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/DeleteConfirmBottomSheet.kt index cfde66ae..ecc7d6d5 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/DeleteConfirmBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/DeleteConfirmBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.component.template +package com.threegap.bitnagil.presentation.screen.routinelist.component.template import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EditConfirmBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EditConfirmBottomSheet.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EditConfirmBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EditConfirmBottomSheet.kt index 036dbb3f..626fc479 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EditConfirmBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EditConfirmBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.component.template +package com.threegap.bitnagil.presentation.screen.routinelist.component.template import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EmptyRoutineListView.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EmptyRoutineListView.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EmptyRoutineListView.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EmptyRoutineListView.kt index 052ddeb8..8b98ecab 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/EmptyRoutineListView.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/EmptyRoutineListView.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.component.template +package com.threegap.bitnagil.presentation.screen.routinelist.component.template import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/RoutineDetailsCard.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/RoutineDetailsCard.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt index 42a0f7b4..d71b7b6a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/RoutineDetailsCard.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.component.template +package com.threegap.bitnagil.presentation.screen.routinelist.component.template import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -24,7 +24,7 @@ import com.threegap.bitnagil.domain.routine.model.DayOfWeek import com.threegap.bitnagil.presentation.common.extension.displayColor import com.threegap.bitnagil.presentation.common.extension.displayIcon import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel +import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel @Composable fun RoutineDetailsCard( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/WeeklyDatePicker.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/WeeklyDatePicker.kt index a944824a..b6b3e2ff 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/WeeklyDatePicker.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.component.template +package com.threegap.bitnagil.presentation.screen.routinelist.component.template import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListSideEffect.kt similarity index 83% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListSideEffect.kt index 417a3465..ce93c373 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.contract +package com.threegap.bitnagil.presentation.screen.routinelist.contract sealed interface RoutineListSideEffect { data object NavigateToBack : RoutineListSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListState.kt similarity index 79% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListState.kt index 84a74018..acc4bd3c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/contract/RoutineListState.kt @@ -1,8 +1,8 @@ -package com.threegap.bitnagil.presentation.routinelist.contract +package com.threegap.bitnagil.presentation.screen.routinelist.contract import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays -import com.threegap.bitnagil.presentation.routinelist.model.RoutineScheduleUiModel -import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel +import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineScheduleUiModel +import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel import java.time.LocalDate data class RoutineListState( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/DailyRoutinesUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/DailyRoutinesUiModel.kt similarity index 80% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/DailyRoutinesUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/DailyRoutinesUiModel.kt index 46ab041a..0ee03fec 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/DailyRoutinesUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/DailyRoutinesUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.model +package com.threegap.bitnagil.presentation.screen.routinelist.model import com.threegap.bitnagil.domain.routine.model.DailyRoutines diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineListStatePreviewProvider.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineListStatePreviewProvider.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineListStatePreviewProvider.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineListStatePreviewProvider.kt index 14b6edbb..d09230fa 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineListStatePreviewProvider.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineListStatePreviewProvider.kt @@ -1,8 +1,8 @@ -package com.threegap.bitnagil.presentation.routinelist.model +package com.threegap.bitnagil.presentation.screen.routinelist.model import androidx.compose.ui.tooling.preview.PreviewParameterProvider import com.threegap.bitnagil.domain.routine.model.DayOfWeek -import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState +import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListState import java.time.LocalDate internal class RoutineListStatePreviewProvider : PreviewParameterProvider { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineScheduleUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineScheduleUiModel.kt similarity index 87% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineScheduleUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineScheduleUiModel.kt index c415490b..dd8607d5 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineScheduleUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineScheduleUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.model +package com.threegap.bitnagil.presentation.screen.routinelist.model import com.threegap.bitnagil.domain.routine.model.RoutineSchedule diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineUiModel.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineUiModel.kt index 9ba560cd..1314795b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/model/RoutineUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.routinelist.model +package com.threegap.bitnagil.presentation.screen.routinelist.model import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.routine.model.DayOfWeek diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt index 06a28466..8268e8b1 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine +package com.threegap.bitnagil.presentation.screen.routinewrite import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -30,21 +30,21 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast -import com.threegap.bitnagil.presentation.writeroutine.component.atom.namefield.NameField -import com.threegap.bitnagil.presentation.writeroutine.component.atom.selectcell.SelectCell -import com.threegap.bitnagil.presentation.writeroutine.component.atom.writeroutinebutton.WriteRoutineButton -import com.threegap.bitnagil.presentation.writeroutine.component.block.expandablecontent.ExpandableContent -import com.threegap.bitnagil.presentation.writeroutine.component.block.labeledcheckbox.LabeledCheckBox -import com.threegap.bitnagil.presentation.writeroutine.component.block.routinedetailrow.RoutineDetailRow -import com.threegap.bitnagil.presentation.writeroutine.component.block.subroutinefield.SubRoutineField -import com.threegap.bitnagil.presentation.writeroutine.component.template.datepickerbottomsheet.DatePickerBottomSheet -import com.threegap.bitnagil.presentation.writeroutine.component.template.timepickerbottomsheet.TimePickerBottomSheet -import com.threegap.bitnagil.presentation.writeroutine.contract.WriteRoutineSideEffect -import com.threegap.bitnagil.presentation.writeroutine.contract.WriteRoutineState -import com.threegap.bitnagil.presentation.writeroutine.model.Day -import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType -import com.threegap.bitnagil.presentation.writeroutine.model.Time -import com.threegap.bitnagil.presentation.writeroutine.model.WriteRoutineType +import com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.namefield.NameField +import com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.selectcell.SelectCell +import com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.writeroutinebutton.WriteRoutineButton +import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.expandablecontent.ExpandableContent +import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.labeledcheckbox.LabeledCheckBox +import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.routinedetailrow.RoutineDetailRow +import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.subroutinefield.SubRoutineField +import com.threegap.bitnagil.presentation.screen.routinewrite.component.template.datepickerbottomsheet.DatePickerBottomSheet +import com.threegap.bitnagil.presentation.screen.routinewrite.component.template.timepickerbottomsheet.TimePickerBottomSheet +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineSideEffect +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineState +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time +import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt similarity index 93% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt index 04170454..ddba4b18 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine +package com.threegap.bitnagil.presentation.screen.routinewrite import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel @@ -8,17 +8,17 @@ import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType import com.threegap.bitnagil.domain.writeroutine.usecase.EditRoutineUseCase import com.threegap.bitnagil.domain.writeroutine.usecase.RegisterRoutineUseCase -import com.threegap.bitnagil.presentation.writeroutine.contract.WriteRoutineSideEffect -import com.threegap.bitnagil.presentation.writeroutine.contract.WriteRoutineState -import com.threegap.bitnagil.presentation.writeroutine.model.Date -import com.threegap.bitnagil.presentation.writeroutine.model.Day -import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType -import com.threegap.bitnagil.presentation.writeroutine.model.SelectableDay -import com.threegap.bitnagil.presentation.writeroutine.model.SubRoutineUiModel -import com.threegap.bitnagil.presentation.writeroutine.model.Time -import com.threegap.bitnagil.presentation.writeroutine.model.WriteRoutineType -import com.threegap.bitnagil.presentation.writeroutine.model.navarg.WriteRoutineScreenArg -import com.threegap.bitnagil.presentation.writeroutine.model.toUiModel +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineSideEffect +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineState +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Date +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay +import com.threegap.bitnagil.presentation.screen.routinewrite.model.SubRoutineUiModel +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time +import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg +import com.threegap.bitnagil.presentation.screen.routinewrite.model.toUiModel import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/namefield/NameField.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/namefield/NameField.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/namefield/NameField.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/namefield/NameField.kt index 96ea17eb..4747f3fb 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/namefield/NameField.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/namefield/NameField.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.atom.namefield +package com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.namefield import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/selectcell/SelectCell.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/selectcell/SelectCell.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/selectcell/SelectCell.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/selectcell/SelectCell.kt index d9f6ac14..408ada52 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/selectcell/SelectCell.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/selectcell/SelectCell.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.atom.selectcell +package com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.selectcell import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/writeroutinebutton/WriteRoutineButton.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/writeroutinebutton/WriteRoutineButton.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/writeroutinebutton/WriteRoutineButton.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/writeroutinebutton/WriteRoutineButton.kt index 76a41675..5732831a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/writeroutinebutton/WriteRoutineButton.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/atom/writeroutinebutton/WriteRoutineButton.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.atom.writeroutinebutton +package com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.writeroutinebutton import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/expandablecontent/ExpandableContent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/expandablecontent/ExpandableContent.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/expandablecontent/ExpandableContent.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/expandablecontent/ExpandableContent.kt index 9b3c530f..8b6ed06b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/expandablecontent/ExpandableContent.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/expandablecontent/ExpandableContent.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.block.expandablecontent +package com.threegap.bitnagil.presentation.screen.routinewrite.component.block.expandablecontent import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/labeledcheckbox/LabeledCheckBox.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/labeledcheckbox/LabeledCheckBox.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/labeledcheckbox/LabeledCheckBox.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/labeledcheckbox/LabeledCheckBox.kt index 496c84b5..09e0778c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/labeledcheckbox/LabeledCheckBox.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/labeledcheckbox/LabeledCheckBox.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.block.labeledcheckbox +package com.threegap.bitnagil.presentation.screen.routinewrite.component.block.labeledcheckbox import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/routinedetailrow/RoutineDetailRow.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/routinedetailrow/RoutineDetailRow.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/routinedetailrow/RoutineDetailRow.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/routinedetailrow/RoutineDetailRow.kt index 4dab6f02..ee4032dc 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/routinedetailrow/RoutineDetailRow.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/routinedetailrow/RoutineDetailRow.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.block.routinedetailrow +package com.threegap.bitnagil.presentation.screen.routinewrite.component.block.routinedetailrow import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme -import com.threegap.bitnagil.presentation.writeroutine.component.atom.writeroutinebutton.WriteRoutineButton +import com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.writeroutinebutton.WriteRoutineButton @Composable fun RoutineDetailRow( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/subroutinefield/SubRoutineField.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/subroutinefield/SubRoutineField.kt similarity index 93% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/subroutinefield/SubRoutineField.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/subroutinefield/SubRoutineField.kt index a9a976f0..e837d50f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/subroutinefield/SubRoutineField.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/subroutinefield/SubRoutineField.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.block.subroutinefield +package com.threegap.bitnagil.presentation.screen.routinewrite.component.block.subroutinefield import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -19,6 +19,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme +import com.threegap.bitnagil.designsystem.R @Composable fun SubRoutineField( @@ -77,7 +78,7 @@ fun SubRoutineField( fun NameFieldPreview() { BitnagilTheme { SubRoutineField( - resourceId = com.threegap.bitnagil.designsystem.R.drawable.img_circle_1, + resourceId = R.drawable.img_circle_1, placeHolder = "세부루틴을 설정해주세요.", value = "TEXT", onValueChange = {}, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/datepickerbottomsheet/DatePickerBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/datepickerbottomsheet/DatePickerBottomSheet.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/datepickerbottomsheet/DatePickerBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/datepickerbottomsheet/DatePickerBottomSheet.kt index d9322c9e..a6856d18 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/datepickerbottomsheet/DatePickerBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/datepickerbottomsheet/DatePickerBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.template.datepickerbottomsheet +package com.threegap.bitnagil.presentation.screen.routinewrite.component.template.datepickerbottomsheet import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -40,8 +40,8 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.writeroutine.component.template.datepickerbottomsheet.model.CalendarUtils -import com.threegap.bitnagil.presentation.writeroutine.model.Date +import com.threegap.bitnagil.presentation.screen.routinewrite.component.template.datepickerbottomsheet.model.CalendarUtils +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Date import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/datepickerbottomsheet/model/CalendarUtils.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/datepickerbottomsheet/model/CalendarUtils.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/datepickerbottomsheet/model/CalendarUtils.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/datepickerbottomsheet/model/CalendarUtils.kt index cd7f4d2a..91a1a448 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/datepickerbottomsheet/model/CalendarUtils.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/datepickerbottomsheet/model/CalendarUtils.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.template.datepickerbottomsheet.model +package com.threegap.bitnagil.presentation.screen.routinewrite.component.template.datepickerbottomsheet.model import java.util.Calendar diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt index 5f3b2bb1..596192f3 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.component.template.timepickerbottomsheet +package com.threegap.bitnagil.presentation.screen.routinewrite.component.template.timepickerbottomsheet import android.view.View import android.widget.TimePicker diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/contract/WriteRoutineSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt similarity index 71% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/contract/WriteRoutineSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt index cbf9497a..44bee6af 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/contract/WriteRoutineSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.contract +package com.threegap.bitnagil.presentation.screen.routinewrite.contract sealed interface WriteRoutineSideEffect { data object MoveToPreviousScreen : WriteRoutineSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/contract/WriteRoutineState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt similarity index 86% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/contract/WriteRoutineState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt index 62a0d002..c0490b8b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/contract/WriteRoutineState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt @@ -1,13 +1,13 @@ -package com.threegap.bitnagil.presentation.writeroutine.contract +package com.threegap.bitnagil.presentation.screen.routinewrite.contract import android.os.Parcelable import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory -import com.threegap.bitnagil.presentation.writeroutine.model.Date -import com.threegap.bitnagil.presentation.writeroutine.model.Day -import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType -import com.threegap.bitnagil.presentation.writeroutine.model.SelectableDay -import com.threegap.bitnagil.presentation.writeroutine.model.Time -import com.threegap.bitnagil.presentation.writeroutine.model.WriteRoutineType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Date +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time +import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType import kotlinx.parcelize.Parcelize @Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Date.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Date.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Date.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Date.kt index ef28eb93..85051f7d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Date.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Date.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model +package com.threegap.bitnagil.presentation.screen.routinewrite.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Day.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Day.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Day.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Day.kt index 2be89f59..ec519d3b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Day.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Day.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model +package com.threegap.bitnagil.presentation.screen.routinewrite.model import com.threegap.bitnagil.domain.routine.model.DayOfWeek import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/RepeatType.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RepeatType.kt similarity index 65% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/RepeatType.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RepeatType.kt index 7bfffd49..fa53f431 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/RepeatType.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RepeatType.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model +package com.threegap.bitnagil.presentation.screen.routinewrite.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SelectableDay.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/SelectableDay.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SelectableDay.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/SelectableDay.kt index 80b69799..6d5792cf 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SelectableDay.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/SelectableDay.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model +package com.threegap.bitnagil.presentation.screen.routinewrite.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SubRoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/SubRoutineUiModel.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SubRoutineUiModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/SubRoutineUiModel.kt index 14ebd61f..fe65be48 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SubRoutineUiModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/SubRoutineUiModel.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model +package com.threegap.bitnagil.presentation.screen.routinewrite.model import com.threegap.bitnagil.domain.recommendroutine.model.RecommendSubRoutine diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Time.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Time.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Time.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Time.kt index 10074f93..7dcbe54e 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Time.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/Time.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model +package com.threegap.bitnagil.presentation.screen.routinewrite.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/WriteRoutineType.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt similarity index 80% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/WriteRoutineType.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt index 903bfda7..c74479db 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/WriteRoutineType.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model +package com.threegap.bitnagil.presentation.screen.routinewrite.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/navarg/WriteRoutineScreenArg.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/WriteRoutineScreenArg.kt similarity index 80% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/navarg/WriteRoutineScreenArg.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/WriteRoutineScreenArg.kt index 5498f86e..0c7afc04 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/navarg/WriteRoutineScreenArg.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/WriteRoutineScreenArg.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.writeroutine.model.navarg +package com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg import kotlinx.serialization.Serializable From 6a8f37ae091dcf86bb3f7fef0df4eac68e2ad3be Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Wed, 25 Feb 2026 22:17:11 +0900 Subject: [PATCH 05/13] =?UTF-8?q?REFACTOR:=20=EC=84=A4=EC=A0=95,=20?= =?UTF-8?q?=EC=8A=A4=ED=94=8C=EB=9E=98=EC=8B=9C,=20=EC=95=BD=EA=B4=80,=20?= =?UTF-8?q?=EC=9B=B9=EB=B7=B0,=20=ED=83=88=ED=87=B4=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/threegap/bitnagil/MainNavHost.kt | 10 +++++----- .../{ => screen}/setting/SettingScreen.kt | 8 ++++---- .../{ => screen}/setting/SettingViewModel.kt | 6 +++--- .../component/atom/settingtitle/SettingTitle.kt | 2 +- .../setting/component/atom/toggleswitch/Preview.kt | 2 +- .../component/atom/toggleswitch/ToggleSwitch.kt | 2 +- .../setting/contract/SettingSideEffect.kt | 2 +- .../{ => screen}/setting/contract/SettingState.kt | 2 +- .../presentation/{ => screen}/splash/SplashScreen.kt | 8 ++++---- .../{ => screen}/splash/SplashViewModel.kt | 6 +++--- .../component/template/BitnagilLottieAnimation.kt | 2 +- .../splash/component/template/ForceUpdateDialog.kt | 2 +- .../{ => screen}/splash/contract/SplashSideEffect.kt | 2 +- .../{ => screen}/splash/contract/SplashState.kt | 2 +- .../{ => screen}/terms/TermsAgreementScreen.kt | 10 +++++----- .../{ => screen}/terms/TermsAgreementViewModel.kt | 6 +++--- .../terms/component/TermsAgreementItem.kt | 2 +- .../terms/component/ToggleAllAgreementsItem.kt | 2 +- .../terms/contract/TermsAgreementSideEffect.kt | 2 +- .../terms/contract/TermsAgreementState.kt | 2 +- .../{ => screen}/webview/BitnagilWebViewScreen.kt | 2 +- .../{ => screen}/withdrawal/WithdrawalScreen.kt | 12 ++++++------ .../{ => screen}/withdrawal/WithdrawalViewModel.kt | 10 +++++----- .../withdrawal/component/WithdrawalConfirmDialog.kt | 2 +- .../withdrawal/contract/WithdrawalSideEffect.kt | 2 +- .../withdrawal/contract/WithdrawalState.kt | 4 ++-- .../withdrawal/model/WithdrawalReason.kt | 2 +- 27 files changed, 57 insertions(+), 57 deletions(-) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/setting/SettingScreen.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/setting/SettingViewModel.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/setting/component/atom/settingtitle/SettingTitle.kt (87%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/setting/component/atom/toggleswitch/Preview.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/setting/component/atom/toggleswitch/ToggleSwitch.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/setting/contract/SettingSideEffect.kt (68%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/setting/contract/SettingState.kt (88%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/splash/SplashScreen.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/splash/SplashViewModel.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/splash/component/template/BitnagilLottieAnimation.kt (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/splash/component/template/ForceUpdateDialog.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/splash/contract/SplashSideEffect.kt (79%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/splash/contract/SplashState.kt (87%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/terms/TermsAgreementScreen.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/terms/TermsAgreementViewModel.kt (92%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/terms/component/TermsAgreementItem.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/terms/component/ToggleAllAgreementsItem.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/terms/contract/TermsAgreementSideEffect.kt (82%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/terms/contract/TermsAgreementState.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/webview/BitnagilWebViewScreen.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/withdrawal/WithdrawalScreen.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/withdrawal/WithdrawalViewModel.kt (81%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/withdrawal/component/WithdrawalConfirmDialog.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/withdrawal/contract/WithdrawalSideEffect.kt (68%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/withdrawal/contract/WithdrawalState.kt (81%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{ => screen}/withdrawal/model/WithdrawalReason.kt (80%) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index 92377cd4..aac17273 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -19,11 +19,11 @@ import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewMo import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer -import com.threegap.bitnagil.presentation.setting.SettingScreenContainer -import com.threegap.bitnagil.presentation.splash.SplashScreenContainer -import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer -import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen -import com.threegap.bitnagil.presentation.withdrawal.WithdrawalScreenContainer +import com.threegap.bitnagil.presentation.screen.setting.SettingScreenContainer +import com.threegap.bitnagil.presentation.screen.splash.SplashScreenContainer +import com.threegap.bitnagil.presentation.screen.terms.TermsAgreementScreenContainer +import com.threegap.bitnagil.presentation.screen.webview.BitnagilWebViewScreen +import com.threegap.bitnagil.presentation.screen.withdrawal.WithdrawalScreenContainer import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt index 56c69db0..68cf2261 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.setting +package com.threegap.bitnagil.presentation.screen.setting import androidx.activity.ComponentActivity import androidx.compose.foundation.background @@ -32,9 +32,9 @@ import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.presentation.common.playstore.UpdateAvailableState import com.threegap.bitnagil.presentation.common.playstore.openAppInPlayStore import com.threegap.bitnagil.presentation.common.playstore.updateAvailable -import com.threegap.bitnagil.presentation.setting.component.atom.settingtitle.SettingTitle -import com.threegap.bitnagil.presentation.setting.contract.SettingSideEffect -import com.threegap.bitnagil.presentation.setting.contract.SettingState +import com.threegap.bitnagil.presentation.screen.setting.component.atom.settingtitle.SettingTitle +import com.threegap.bitnagil.presentation.screen.setting.contract.SettingSideEffect +import com.threegap.bitnagil.presentation.screen.setting.contract.SettingState import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt index 602f23cf..7206cf5c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt @@ -1,12 +1,12 @@ -package com.threegap.bitnagil.presentation.setting +package com.threegap.bitnagil.presentation.screen.setting import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.threegap.bitnagil.domain.auth.usecase.LogoutUseCase import com.threegap.bitnagil.presentation.common.version.VersionNameProvider -import com.threegap.bitnagil.presentation.setting.contract.SettingSideEffect -import com.threegap.bitnagil.presentation.setting.contract.SettingState +import com.threegap.bitnagil.presentation.screen.setting.contract.SettingSideEffect +import com.threegap.bitnagil.presentation.screen.setting.contract.SettingState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/settingtitle/SettingTitle.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/settingtitle/SettingTitle.kt similarity index 87% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/settingtitle/SettingTitle.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/settingtitle/SettingTitle.kt index 529122f9..5432d704 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/settingtitle/SettingTitle.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/settingtitle/SettingTitle.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.setting.component.atom.settingtitle +package com.threegap.bitnagil.presentation.screen.setting.component.atom.settingtitle import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/toggleswitch/Preview.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/Preview.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/toggleswitch/Preview.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/Preview.kt index 6d0a8589..ba5db228 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/toggleswitch/Preview.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/Preview.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.setting.component.atom.toggleswitch +package com.threegap.bitnagil.presentation.screen.setting.component.atom.toggleswitch import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/toggleswitch/ToggleSwitch.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/ToggleSwitch.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/toggleswitch/ToggleSwitch.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/ToggleSwitch.kt index a2f09fa2..57239764 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/component/atom/toggleswitch/ToggleSwitch.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/ToggleSwitch.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.setting.component.atom.toggleswitch +package com.threegap.bitnagil.presentation.screen.setting.component.atom.toggleswitch import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateDpAsState diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/contract/SettingSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingSideEffect.kt similarity index 68% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/setting/contract/SettingSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingSideEffect.kt index 3376354b..ab86ee24 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/contract/SettingSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.setting.contract +package com.threegap.bitnagil.presentation.screen.setting.contract sealed interface SettingSideEffect { data object NavigateToLogin : SettingSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/contract/SettingState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingState.kt similarity index 88% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/setting/contract/SettingState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingState.kt index 87f9da67..ab7ab355 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/contract/SettingState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.setting.contract +package com.threegap.bitnagil.presentation.screen.setting.contract import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt index 600f9601..c14e690d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.splash +package com.threegap.bitnagil.presentation.screen.splash import androidx.activity.ComponentActivity import androidx.compose.animation.core.tween @@ -23,9 +23,9 @@ import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.presentation.common.playstore.openAppInPlayStore -import com.threegap.bitnagil.presentation.splash.component.template.BitnagilLottieAnimation -import com.threegap.bitnagil.presentation.splash.component.template.ForceUpdateDialog -import com.threegap.bitnagil.presentation.splash.contract.SplashSideEffect +import com.threegap.bitnagil.presentation.screen.splash.component.template.BitnagilLottieAnimation +import com.threegap.bitnagil.presentation.screen.splash.component.template.ForceUpdateDialog +import com.threegap.bitnagil.presentation.screen.splash.contract.SplashSideEffect import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect import kotlin.system.exitProcess diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashViewModel.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashViewModel.kt index e209167a..5ecb872f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashViewModel.kt @@ -1,12 +1,12 @@ -package com.threegap.bitnagil.presentation.splash +package com.threegap.bitnagil.presentation.screen.splash import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.threegap.bitnagil.domain.auth.model.UserRole import com.threegap.bitnagil.domain.auth.usecase.AutoLoginUseCase import com.threegap.bitnagil.domain.version.usecase.CheckUpdateRequirementUseCase -import com.threegap.bitnagil.presentation.splash.contract.SplashSideEffect -import com.threegap.bitnagil.presentation.splash.contract.SplashState +import com.threegap.bitnagil.presentation.screen.splash.contract.SplashSideEffect +import com.threegap.bitnagil.presentation.screen.splash.contract.SplashState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/component/template/BitnagilLottieAnimation.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/BitnagilLottieAnimation.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/splash/component/template/BitnagilLottieAnimation.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/BitnagilLottieAnimation.kt index bc6d91fc..7178e009 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/component/template/BitnagilLottieAnimation.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/BitnagilLottieAnimation.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.splash.component.template +package com.threegap.bitnagil.presentation.screen.splash.component.template import androidx.annotation.RawRes import androidx.compose.animation.core.FastOutSlowInEasing diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/component/template/ForceUpdateDialog.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/ForceUpdateDialog.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/splash/component/template/ForceUpdateDialog.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/ForceUpdateDialog.kt index 6ddcfcd9..1f0722b4 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/component/template/ForceUpdateDialog.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/ForceUpdateDialog.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.splash.component.template +package com.threegap.bitnagil.presentation.screen.splash.component.template import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/contract/SplashSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashSideEffect.kt similarity index 79% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/splash/contract/SplashSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashSideEffect.kt index 0f4472a6..dcdb0c4d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/contract/SplashSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.splash.contract +package com.threegap.bitnagil.presentation.screen.splash.contract sealed interface SplashSideEffect { data object NavigateToLogin : SplashSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/contract/SplashState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashState.kt similarity index 87% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/splash/contract/SplashState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashState.kt index 3ec4d88f..803916a0 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/contract/SplashState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.splash.contract +package com.threegap.bitnagil.presentation.screen.splash.contract import com.threegap.bitnagil.domain.auth.model.UserRole diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementScreen.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementScreen.kt index bfd273f7..19c51a3b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.terms +package com.threegap.bitnagil.presentation.screen.terms import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -17,10 +17,10 @@ import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.terms.component.TermsAgreementItem -import com.threegap.bitnagil.presentation.terms.component.ToggleAllAgreementsItem -import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementSideEffect -import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementState +import com.threegap.bitnagil.presentation.screen.terms.component.TermsAgreementItem +import com.threegap.bitnagil.presentation.screen.terms.component.ToggleAllAgreementsItem +import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementSideEffect +import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementState import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementViewModel.kt similarity index 92% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementViewModel.kt index 837857ab..50a01eba 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementViewModel.kt @@ -1,11 +1,11 @@ -package com.threegap.bitnagil.presentation.terms +package com.threegap.bitnagil.presentation.screen.terms import android.util.Log import androidx.lifecycle.ViewModel import com.threegap.bitnagil.domain.auth.model.TermsAgreement import com.threegap.bitnagil.domain.auth.usecase.SubmitTermsAgreementUseCase -import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementSideEffect -import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementState +import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementSideEffect +import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementState import dagger.hilt.android.lifecycle.HiltViewModel import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/component/TermsAgreementItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/TermsAgreementItem.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/terms/component/TermsAgreementItem.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/TermsAgreementItem.kt index baa89d12..b35d9f68 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/component/TermsAgreementItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/TermsAgreementItem.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.terms.component +package com.threegap.bitnagil.presentation.screen.terms.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/component/ToggleAllAgreementsItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/ToggleAllAgreementsItem.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/terms/component/ToggleAllAgreementsItem.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/ToggleAllAgreementsItem.kt index 5dbb9151..62839b36 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/component/ToggleAllAgreementsItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/ToggleAllAgreementsItem.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.terms.component +package com.threegap.bitnagil.presentation.screen.terms.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/contract/TermsAgreementSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementSideEffect.kt similarity index 82% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/terms/contract/TermsAgreementSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementSideEffect.kt index 1e2dac89..3f3abca4 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/contract/TermsAgreementSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.terms.contract +package com.threegap.bitnagil.presentation.screen.terms.contract sealed interface TermsAgreementSideEffect { data object NavigateToTermsOfService : TermsAgreementSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/contract/TermsAgreementState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementState.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/terms/contract/TermsAgreementState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementState.kt index 40db7bae..9e1129dd 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/contract/TermsAgreementState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.terms.contract +package com.threegap.bitnagil.presentation.screen.terms.contract data class TermsAgreementState( val isLoading: Boolean, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/webview/BitnagilWebViewScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/webview/BitnagilWebViewScreen.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/webview/BitnagilWebViewScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/webview/BitnagilWebViewScreen.kt index f769edcd..bae7e54a 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/webview/BitnagilWebViewScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/webview/BitnagilWebViewScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.webview +package com.threegap.bitnagil.presentation.screen.webview import android.view.ViewGroup import android.webkit.WebResourceRequest diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt index 5ba4d6f2..8e58cdcf 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.withdrawal +package com.threegap.bitnagil.presentation.screen.withdrawal import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -39,10 +39,10 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilSelectButtonCol import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.withdrawal.component.WithdrawalConfirmDialog -import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalSideEffect -import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalState -import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalReason +import com.threegap.bitnagil.presentation.screen.withdrawal.component.WithdrawalConfirmDialog +import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalSideEffect +import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalState +import com.threegap.bitnagil.presentation.screen.withdrawal.model.WithdrawalReason import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect @@ -223,7 +223,7 @@ private fun WithdrawalScreen( @Composable private fun WithdrawalScreenPreview() { WithdrawalScreen( - uiState = WithdrawalState.INIT, + uiState = WithdrawalState.Companion.INIT, onTermsToggle = {}, onReasonSelect = {}, onCustomReasonChanged = {}, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt index ff6a0d62..b3680654 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt @@ -1,10 +1,10 @@ -package com.threegap.bitnagil.presentation.withdrawal +package com.threegap.bitnagil.presentation.screen.withdrawal import androidx.lifecycle.ViewModel import com.threegap.bitnagil.domain.auth.usecase.WithdrawalUseCase -import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalSideEffect -import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalState -import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalReason +import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalSideEffect +import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalState +import com.threegap.bitnagil.presentation.screen.withdrawal.model.WithdrawalReason import dagger.hilt.android.lifecycle.HiltViewModel import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost @@ -16,7 +16,7 @@ class WithdrawalViewModel @Inject constructor( private val withdrawalUseCase: WithdrawalUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = WithdrawalState.INIT) + override val container: Container = container(initialState = WithdrawalState.Companion.INIT) fun onTermsToggle() { intent { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/component/WithdrawalConfirmDialog.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/component/WithdrawalConfirmDialog.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/component/WithdrawalConfirmDialog.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/component/WithdrawalConfirmDialog.kt index 5f43b375..c5339341 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/component/WithdrawalConfirmDialog.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/component/WithdrawalConfirmDialog.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.withdrawal.component +package com.threegap.bitnagil.presentation.screen.withdrawal.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/contract/WithdrawalSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalSideEffect.kt similarity index 68% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/contract/WithdrawalSideEffect.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalSideEffect.kt index 928b95e8..513c8dfe 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/contract/WithdrawalSideEffect.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalSideEffect.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.withdrawal.contract +package com.threegap.bitnagil.presentation.screen.withdrawal.contract sealed interface WithdrawalSideEffect { data object NavigateToBack : WithdrawalSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/contract/WithdrawalState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalState.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/contract/WithdrawalState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalState.kt index 9f95c42d..469727d8 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/contract/WithdrawalState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalState.kt @@ -1,6 +1,6 @@ -package com.threegap.bitnagil.presentation.withdrawal.contract +package com.threegap.bitnagil.presentation.screen.withdrawal.contract -import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalReason +import com.threegap.bitnagil.presentation.screen.withdrawal.model.WithdrawalReason data class WithdrawalState( val isLoading: Boolean, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/model/WithdrawalReason.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/model/WithdrawalReason.kt similarity index 80% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/model/WithdrawalReason.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/model/WithdrawalReason.kt index aa7e94c7..d1621261 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/model/WithdrawalReason.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/model/WithdrawalReason.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.withdrawal.model +package com.threegap.bitnagil.presentation.screen.withdrawal.model enum class WithdrawalReason( val displayText: String, From f52e603480e7fbd8e69393ed2b70928380d9db50 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Wed, 25 Feb 2026 22:23:06 +0900 Subject: [PATCH 06/13] =?UTF-8?q?REFACTOR:=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EA=B3=BC=EC=A0=95=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=9C=20=EB=B6=88=ED=95=84=EC=9A=94=20Com?= =?UTF-8?q?panion=20=EC=A0=91=EA=B7=BC=EB=B6=80=EB=B6=84=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 --- .../bitnagil/presentation/screen/emotion/EmotionViewModel.kt | 2 +- .../screen/emotion/component/template/EmotionLoadingView.kt | 2 +- .../emotion/component/template/SwipeEmotionSelectionScreen.kt | 2 +- .../threegap/bitnagil/presentation/screen/home/HomeScreen.kt | 4 ++-- .../bitnagil/presentation/screen/home/HomeViewModel.kt | 2 +- .../screen/home/component/template/CollapsibleHeader.kt | 2 +- .../screen/home/component/template/WeeklyDatePicker.kt | 2 +- .../bitnagil/presentation/screen/home/contract/HomeState.kt | 4 ++-- .../bitnagil/presentation/screen/login/LoginViewModel.kt | 2 +- .../bitnagil/presentation/screen/mypage/MyPageViewModel.kt | 2 +- .../presentation/screen/onboarding/OnBoardingViewModel.kt | 2 +- .../screen/recommendroutine/RecommendRoutineScreen.kt | 2 +- .../screen/recommendroutine/RecommendRoutineViewModel.kt | 4 ++-- .../presentation/screen/reportdetail/ReportDetailScreen.kt | 2 +- .../presentation/screen/reportdetail/ReportDetailViewModel.kt | 2 +- .../presentation/screen/reporthistory/ReportHistoryScreen.kt | 2 +- .../screen/reporthistory/ReportHistoryViewModel.kt | 2 +- .../screen/reporthistory/contract/ReportHistoryState.kt | 2 +- .../presentation/screen/withdrawal/WithdrawalScreen.kt | 2 +- .../presentation/screen/withdrawal/WithdrawalViewModel.kt | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt index ea9ad783..adc85411 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt @@ -26,7 +26,7 @@ class EmotionViewModel @Inject constructor( savedStateHandle: SavedStateHandle, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = EmotionState.Companion.Init, savedStateHandle = savedStateHandle) + override val container: Container = container(initialState = EmotionState.Init, savedStateHandle = savedStateHandle) init { loadEmotions() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt index 0fd19645..e7b54833 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt @@ -184,7 +184,7 @@ private fun getRecommendRoutineText(emotion: EmotionUiModel): String { private fun EmotionLoadingViewPreview() { BitnagilTheme { EmotionLoadingView( - emotion = EmotionUiModel.Companion.Default, + emotion = EmotionUiModel.Default, ) } } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt index ed53efbe..c5888e34 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt @@ -80,7 +80,7 @@ fun SwipeEmotionSelectionScreen( val fadeInTransition = remember { fadeIn(animationSpec = tween(150)) } val fadeOutTransition = remember { fadeOut(animationSpec = tween(50)) } - val emotions = remember(state.emotionTypeUiModels) { state.emotionTypeUiModels + EmotionUiModel.Companion.Default } + val emotions = remember(state.emotionTypeUiModels) { state.emotionTypeUiModels + EmotionUiModel.Default } val actualItemCount = emotions.size val pagerState = rememberPagerState( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt index bffa1577..f3cfcdb7 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt @@ -195,9 +195,9 @@ private fun HomeScreen( @Composable private fun HomeScreenPreview() { HomeScreen( - uiState = HomeState.Companion.INIT.copy( + uiState = HomeState.INIT.copy( userNickname = "홍길동", - dailyEmotion = DailyEmotionUiModel.Companion.INIT.copy( + dailyEmotion = DailyEmotionUiModel.INIT.copy( homeMessage = "님, 오셨군요!\n오늘 기분은 어떤가요?", ), ), diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt index 493bf462..4129353c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt @@ -46,7 +46,7 @@ class HomeViewModel @Inject constructor( private val toggleRoutineUseCase: ToggleRoutineUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = HomeState.Companion.INIT) + override val container: Container = container(initialState = HomeState.INIT) private val pendingChangesByDate = mutableMapOf>() private val routineSyncTrigger = MutableSharedFlow(extraBufferCapacity = 64) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt index 3774d78d..c1969480 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt @@ -71,7 +71,7 @@ private fun CollapsibleHeaderPreview() { CollapsibleHeader( modifier = Modifier.fillMaxWidth(), welcomeMessage = "대현님 오셨군요!\n오늘 기분은 어떤가요?!", - dailyEmotion = DailyEmotionUiModel.Companion.INIT, + dailyEmotion = DailyEmotionUiModel.INIT, onRegisterEmotionClick = {}, ) } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt index 3d6bdb0f..be579fc9 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt @@ -197,7 +197,7 @@ private fun WeeklyDatePickerPreview() { WeeklyDatePicker( selectedDate = selectedDate, weeklyDates = selectedDate.getCurrentWeekDays(), - routines = RoutineScheduleUiModel.Companion.INIT, + routines = RoutineScheduleUiModel.INIT, onDateSelect = { selectedDate = it }, onPreviousWeekClick = { selectedDate = selectedDate.minusWeeks(1) }, onNextWeekClick = { selectedDate = selectedDate.plusWeeks(1) }, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt index 770dff7c..e96ba7b7 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt @@ -24,10 +24,10 @@ data class HomeState( val INIT = HomeState( loadingCount = 0, userNickname = "", - dailyEmotion = DailyEmotionUiModel.Companion.INIT, + dailyEmotion = DailyEmotionUiModel.INIT, selectedDate = LocalDate.now(), currentWeeks = LocalDate.now().getCurrentWeekDays(), - routineSchedule = RoutineScheduleUiModel.Companion.INIT, + routineSchedule = RoutineScheduleUiModel.INIT, ) } } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt index 9e86ca4f..fb3ef6a2 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt @@ -18,7 +18,7 @@ class LoginViewModel @Inject constructor( private val loginUseCase: LoginUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = LoginState.Companion.INIT) + override val container: Container = container(initialState = LoginState.INIT) fun kakaoLogin(token: OAuthToken?, error: Throwable?) { intent { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt index 271da73b..1e417234 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt @@ -14,7 +14,7 @@ import javax.inject.Inject class MyPageViewModel @Inject constructor( private val fetchUserProfileUseCase: FetchUserProfileUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = MyPageState.Companion.INIT) + override val container: Container = container(initialState = MyPageState.INIT) init { loadMyPageInfo() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingViewModel.kt index bdace991..c9e6a6ca 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingViewModel.kt @@ -58,7 +58,7 @@ class OnBoardingViewModel @AssistedInject constructor( } private fun loadInitData() { - val onBoardingSetType = OnBoardingSetType.Companion.fromOnBoardingScreenArg(onBoardingArg) + val onBoardingSetType = OnBoardingSetType.fromOnBoardingScreenArg(onBoardingArg) when (onBoardingSetType) { OnBoardingSetType.NEW -> { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt index 9dbc8894..8bb5d1ce 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt @@ -207,7 +207,7 @@ private fun RecommendRoutineScreen( @Composable private fun RoutineRecommendScreenPreview() { RecommendRoutineScreen( - uiState = RecommendRoutineState.Companion.INIT, + uiState = RecommendRoutineState.INIT, onCategorySelected = {}, onShowDifficultyBottomSheet = {}, onRecommendRoutineByEmotionClick = {}, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineViewModel.kt index 548ffcbc..c9381687 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineViewModel.kt @@ -25,14 +25,14 @@ class RecommendRoutineViewModel @Inject constructor( ) : ContainerHost, ViewModel() { override val container: Container = - container(initialState = RecommendRoutineState.Companion.INIT) + container(initialState = RecommendRoutineState.INIT) init { loadRecommendRoutines() observeEmotionChangeEvent() } - private var recommendRoutines: RecommendRoutinesUiModel = RecommendRoutinesUiModel.Companion.INIT + private var recommendRoutines: RecommendRoutinesUiModel = RecommendRoutinesUiModel.INIT fun updateRoutineCategory(category: RecommendCategory) { intent { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt index 87ca29e5..f977ad4d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt @@ -141,7 +141,7 @@ private fun ReportDetailScreen( private fun ReportDetailScreenPreview() { BitnagilTheme { ReportDetailScreen( - state = ReportDetailState.Companion.Init.copy( + state = ReportDetailState.Init.copy( reportContent = "Lorem ipsum dolor sit amet, " + "consectetur adipiscing elit," + " sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " + diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt index 77a5faff..4846e76d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt @@ -18,7 +18,7 @@ class ReportDetailViewModel @AssistedInject constructor( private val getReportDetailUseCase: GetReportUseCase, @Assisted private val reportDetailArg: ReportDetailScreenArg, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = ReportDetailState.Companion.Init) + override val container: Container = container(initialState = ReportDetailState.Init) @AssistedFactory interface Factory { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt index ac917788..12b34433 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt @@ -199,7 +199,7 @@ private fun ReportHistoryScreen( private fun ReportHistoryScreenPreview() { BitnagilTheme { ReportHistoryScreen( - state = ReportHistoryState.Companion.Init.copy( + state = ReportHistoryState.Init.copy( reportHistoriesPerDays = List(10) { ReportHistoriesPerDayUiModel( date = LocalDate.now(), diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryViewModel.kt index d996a513..364bd170 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryViewModel.kt @@ -18,7 +18,7 @@ import javax.inject.Inject class ReportHistoryViewModel @Inject constructor( private val getReportHistoriesUseCase: GetReportHistoriesUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = ReportHistoryState.Companion.Init) + override val container: Container = container(initialState = ReportHistoryState.Init) init { loadReportHistories() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistoryState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistoryState.kt index 7da025d5..d5821e07 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistoryState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/contract/ReportHistoryState.kt @@ -32,7 +32,7 @@ data class ReportHistoryState( } val reportStatusFilterWithCounts: List = - ReportStatusFilter.Companion.values().map { filter -> + ReportStatusFilter.values().map { filter -> val count = reportHistoriesPerDays.sumOf { day -> day.reports.count { report -> filter.matches(report.status) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt index 8e58cdcf..37e76778 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt @@ -223,7 +223,7 @@ private fun WithdrawalScreen( @Composable private fun WithdrawalScreenPreview() { WithdrawalScreen( - uiState = WithdrawalState.Companion.INIT, + uiState = WithdrawalState.INIT, onTermsToggle = {}, onReasonSelect = {}, onCustomReasonChanged = {}, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt index b3680654..c7339129 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt @@ -16,7 +16,7 @@ class WithdrawalViewModel @Inject constructor( private val withdrawalUseCase: WithdrawalUseCase, ) : ContainerHost, ViewModel() { - override val container: Container = container(initialState = WithdrawalState.Companion.INIT) + override val container: Container = container(initialState = WithdrawalState.INIT) fun onTermsToggle() { intent { From 0b5b8dce1abbacf04ba17a8ec610e0f35f5b054e Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Wed, 25 Feb 2026 22:24:02 +0900 Subject: [PATCH 07/13] =?UTF-8?q?CHORE:=20ktlint=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/java/com/threegap/bitnagil/MainNavHost.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index aac17273..13d2b5eb 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -13,20 +13,20 @@ import com.threegap.bitnagil.presentation.screen.login.LoginScreenContainer import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingScreenContainer import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingViewModel import com.threegap.bitnagil.presentation.screen.onboarding.model.navarg.OnBoardingScreenArg -import com.threegap.bitnagil.presentation.screen.reportwrite.ReportScreenContainer import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailScreenContainer import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewModel import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer +import com.threegap.bitnagil.presentation.screen.reportwrite.ReportScreenContainer import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer +import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer +import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel +import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg import com.threegap.bitnagil.presentation.screen.setting.SettingScreenContainer import com.threegap.bitnagil.presentation.screen.splash.SplashScreenContainer import com.threegap.bitnagil.presentation.screen.terms.TermsAgreementScreenContainer import com.threegap.bitnagil.presentation.screen.webview.BitnagilWebViewScreen import com.threegap.bitnagil.presentation.screen.withdrawal.WithdrawalScreenContainer -import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer -import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel -import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg @Composable fun MainNavHost( From 80fe7d66c15b17fd55d20b72ff862da9e0d8ea3f Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Thu, 26 Feb 2026 20:21:48 +0900 Subject: [PATCH 08/13] =?UTF-8?q?REFACTOR:=20Presentation=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=20=EB=82=B4=20=EC=9C=A0=ED=8B=B8=20=EB=B0=8F?= =?UTF-8?q?=20=ED=99=95=EC=9E=A5=20=ED=95=A8=EC=88=98=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95,=20=EC=9D=BC?= =?UTF-8?q?=EB=B6=80=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/threegap/bitnagil/MainActivity.kt | 2 +- .../presentation/VersionNameProviderModule.kt | 4 ++-- .../bitnagil/navigation/home/HomeNavHost.kt | 2 +- .../common/flow/CollectAsEffect.kt | 22 ------------------- .../extension => model/date}/DayOfWeekEtx.kt | 2 +- .../report}/ReportCategoryEtx.kt | 2 +- .../report}/ReportStatusEtx.kt | 2 +- .../routine}/RecommendCategoryEtx.kt | 2 +- .../routine}/RecommendLevelEtx.kt | 2 +- .../screen/emotion/EmotionScreen.kt | 4 ++-- .../component/template/EmotionLoadingView.kt | 2 +- .../template/SwipeEmotionSelectionScreen.kt | 2 +- .../screen/onboarding/OnBoardingScreen.kt | 2 +- .../template/OnBoardingAbstractTemplate.kt | 2 +- .../template/OnBoardingIntroTemplate.kt | 2 +- .../RecommendRoutineScreen.kt | 6 ++--- .../component/block/RecommendRoutineItem.kt | 4 ++-- .../template/RecommendLevelBottomSheet.kt | 4 ++-- .../screen/reportdetail/ReportDetailScreen.kt | 2 +- .../component/atom/ReportProcessBadge.kt | 6 ++--- .../reporthistory/ReportHistoryScreen.kt | 2 +- .../component/block/ReportHistoryItem.kt | 2 +- .../template/ReportCategoryBottomSheet.kt | 6 ++--- .../reporthistory/model/ReportStatusFilter.kt | 2 +- .../screen/reportwrite/ReportScreen.kt | 6 ++--- .../screen/reportwrite/ReportViewModel.kt | 2 +- .../component/CompleteReportCard.kt | 2 +- .../component/ReportCategoryBottomSheet.kt | 6 ++--- .../screen/routinelist/RoutineListScreen.kt | 2 +- .../component/template/RoutineDetailsCard.kt | 6 ++--- .../screen/routinewrite/WriteRoutineScreen.kt | 2 +- .../screen/setting/SettingScreen.kt | 6 ++--- .../screen/setting/SettingViewModel.kt | 2 +- .../screen/splash/SplashScreen.kt | 2 +- .../{common => util}/dimension/DpToPx.kt | 2 +- .../{common => util}/dimension/PxToDp.kt | 2 +- .../file/ImageFileConverter.kt | 2 +- .../ninepatch/NinePatchBackground.kt | 2 +- .../permission}/PermissionHandler.kt | 2 +- .../permission}/RememberPermissionHandler.kt | 2 +- .../playstore/PlayStoreUtils.kt | 2 +- .../playstore/UpdateAvailableState.kt | 2 +- .../toast/GlobalBitnagilToast.kt | 2 +- .../AndroidApplicationVersionNameProvider.kt | 2 +- .../version/VersionNameProvider.kt | 2 +- 45 files changed, 62 insertions(+), 84 deletions(-) delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/common/flow/CollectAsEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common/extension => model/date}/DayOfWeekEtx.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common/extension => model/report}/ReportCategoryEtx.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common/extension => model/report}/ReportStatusEtx.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common/extension => model/routine}/RecommendCategoryEtx.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common/extension => model/routine}/RecommendLevelEtx.kt (90%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/dimension/DpToPx.kt (77%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/dimension/PxToDp.kt (81%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/file/ImageFileConverter.kt (97%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/ninepatch/NinePatchBackground.kt (94%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common/premission => util/permission}/PermissionHandler.kt (78%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common/premission => util/permission}/RememberPermissionHandler.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/playstore/PlayStoreUtils.kt (98%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/playstore/UpdateAvailableState.kt (52%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/toast/GlobalBitnagilToast.kt (91%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/version/AndroidApplicationVersionNameProvider.kt (88%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/{common => util}/version/VersionNameProvider.kt (53%) diff --git a/app/src/main/java/com/threegap/bitnagil/MainActivity.kt b/app/src/main/java/com/threegap/bitnagil/MainActivity.kt index d6da69d3..fe7ed15e 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainActivity.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainActivity.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.component.atom.BitnagilToastContainer import com.threegap.bitnagil.designsystem.component.atom.rememberBitnagilToast -import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast +import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/app/src/main/java/com/threegap/bitnagil/di/presentation/VersionNameProviderModule.kt b/app/src/main/java/com/threegap/bitnagil/di/presentation/VersionNameProviderModule.kt index 2aa4fa0f..9896e4bb 100644 --- a/app/src/main/java/com/threegap/bitnagil/di/presentation/VersionNameProviderModule.kt +++ b/app/src/main/java/com/threegap/bitnagil/di/presentation/VersionNameProviderModule.kt @@ -1,7 +1,7 @@ package com.threegap.bitnagil.di.presentation -import com.threegap.bitnagil.presentation.common.version.AndroidApplicationVersionNameProvider -import com.threegap.bitnagil.presentation.common.version.VersionNameProvider +import com.threegap.bitnagil.presentation.util.version.AndroidApplicationVersionNameProvider +import com.threegap.bitnagil.presentation.util.version.VersionNameProvider import dagger.Binds import dagger.Module import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt index 3e0b0a79..067e207d 100644 --- a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt @@ -28,10 +28,10 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilFloatingActionMenu import com.threegap.bitnagil.designsystem.component.atom.FloatingActionItem import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast import com.threegap.bitnagil.presentation.screen.home.HomeScreenContainer import com.threegap.bitnagil.presentation.screen.mypage.MyPageScreenContainer import com.threegap.bitnagil.presentation.screen.recommendroutine.RecommendRoutineScreenContainer +import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import com.threegap.bitnagil.util.setStatusBarContentColor @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/flow/CollectAsEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/common/flow/CollectAsEffect.kt deleted file mode 100644 index dcc08c44..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/flow/CollectAsEffect.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.threegap.bitnagil.presentation.common.flow - -import android.annotation.SuppressLint -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.flowOn -import kotlinx.coroutines.flow.launchIn -import kotlinx.coroutines.flow.onEach -import kotlin.coroutines.CoroutineContext -import kotlin.coroutines.EmptyCoroutineContext - -@SuppressLint("ComposableNaming") -@Composable -fun Flow.collectAsEffect( - context: CoroutineContext = EmptyCoroutineContext, - block: (T) -> Unit, -) { - LaunchedEffect(Unit) { - onEach(block).flowOn(context).launchIn(this) - } -} diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/DayOfWeekEtx.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/date/DayOfWeekEtx.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/DayOfWeekEtx.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/model/date/DayOfWeekEtx.kt index fa1446d5..1c03ccc4 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/DayOfWeekEtx.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/date/DayOfWeekEtx.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.extension +package com.threegap.bitnagil.presentation.model.date import com.threegap.bitnagil.domain.routine.model.DayOfWeek diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportCategoryEtx.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportCategoryEtx.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportCategoryEtx.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportCategoryEtx.kt index 5a717661..48700965 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportCategoryEtx.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportCategoryEtx.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.extension +package com.threegap.bitnagil.presentation.model.report import androidx.annotation.DrawableRes import com.threegap.bitnagil.designsystem.R diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportStatusEtx.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportStatusEtx.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportStatusEtx.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportStatusEtx.kt index 231541c5..130ef1f9 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportStatusEtx.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportStatusEtx.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.extension +package com.threegap.bitnagil.presentation.model.report import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendCategoryEtx.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendCategoryEtx.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendCategoryEtx.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendCategoryEtx.kt index 06c4f13c..25f3e336 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendCategoryEtx.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendCategoryEtx.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.extension +package com.threegap.bitnagil.presentation.model.routine import androidx.annotation.DrawableRes import androidx.compose.runtime.Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendLevelEtx.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendLevelEtx.kt similarity index 90% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendLevelEtx.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendLevelEtx.kt index 72c32051..8d2e408c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendLevelEtx.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendLevelEtx.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.extension +package com.threegap.bitnagil.presentation.model.routine import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt index d2ad8b78..ca757537 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt @@ -9,13 +9,13 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.threegap.bitnagil.presentation.common.dimension.pxToDp -import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast import com.threegap.bitnagil.presentation.screen.emotion.component.template.EmotionRecommendRoutineScreen import com.threegap.bitnagil.presentation.screen.emotion.component.template.SimpleEmotionSelectionScreen import com.threegap.bitnagil.presentation.screen.emotion.component.template.SwipeEmotionSelectionScreen import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionSideEffect import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep +import com.threegap.bitnagil.presentation.util.dimension.pxToDp +import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt index e7b54833..e409b2a9 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt @@ -24,10 +24,10 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R -import com.threegap.bitnagil.presentation.common.dimension.pxToDp import com.threegap.bitnagil.presentation.screen.emotion.component.atom.EmotionMarbleImage import com.threegap.bitnagil.presentation.screen.emotion.component.atom.SpeechBubbleText import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel +import com.threegap.bitnagil.presentation.util.dimension.pxToDp @Composable fun EmotionLoadingView( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt index c5888e34..aeb1f30e 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt @@ -60,12 +60,12 @@ import androidx.compose.ui.zIndex import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.common.dimension.dpToPx import com.threegap.bitnagil.presentation.screen.emotion.component.atom.EmotionMarbleImage import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionState import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionImageUiModel import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel +import com.threegap.bitnagil.presentation.util.dimension.dpToPx import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlin.collections.forEach diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingScreen.kt index 8e489a78..a65245d0 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/OnBoardingScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.block.BitnagilProgressTopBar -import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast import com.threegap.bitnagil.presentation.screen.onboarding.component.template.OnBoardingAbstractTemplate import com.threegap.bitnagil.presentation.screen.onboarding.component.template.OnBoardingIntroTemplate import com.threegap.bitnagil.presentation.screen.onboarding.component.template.OnBoardingSelectTemplate @@ -20,6 +19,7 @@ import com.threegap.bitnagil.presentation.screen.onboarding.contract.OnBoardingS import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingItemUiModel import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingPageInfo import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingSetType +import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingAbstractTemplate.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingAbstractTemplate.kt index 09f9f42f..85ba2218 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingAbstractTemplate.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingAbstractTemplate.kt @@ -37,8 +37,8 @@ import androidx.compose.ui.zIndex import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton -import com.threegap.bitnagil.presentation.common.ninepatch.ninePatchBackgroundNode import com.threegap.bitnagil.presentation.screen.onboarding.model.OnBoardingAbstractTextItemUiModel +import com.threegap.bitnagil.presentation.util.ninepatch.ninePatchBackgroundNode @Composable fun OnBoardingAbstractTemplate( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingIntroTemplate.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingIntroTemplate.kt index ac939e5f..7204da50 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingIntroTemplate.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/component/template/OnBoardingIntroTemplate.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton -import com.threegap.bitnagil.presentation.common.ninepatch.ninePatchBackgroundNode +import com.threegap.bitnagil.presentation.util.ninepatch.ninePatchBackgroundNode @Composable fun OnBoardingIntroTemplate( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt index 8bb5d1ce..2f3969d8 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/RecommendRoutineScreen.kt @@ -32,9 +32,9 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory -import com.threegap.bitnagil.presentation.common.extension.displayLevel -import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.common.extension.isVisible +import com.threegap.bitnagil.presentation.model.routine.displayLevel +import com.threegap.bitnagil.presentation.model.routine.displayTitle +import com.threegap.bitnagil.presentation.model.routine.isVisible import com.threegap.bitnagil.presentation.screen.recommendroutine.component.atom.RecommendCategoryChip import com.threegap.bitnagil.presentation.screen.recommendroutine.component.block.EmotionRecommendRoutineButton import com.threegap.bitnagil.presentation.screen.recommendroutine.component.block.RecommendRoutineItem diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/RecommendRoutineItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/RecommendRoutineItem.kt index d4725d52..2c3e8be1 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/RecommendRoutineItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/block/RecommendRoutineItem.kt @@ -22,8 +22,8 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel -import com.threegap.bitnagil.presentation.common.extension.displayColor -import com.threegap.bitnagil.presentation.common.extension.displayIcon +import com.threegap.bitnagil.presentation.model.routine.displayColor +import com.threegap.bitnagil.presentation.model.routine.displayIcon import com.threegap.bitnagil.presentation.screen.recommendroutine.model.RecommendRoutineUiModel import com.threegap.bitnagil.presentation.screen.recommendroutine.model.RecommendSubRoutineUiModel diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/RecommendLevelBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/RecommendLevelBottomSheet.kt index da46db34..11903c40 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/RecommendLevelBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/recommendroutine/component/template/RecommendLevelBottomSheet.kt @@ -19,8 +19,8 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel -import com.threegap.bitnagil.presentation.common.extension.displayLevel -import com.threegap.bitnagil.presentation.common.extension.displayTitle +import com.threegap.bitnagil.presentation.model.routine.displayLevel +import com.threegap.bitnagil.presentation.model.routine.displayTitle import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt index f977ad4d..adb44f76 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt @@ -27,7 +27,7 @@ import coil3.compose.AsyncImage import coil3.request.ImageRequest import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.common.extension.displayTitle +import com.threegap.bitnagil.presentation.model.report.displayTitle import com.threegap.bitnagil.presentation.screen.reportdetail.component.atom.ReportProcessBadge import com.threegap.bitnagil.presentation.screen.reportdetail.component.block.ReportDetailLabeledContent import com.threegap.bitnagil.presentation.screen.reportdetail.contract.ReportDetailState diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.kt index 6972df6b..0e85c865 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.domain.report.model.ReportStatus -import com.threegap.bitnagil.presentation.common.extension.badgeBackgroundColor -import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.common.extension.textColor +import com.threegap.bitnagil.presentation.model.report.badgeBackgroundColor +import com.threegap.bitnagil.presentation.model.report.displayTitle +import com.threegap.bitnagil.presentation.model.report.textColor @Composable fun ReportProcessBadge( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt index 12b34433..ea9fd99b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt @@ -34,7 +34,7 @@ import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.model.ReportStatus -import com.threegap.bitnagil.presentation.common.extension.displayTitle +import com.threegap.bitnagil.presentation.model.report.displayTitle import com.threegap.bitnagil.presentation.screen.reporthistory.component.block.ReportHistoryItem import com.threegap.bitnagil.presentation.screen.reporthistory.component.template.ReportCategoryBottomSheet import com.threegap.bitnagil.presentation.screen.reporthistory.contract.ReportHistoryState diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/block/ReportHistoryItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/block/ReportHistoryItem.kt index 3a203048..542f5631 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/block/ReportHistoryItem.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/block/ReportHistoryItem.kt @@ -27,7 +27,7 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.model.ReportStatus -import com.threegap.bitnagil.presentation.common.extension.displayTitle +import com.threegap.bitnagil.presentation.model.report.displayTitle import com.threegap.bitnagil.presentation.screen.reportdetail.component.atom.ReportProcessBadge import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportHistoryUiModel diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/template/ReportCategoryBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/template/ReportCategoryBottomSheet.kt index 9427bc5b..333fbc1b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/template/ReportCategoryBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/component/template/ReportCategoryBottomSheet.kt @@ -24,9 +24,9 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.report.model.ReportCategory -import com.threegap.bitnagil.presentation.common.extension.displayExamples -import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.common.extension.iconRes +import com.threegap.bitnagil.presentation.model.report.displayExamples +import com.threegap.bitnagil.presentation.model.report.displayTitle +import com.threegap.bitnagil.presentation.model.report.iconRes import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilter.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilter.kt index b331a37c..26e15f69 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilter.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/model/ReportStatusFilter.kt @@ -1,7 +1,7 @@ package com.threegap.bitnagil.presentation.screen.reporthistory.model import com.threegap.bitnagil.domain.report.model.ReportStatus -import com.threegap.bitnagil.presentation.common.extension.displayTitle +import com.threegap.bitnagil.presentation.model.report.displayTitle sealed class ReportStatusFilter { data object All : ReportStatusFilter() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt index 3b6b42ce..7ca27412 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt @@ -52,9 +52,7 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButtonColor import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextField import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.common.file.createCameraImageUri -import com.threegap.bitnagil.presentation.common.premission.rememberPermissionHandler +import com.threegap.bitnagil.presentation.model.report.displayTitle import com.threegap.bitnagil.presentation.screen.reportwrite.component.AddPhotoButton import com.threegap.bitnagil.presentation.screen.reportwrite.component.CurrentLocationInput import com.threegap.bitnagil.presentation.screen.reportwrite.component.ImageSourceBottomSheet @@ -68,6 +66,8 @@ import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportSide import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState.Companion.MAX_IMAGE_COUNT import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState +import com.threegap.bitnagil.presentation.util.file.createCameraImageUri +import com.threegap.bitnagil.presentation.util.permission.rememberPermissionHandler import kotlinx.coroutines.delay import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt index 65bc3565..d78fdacb 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt @@ -8,11 +8,11 @@ import com.threegap.bitnagil.domain.file.usecase.UploadReportImagesUseCase import com.threegap.bitnagil.domain.report.model.Report import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.usecase.SubmitReportUseCase -import com.threegap.bitnagil.presentation.common.file.convertUriToImageFile import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportSideEffect import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState.Companion.MAX_IMAGE_COUNT import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState +import com.threegap.bitnagil.presentation.util.file.convertUriToImageFile import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.async diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt index 46f57bdd..71a64904 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt @@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.domain.report.model.ReportCategory -import com.threegap.bitnagil.presentation.common.extension.displayTitle +import com.threegap.bitnagil.presentation.model.report.displayTitle @Composable fun CompleteReportCard( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategoryBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategoryBottomSheet.kt index 0cf5acf2..d97a3ad6 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategoryBottomSheet.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/ReportCategoryBottomSheet.kt @@ -24,9 +24,9 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple import com.threegap.bitnagil.domain.report.model.ReportCategory -import com.threegap.bitnagil.presentation.common.extension.displayExamples -import com.threegap.bitnagil.presentation.common.extension.displayTitle -import com.threegap.bitnagil.presentation.common.extension.iconRes +import com.threegap.bitnagil.presentation.model.report.displayExamples +import com.threegap.bitnagil.presentation.model.report.displayTitle +import com.threegap.bitnagil.presentation.model.report.iconRes import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt index 779a8c93..0496bf22 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/RoutineListScreen.kt @@ -21,7 +21,6 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast import com.threegap.bitnagil.presentation.screen.routinelist.component.template.DeleteConfirmBottomSheet import com.threegap.bitnagil.presentation.screen.routinelist.component.template.EditConfirmBottomSheet import com.threegap.bitnagil.presentation.screen.routinelist.component.template.EmptyRoutineListView @@ -31,6 +30,7 @@ import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineLis import com.threegap.bitnagil.presentation.screen.routinelist.contract.RoutineListState import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineListStatePreviewProvider import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel +import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect import java.time.LocalDate diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt index d71b7b6a..d727e4a4 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinelist/component/template/RoutineDetailsCard.kt @@ -21,9 +21,9 @@ import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton import com.threegap.bitnagil.domain.routine.model.DayOfWeek -import com.threegap.bitnagil.presentation.common.extension.displayColor -import com.threegap.bitnagil.presentation.common.extension.displayIcon -import com.threegap.bitnagil.presentation.common.extension.displayTitle +import com.threegap.bitnagil.presentation.model.date.displayTitle +import com.threegap.bitnagil.presentation.model.routine.displayColor +import com.threegap.bitnagil.presentation.model.routine.displayIcon import com.threegap.bitnagil.presentation.screen.routinelist.model.RoutineUiModel @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt index 8268e8b1..aa41fcf8 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt @@ -29,7 +29,6 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar -import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast import com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.namefield.NameField import com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.selectcell.SelectCell import com.threegap.bitnagil.presentation.screen.routinewrite.component.atom.writeroutinebutton.WriteRoutineButton @@ -45,6 +44,7 @@ import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType +import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt index 68cf2261..f87153f9 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt @@ -29,12 +29,12 @@ import com.threegap.bitnagil.designsystem.component.block.BitnagilAlertDialog import com.threegap.bitnagil.designsystem.component.block.BitnagilOptionButton import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple -import com.threegap.bitnagil.presentation.common.playstore.UpdateAvailableState -import com.threegap.bitnagil.presentation.common.playstore.openAppInPlayStore -import com.threegap.bitnagil.presentation.common.playstore.updateAvailable import com.threegap.bitnagil.presentation.screen.setting.component.atom.settingtitle.SettingTitle import com.threegap.bitnagil.presentation.screen.setting.contract.SettingSideEffect import com.threegap.bitnagil.presentation.screen.setting.contract.SettingState +import com.threegap.bitnagil.presentation.util.playstore.UpdateAvailableState +import com.threegap.bitnagil.presentation.util.playstore.openAppInPlayStore +import com.threegap.bitnagil.presentation.util.playstore.updateAvailable import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt index 7206cf5c..28b39376 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt @@ -4,9 +4,9 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.threegap.bitnagil.domain.auth.usecase.LogoutUseCase -import com.threegap.bitnagil.presentation.common.version.VersionNameProvider import com.threegap.bitnagil.presentation.screen.setting.contract.SettingSideEffect import com.threegap.bitnagil.presentation.screen.setting.contract.SettingState +import com.threegap.bitnagil.presentation.util.version.VersionNameProvider import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt index c14e690d..5b1495e5 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt @@ -22,10 +22,10 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon -import com.threegap.bitnagil.presentation.common.playstore.openAppInPlayStore import com.threegap.bitnagil.presentation.screen.splash.component.template.BitnagilLottieAnimation import com.threegap.bitnagil.presentation.screen.splash.component.template.ForceUpdateDialog import com.threegap.bitnagil.presentation.screen.splash.contract.SplashSideEffect +import com.threegap.bitnagil.presentation.util.playstore.openAppInPlayStore import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect import kotlin.system.exitProcess diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/DpToPx.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/dimension/DpToPx.kt similarity index 77% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/DpToPx.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/dimension/DpToPx.kt index bd006739..3c06dce9 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/DpToPx.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/dimension/DpToPx.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.dimension +package com.threegap.bitnagil.presentation.util.dimension import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalDensity diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/PxToDp.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/dimension/PxToDp.kt similarity index 81% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/PxToDp.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/dimension/PxToDp.kt index 9ef3348d..540e087f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/PxToDp.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/dimension/PxToDp.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.dimension +package com.threegap.bitnagil.presentation.util.dimension import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalDensity diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/file/ImageFileConverter.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/file/ImageFileConverter.kt similarity index 97% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/file/ImageFileConverter.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/file/ImageFileConverter.kt index f2748f81..d0559750 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/file/ImageFileConverter.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/file/ImageFileConverter.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.file +package com.threegap.bitnagil.presentation.util.file import android.content.ContentResolver import android.content.Context diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/ninepatch/NinePatchBackground.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/ninepatch/NinePatchBackground.kt similarity index 94% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/ninepatch/NinePatchBackground.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/ninepatch/NinePatchBackground.kt index bf9b538b..759223ed 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/ninepatch/NinePatchBackground.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/ninepatch/NinePatchBackground.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.ninepatch +package com.threegap.bitnagil.presentation.util.ninepatch import android.graphics.drawable.NinePatchDrawable import androidx.compose.runtime.Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/premission/PermissionHandler.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/permission/PermissionHandler.kt similarity index 78% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/premission/PermissionHandler.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/permission/PermissionHandler.kt index 55d12d56..1886b38f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/premission/PermissionHandler.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/permission/PermissionHandler.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.premission +package com.threegap.bitnagil.presentation.util.permission import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/premission/RememberPermissionHandler.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/permission/RememberPermissionHandler.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/premission/RememberPermissionHandler.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/permission/RememberPermissionHandler.kt index 23047bd6..e41d4d78 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/premission/RememberPermissionHandler.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/permission/RememberPermissionHandler.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.premission +package com.threegap.bitnagil.presentation.util.permission import android.content.Intent import android.net.Uri diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/playstore/PlayStoreUtils.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/playstore/PlayStoreUtils.kt similarity index 98% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/playstore/PlayStoreUtils.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/playstore/PlayStoreUtils.kt index 3a12e2c9..f9c75f0f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/playstore/PlayStoreUtils.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/playstore/PlayStoreUtils.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.playstore +package com.threegap.bitnagil.presentation.util.playstore import android.content.ActivityNotFoundException import android.content.Context diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/playstore/UpdateAvailableState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/playstore/UpdateAvailableState.kt similarity index 52% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/playstore/UpdateAvailableState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/playstore/UpdateAvailableState.kt index 59b633c7..bbe9274d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/playstore/UpdateAvailableState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/playstore/UpdateAvailableState.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.playstore +package com.threegap.bitnagil.presentation.util.playstore enum class UpdateAvailableState { LATEST, NEED_UPDATE, NONE diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/toast/GlobalBitnagilToast.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/toast/GlobalBitnagilToast.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/toast/GlobalBitnagilToast.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/toast/GlobalBitnagilToast.kt index 22ffb3df..88dce0b2 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/toast/GlobalBitnagilToast.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/toast/GlobalBitnagilToast.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.toast +package com.threegap.bitnagil.presentation.util.toast import com.threegap.bitnagil.designsystem.R import com.threegap.bitnagil.designsystem.component.atom.BitnagilToastState diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/version/AndroidApplicationVersionNameProvider.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/version/AndroidApplicationVersionNameProvider.kt similarity index 88% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/version/AndroidApplicationVersionNameProvider.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/version/AndroidApplicationVersionNameProvider.kt index 8a147c47..2853da44 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/version/AndroidApplicationVersionNameProvider.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/version/AndroidApplicationVersionNameProvider.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.version +package com.threegap.bitnagil.presentation.util.version import com.threegap.bitnagil.presentation.BuildConfig import javax.inject.Inject diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/version/VersionNameProvider.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/version/VersionNameProvider.kt similarity index 53% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/common/version/VersionNameProvider.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/util/version/VersionNameProvider.kt index 1d8b7649..a027e27b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/version/VersionNameProvider.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/util/version/VersionNameProvider.kt @@ -1,4 +1,4 @@ -package com.threegap.bitnagil.presentation.common.version +package com.threegap.bitnagil.presentation.util.version interface VersionNameProvider { fun getVersionName(): String From c5b6797c3c8c6f0181c6bcdfe319fc750a6a9ef4 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Thu, 26 Feb 2026 20:59:21 +0900 Subject: [PATCH 09/13] =?UTF-8?q?CHORE:=20=EB=B6=88=ED=95=84=EC=9A=94=20im?= =?UTF-8?q?port=EB=AC=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emotion/component/template/SwipeEmotionSelectionScreen.kt | 1 - .../bitnagil/presentation/screen/home/HomeViewModel.kt | 2 -- .../presentation/screen/reporthistory/ReportHistoryScreen.kt | 1 - .../component/block/subroutinefield/SubRoutineField.kt | 3 +-- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt index aeb1f30e..3abe19ee 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt @@ -68,7 +68,6 @@ import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionUiModel import com.threegap.bitnagil.presentation.util.dimension.dpToPx import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import kotlin.collections.forEach import kotlin.math.absoluteValue @Composable diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt index 4129353c..c93e4ec1 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt @@ -31,8 +31,6 @@ import org.orbitmvi.orbit.ContainerHost import org.orbitmvi.orbit.viewmodel.container import java.time.LocalDate import javax.inject.Inject -import kotlin.collections.map -import kotlin.collections.plus @HiltViewModel class HomeViewModel @Inject constructor( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt index ea9fd99b..3cddc851 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reporthistory/ReportHistoryScreen.kt @@ -44,7 +44,6 @@ import com.threegap.bitnagil.presentation.screen.reporthistory.model.ReportStatu import com.threegap.bitnagil.presentation.screen.reporthistory.util.toPresentationFormat import org.orbitmvi.orbit.compose.collectAsState import java.time.LocalDate -import kotlin.collections.forEach @Composable fun ReportHistoryScreenContainer( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/subroutinefield/SubRoutineField.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/subroutinefield/SubRoutineField.kt index e837d50f..3732715b 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/subroutinefield/SubRoutineField.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/component/block/subroutinefield/SubRoutineField.kt @@ -19,7 +19,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.threegap.bitnagil.designsystem.BitnagilTheme -import com.threegap.bitnagil.designsystem.R @Composable fun SubRoutineField( @@ -78,7 +77,7 @@ fun SubRoutineField( fun NameFieldPreview() { BitnagilTheme { SubRoutineField( - resourceId = R.drawable.img_circle_1, + resourceId = com.threegap.bitnagil.designsystem.R.drawable.img_circle_1, placeHolder = "세부루틴을 설정해주세요.", value = "TEXT", onValueChange = {}, From 7d51c248fa0b9d258d1aec8f8b4d7ced3957336d Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Thu, 26 Feb 2026 21:18:56 +0900 Subject: [PATCH 10/13] =?UTF-8?q?REFACTOR:=20=EC=A0=9C=EB=B3=B4=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=ED=99=94=EB=A9=B4=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EC=9D=98=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=EC=9D=84=20Report~=20=EC=97=90=EC=84=9C=20ReportWrite~=20?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/threegap/bitnagil/MainNavHost.kt | 4 +-- .../{ReportScreen.kt => ReportWriteScreen.kt} | 30 +++++++++---------- ...rtViewModel.kt => ReportWriteViewModel.kt} | 22 +++++++------- .../template/CompleteReportContent.kt | 6 ++-- .../reportwrite/contract/ReportSideEffect.kt | 6 ---- .../contract/ReportWriteSideEffect.kt | 6 ++++ .../{ReportState.kt => ReportWriteState.kt} | 4 +-- 7 files changed, 39 insertions(+), 39 deletions(-) rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/{ReportScreen.kt => ReportWriteScreen.kt} (95%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/{ReportViewModel.kt => ReportWriteViewModel.kt} (89%) delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportSideEffect.kt create mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportWriteSideEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/{ReportState.kt => ReportWriteState.kt} (96%) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index 13d2b5eb..1a7a72d4 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -17,7 +17,7 @@ import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailScreen import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewModel import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer -import com.threegap.bitnagil.presentation.screen.reportwrite.ReportScreenContainer +import com.threegap.bitnagil.presentation.screen.reportwrite.ReportWriteScreenContainer import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel @@ -306,7 +306,7 @@ fun MainNavHost( } composable { - ReportScreenContainer( + ReportWriteScreenContainer( navigateToBack = { if (navigator.navController.previousBackStackEntry != null) { navigator.navController.popBackStack() diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportWriteScreen.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportWriteScreen.kt index 7ca27412..dcb1afdf 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportWriteScreen.kt @@ -62,9 +62,9 @@ import com.threegap.bitnagil.presentation.screen.reportwrite.component.ReportCat import com.threegap.bitnagil.presentation.screen.reportwrite.component.ReportField import com.threegap.bitnagil.presentation.screen.reportwrite.component.template.CompleteReportContent import com.threegap.bitnagil.presentation.screen.reportwrite.component.template.SubmittingReportContent -import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportSideEffect -import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState -import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState.Companion.MAX_IMAGE_COUNT +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportWriteSideEffect +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportWriteState +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportWriteState.Companion.MAX_IMAGE_COUNT import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState import com.threegap.bitnagil.presentation.util.file.createCameraImageUri import com.threegap.bitnagil.presentation.util.permission.rememberPermissionHandler @@ -74,9 +74,9 @@ import org.orbitmvi.orbit.compose.collectSideEffect @OptIn(ExperimentalMaterial3Api::class, ExperimentalPermissionsApi::class) @Composable -fun ReportScreenContainer( +fun ReportWriteScreenContainer( navigateToBack: () -> Unit, - viewModel: ReportViewModel = hiltViewModel(), + viewModel: ReportWriteViewModel = hiltViewModel(), ) { val context = LocalContext.current val uiState by viewModel.collectAsState() @@ -84,8 +84,8 @@ fun ReportScreenContainer( viewModel.collectSideEffect { sideEffect -> when (sideEffect) { - is ReportSideEffect.NavigateToBack -> navigateToBack() - is ReportSideEffect.FocusOnContent -> { + is ReportWriteSideEffect.NavigateToBack -> navigateToBack() + is ReportWriteSideEffect.FocusOnContent -> { delay(100) contentFocusRequester.requestFocus() } @@ -175,7 +175,7 @@ fun ReportScreenContainer( ) { submitState -> when (submitState) { SubmitState.IDLE -> { - ReportScreen( + ReportWriteScreen( uiState = uiState, contentFocusRequester = contentFocusRequester, onReportTitleChange = viewModel::updateReportTitle, @@ -201,8 +201,8 @@ fun ReportScreenContainer( @OptIn(ExperimentalMaterial3Api::class) @Composable -private fun ReportScreen( - uiState: ReportState, +private fun ReportWriteScreen( + uiState: ReportWriteState, contentFocusRequester: FocusRequester, onReportTitleChange: (String) -> Unit, onReportContentChange: (String) -> Unit, @@ -281,7 +281,7 @@ private fun ReportScreen( ) Text( - text = "${uiState.reportTitle.length} / ${ReportState.MAX_TITLE_LENGTH}", + text = "${uiState.reportTitle.length} / ${ReportWriteState.MAX_TITLE_LENGTH}", style = BitnagilTheme.typography.caption1Medium, color = BitnagilTheme.colors.coolGray80, textAlign = TextAlign.End, @@ -315,7 +315,7 @@ private fun ReportScreen( ), placeholder = { Text( - text = "어떤 위험인지 간단히 설명해주세요.(${ReportState.MAX_CONTENT_LENGTH}자 내외)", + text = "어떤 위험인지 간단히 설명해주세요.(${ReportWriteState.MAX_CONTENT_LENGTH}자 내외)", style = BitnagilTheme.typography.body2Medium, color = BitnagilTheme.colors.coolGray80, ) @@ -324,7 +324,7 @@ private fun ReportScreen( ) Text( - text = "${uiState.reportContent.length} / ${ReportState.MAX_CONTENT_LENGTH}", + text = "${uiState.reportContent.length} / ${ReportWriteState.MAX_CONTENT_LENGTH}", style = BitnagilTheme.typography.caption1Medium, color = BitnagilTheme.colors.coolGray80, textAlign = TextAlign.End, @@ -358,8 +358,8 @@ private fun ReportScreen( @Preview(showBackground = true) @Composable private fun Preview() { - ReportScreen( - uiState = ReportState.Init, + ReportWriteScreen( + uiState = ReportWriteState.Init, contentFocusRequester = remember { FocusRequester() }, onReportTitleChange = {}, onReportContentChange = {}, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportWriteViewModel.kt similarity index 89% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportWriteViewModel.kt index d78fdacb..082dcbdb 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/ReportWriteViewModel.kt @@ -8,9 +8,9 @@ import com.threegap.bitnagil.domain.file.usecase.UploadReportImagesUseCase import com.threegap.bitnagil.domain.report.model.Report import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.domain.report.usecase.SubmitReportUseCase -import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportSideEffect -import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState -import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState.Companion.MAX_IMAGE_COUNT +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportWriteSideEffect +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportWriteState +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportWriteState.Companion.MAX_IMAGE_COUNT import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState import com.threegap.bitnagil.presentation.util.file.convertUriToImageFile import dagger.hilt.android.lifecycle.HiltViewModel @@ -25,25 +25,25 @@ import org.orbitmvi.orbit.viewmodel.container import javax.inject.Inject @HiltViewModel -class ReportViewModel @Inject constructor( +class ReportWriteViewModel @Inject constructor( @ApplicationContext private val context: Context, private val fetchCurrentAddressUseCase: FetchCurrentAddressUseCase, private val uploadReportImagesUseCase: UploadReportImagesUseCase, private val submitReportUseCase: SubmitReportUseCase, -) : ViewModel(), ContainerHost { +) : ViewModel(), ContainerHost { - override val container: Container = container(initialState = ReportState.Init) + override val container: Container = container(initialState = ReportWriteState.Init) fun updateReportTitle(title: String) { intent { - if (title.length > ReportState.MAX_TITLE_LENGTH) return@intent + if (title.length > ReportWriteState.MAX_TITLE_LENGTH) return@intent reduce { state.copy(reportTitle = title) } } } fun updateReportContent(content: String) { intent { - if (content.length > ReportState.MAX_CONTENT_LENGTH) return@intent + if (content.length > ReportWriteState.MAX_CONTENT_LENGTH) return@intent reduce { state.copy(reportContent = content) } } } @@ -69,7 +69,7 @@ class ReportViewModel @Inject constructor( fun hideReportCategoryBottomSheet() { intent { reduce { state.copy(reportCategoryBottomSheetVisible = false) } - postSideEffect(ReportSideEffect.FocusOnContent) + postSideEffect(ReportWriteSideEffect.FocusOnContent) } } @@ -116,7 +116,7 @@ class ReportViewModel @Inject constructor( fun navigateToBack() { intent { - postSideEffect(ReportSideEffect.NavigateToBack) + postSideEffect(ReportWriteSideEffect.NavigateToBack) } } @@ -131,7 +131,7 @@ class ReportViewModel @Inject constructor( coroutineScope { val minDelayJob = async { - delay(timeMillis = ReportState.MIN_LOADING_TIME) + delay(timeMillis = ReportWriteState.MIN_LOADING_TIME) } val processingJob = async { diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt index 345c025f..a8b2f99f 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt @@ -25,11 +25,11 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButtonColor import com.threegap.bitnagil.presentation.screen.reportwrite.component.CompleteReportCard -import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportState +import com.threegap.bitnagil.presentation.screen.reportwrite.contract.ReportWriteState @Composable fun CompleteReportContent( - uiState: ReportState, + uiState: ReportWriteState, onConfirmClick: () -> Unit, modifier: Modifier = Modifier, ) { @@ -108,7 +108,7 @@ fun CompleteReportContent( @Composable private fun Preview() { CompleteReportContent( - uiState = ReportState.Init, + uiState = ReportWriteState.Init, onConfirmClick = {}, ) } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportSideEffect.kt deleted file mode 100644 index 6ede534a..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportSideEffect.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.threegap.bitnagil.presentation.screen.reportwrite.contract - -sealed interface ReportSideEffect { - data object NavigateToBack : ReportSideEffect - data object FocusOnContent : ReportSideEffect -} diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportWriteSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportWriteSideEffect.kt new file mode 100644 index 00000000..9496b2db --- /dev/null +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportWriteSideEffect.kt @@ -0,0 +1,6 @@ +package com.threegap.bitnagil.presentation.screen.reportwrite.contract + +sealed interface ReportWriteSideEffect { + data object NavigateToBack : ReportWriteSideEffect + data object FocusOnContent : ReportWriteSideEffect +} diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportWriteState.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportWriteState.kt index 43bfd23a..45d1b2a1 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/contract/ReportWriteState.kt @@ -4,7 +4,7 @@ import android.net.Uri import com.threegap.bitnagil.domain.report.model.ReportCategory import com.threegap.bitnagil.presentation.screen.reportwrite.model.SubmitState -data class ReportState( +data class ReportWriteState( val reportImages: List, val reportTitle: String, val reportContent: String, @@ -36,7 +36,7 @@ data class ReportState( const val MAX_IMAGE_COUNT = 3 - val Init = ReportState( + val Init = ReportWriteState( reportImages = emptyList(), reportTitle = "", reportContent = "", From 57b2597528f85ce51c2f2c97b863eefeca8e2572 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Thu, 26 Feb 2026 21:25:24 +0900 Subject: [PATCH 11/13] =?UTF-8?q?REFACTOR:=20=EB=A3=A8=ED=8B=B4=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=ED=99=94=EB=A9=B4=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EC=9D=98=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=EC=9D=84=20WriteRoutine~=20=EC=97=90=EC=84=9C=20RoutineWrite~?= =?UTF-8?q?=20=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/threegap/bitnagil/MainNavHost.kt | 24 +++++----- .../main/java/com/threegap/bitnagil/Route.kt | 2 +- ...{WriteRoutineScreen.kt => RoutineWrite.kt} | 30 ++++++------ ...eViewModel.kt => RoutineWriteViewModel.kt} | 46 +++++++++---------- .../contract/RoutineWriteSideEffect.kt | 6 +++ ...teRoutineState.kt => RoutineWriteState.kt} | 10 ++-- .../contract/WriteRoutineSideEffect.kt | 6 --- ...riteRoutineType.kt => RoutineWriteType.kt} | 6 +-- ...eScreenArg.kt => RoutineWriteScreenArg.kt} | 6 +-- 9 files changed, 68 insertions(+), 68 deletions(-) rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/{WriteRoutineScreen.kt => RoutineWrite.kt} (96%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/{WriteRoutineViewModel.kt => RoutineWriteViewModel.kt} (91%) create mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteSideEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/{WriteRoutineState.kt => RoutineWriteState.kt} (95%) delete mode 100644 presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/{WriteRoutineType.kt => RoutineWriteType.kt} (51%) rename presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/{WriteRoutineScreenArg.kt => RoutineWriteScreenArg.kt} (62%) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index 1a7a72d4..17fda9ad 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -19,9 +19,9 @@ import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.Repor import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer import com.threegap.bitnagil.presentation.screen.reportwrite.ReportWriteScreenContainer import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer -import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer -import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel -import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg +import com.threegap.bitnagil.presentation.screen.routinewrite.RoutineWriteScreenContainer +import com.threegap.bitnagil.presentation.screen.routinewrite.RoutineWriteViewModel +import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.RoutineWriteScreenArg import com.threegap.bitnagil.presentation.screen.setting.SettingScreenContainer import com.threegap.bitnagil.presentation.screen.splash.SplashScreenContainer import com.threegap.bitnagil.presentation.screen.terms.TermsAgreementScreenContainer @@ -127,7 +127,7 @@ fun MainNavHost( } }, navigateToRegisterRoutine = { routineId -> - navigator.navController.navigate(Route.WriteRoutine(routineId = routineId)) + navigator.navController.navigate(Route.RoutineWrite(routineId = routineId)) }, navigateToEmotion = { navigator.navController.navigate(Route.Emotion) @@ -224,19 +224,19 @@ fun MainNavHost( ) } - composable { navBackStackEntry -> - val arg = navBackStackEntry.toRoute() + composable { navBackStackEntry -> + val arg = navBackStackEntry.toRoute() val writeScreenNavArg = if (arg.isRegister) { - WriteRoutineScreenArg.Add(baseRoutineId = arg.routineId) + RoutineWriteScreenArg.Add(baseRoutineId = arg.routineId) } else { - WriteRoutineScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate) + RoutineWriteScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate) } - val viewModel = hiltViewModel { factory -> + val viewModel = hiltViewModel { factory -> factory.create(writeScreenNavArg) } - WriteRoutineScreenContainer( + RoutineWriteScreenContainer( viewModel = viewModel, navigateToBack = { if (navigator.navController.previousBackStackEntry != null) { @@ -281,11 +281,11 @@ fun MainNavHost( } }, navigateToAddRoutine = { - navigator.navController.navigate(Route.WriteRoutine()) + navigator.navController.navigate(Route.RoutineWrite()) }, navigateToEditRoutine = { routineId, updateRoutineFromNowDate -> navigator.navController.navigate( - Route.WriteRoutine( + Route.RoutineWrite( routineId = routineId, isRegister = false, isUpdateRoutineFromNowDate = updateRoutineFromNowDate, diff --git a/app/src/main/java/com/threegap/bitnagil/Route.kt b/app/src/main/java/com/threegap/bitnagil/Route.kt index 7c056d30..4da74356 100644 --- a/app/src/main/java/com/threegap/bitnagil/Route.kt +++ b/app/src/main/java/com/threegap/bitnagil/Route.kt @@ -31,7 +31,7 @@ sealed interface Route { ) : Route @Serializable - data class WriteRoutine( + data class RoutineWrite( val routineId: String? = null, val isRegister: Boolean = true, val isUpdateRoutineFromNowDate: Boolean = true, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt similarity index 96% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt index aa41fcf8..7a0a614c 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineScreen.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt @@ -38,30 +38,30 @@ import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.ro import com.threegap.bitnagil.presentation.screen.routinewrite.component.block.subroutinefield.SubRoutineField import com.threegap.bitnagil.presentation.screen.routinewrite.component.template.datepickerbottomsheet.DatePickerBottomSheet import com.threegap.bitnagil.presentation.screen.routinewrite.component.template.timepickerbottomsheet.TimePickerBottomSheet -import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineSideEffect -import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineState +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteSideEffect +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteState import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time -import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect @Composable -fun WriteRoutineScreenContainer( - viewModel: WriteRoutineViewModel = hiltViewModel(), +fun RoutineWriteScreenContainer( + viewModel: RoutineWriteViewModel = hiltViewModel(), navigateToBack: () -> Unit, ) { val state by viewModel.collectAsState() viewModel.collectSideEffect { sideEffect -> when (sideEffect) { - WriteRoutineSideEffect.MoveToPreviousScreen -> { + RoutineWriteSideEffect.MoveToPreviousScreen -> { navigateToBack() } - is WriteRoutineSideEffect.ShowToast -> { + is RoutineWriteSideEffect.ShowToast -> { GlobalBitnagilToast.showCheck(sideEffect.message) } } @@ -99,7 +99,7 @@ fun WriteRoutineScreenContainer( ) } - WriteRoutineScreen( + RoutineWriteScreen( state = state, setRoutineName = viewModel::setRoutineName, setSubRoutineName = viewModel::setSubRoutineName, @@ -120,8 +120,8 @@ fun WriteRoutineScreenContainer( } @Composable -private fun WriteRoutineScreen( - state: WriteRoutineState, +private fun RoutineWriteScreen( + state: RoutineWriteState, setRoutineName: (String) -> Unit, setSubRoutineName: (Int, String) -> Unit, selectNotUseSubRoutines: () -> Unit, @@ -148,7 +148,7 @@ private fun WriteRoutineScreen( .windowInsetsPadding(WindowInsets.ime), ) { BitnagilTopBar( - title = if (state.writeRoutineType == WriteRoutineType.Add) "루틴 등록" else "루틴 수정", + title = if (state.routineWriteType == RoutineWriteType.Add) "루틴 등록" else "루틴 수정", showBackButton = true, onBackClick = onClickBack, ) @@ -171,7 +171,7 @@ private fun WriteRoutineScreen( Spacer(modifier = Modifier.height(6.dp)) Text( - text = "${state.routineName.length} / ${WriteRoutineState.MAX_ROUTINE_NAME_LENGTH}", + text = "${state.routineName.length} / ${RoutineWriteState.MAX_ROUTINE_NAME_LENGTH}", style = BitnagilTheme.typography.caption1Medium, color = BitnagilTheme.colors.coolGray80, textAlign = TextAlign.End, @@ -368,10 +368,10 @@ private fun getSubRoutinePlaceHolder(index: Int): String { @Preview @Composable -fun WriteRoutineScreenPreview() { +fun RoutineWriteScreenPreview() { BitnagilTheme { - WriteRoutineScreen( - state = WriteRoutineState.INIT.copy(periodUiExpanded = true, startTimeUiExpanded = true), + RoutineWriteScreen( + state = RoutineWriteState.INIT.copy(periodUiExpanded = true, startTimeUiExpanded = true), setRoutineName = {}, setSubRoutineName = { _, _ -> }, selectRepeatTime = {}, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt similarity index 91% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt index ddba4b18..34fbaa59 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/WriteRoutineViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt @@ -8,16 +8,16 @@ import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType import com.threegap.bitnagil.domain.writeroutine.usecase.EditRoutineUseCase import com.threegap.bitnagil.domain.writeroutine.usecase.RegisterRoutineUseCase -import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineSideEffect -import com.threegap.bitnagil.presentation.screen.routinewrite.contract.WriteRoutineState +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteSideEffect +import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteState import com.threegap.bitnagil.presentation.screen.routinewrite.model.Date import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay import com.threegap.bitnagil.presentation.screen.routinewrite.model.SubRoutineUiModel import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time -import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType -import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.RoutineWriteScreenArg import com.threegap.bitnagil.presentation.screen.routinewrite.model.toUiModel import dagger.assisted.Assisted import dagger.assisted.AssistedFactory @@ -27,22 +27,22 @@ import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost import org.orbitmvi.orbit.viewmodel.container -@HiltViewModel(assistedFactory = WriteRoutineViewModel.Factory::class) -class WriteRoutineViewModel @AssistedInject constructor( +@HiltViewModel(assistedFactory = RoutineWriteViewModel.Factory::class) +class RoutineWriteViewModel @AssistedInject constructor( savedStateHandle: SavedStateHandle, private val registerRoutineUseCase: RegisterRoutineUseCase, private val editRoutineUseCase: EditRoutineUseCase, private val getRoutineUseCase: GetRoutineUseCase, private val getRecommendRoutineUseCase: GetRecommendRoutineUseCase, - @Assisted private val writeRoutineArg: WriteRoutineScreenArg, -) : ContainerHost, ViewModel() { + @Assisted private val writeRoutineArg: RoutineWriteScreenArg, +) : ContainerHost, ViewModel() { @AssistedFactory interface Factory { - fun create(writeRoutineArg: WriteRoutineScreenArg): WriteRoutineViewModel + fun create(writeRoutineArg: RoutineWriteScreenArg): RoutineWriteViewModel } - override val container: Container = container( + override val container: Container = container( savedStateHandle = savedStateHandle, - initialState = WriteRoutineState.INIT, + initialState = RoutineWriteState.INIT, ) private var routineId: String? = null @@ -53,12 +53,12 @@ class WriteRoutineViewModel @AssistedInject constructor( initResource(navigationArg) } - private fun initResource(navigationArg: WriteRoutineScreenArg) = intent { + private fun initResource(navigationArg: RoutineWriteScreenArg) = intent { when (navigationArg) { - is WriteRoutineScreenArg.Add -> { + is RoutineWriteScreenArg.Add -> { reduce { state.copy( - writeRoutineType = WriteRoutineType.Add, + routineWriteType = RoutineWriteType.Add, ) } @@ -67,10 +67,10 @@ class WriteRoutineViewModel @AssistedInject constructor( loadRecommendRoutine(it) } } - is WriteRoutineScreenArg.Edit -> { + is RoutineWriteScreenArg.Edit -> { reduce { state.copy( - writeRoutineType = WriteRoutineType.Edit(updateRoutineFromNowDate = navigationArg.updateRoutineFromNowDate), + routineWriteType = RoutineWriteType.Edit(updateRoutineFromNowDate = navigationArg.updateRoutineFromNowDate), ) } @@ -158,7 +158,7 @@ class WriteRoutineViewModel @AssistedInject constructor( } fun setRoutineName(name: String) = intent { - if (name.length > WriteRoutineState.MAX_ROUTINE_NAME_LENGTH) return@intent + if (name.length > RoutineWriteState.MAX_ROUTINE_NAME_LENGTH) return@intent reduce { state.copy( routineName = name, @@ -360,8 +360,8 @@ class WriteRoutineViewModel @AssistedInject constructor( null -> listOf() } - when (val writeRoutineType = currentState.writeRoutineType) { - WriteRoutineType.Add -> { + when (val writeRoutineType = currentState.routineWriteType) { + RoutineWriteType.Add -> { reduce { state.copy( loading = true, @@ -382,7 +382,7 @@ class WriteRoutineViewModel @AssistedInject constructor( ) if (registerRoutineResult.isSuccess) { - postSideEffect(WriteRoutineSideEffect.MoveToPreviousScreen) + postSideEffect(RoutineWriteSideEffect.MoveToPreviousScreen) } else { reduce { state.copy( @@ -391,7 +391,7 @@ class WriteRoutineViewModel @AssistedInject constructor( } } } - is WriteRoutineType.Edit -> { + is RoutineWriteType.Edit -> { val currentRoutineId = routineId ?: return@intent val subRoutines = if (currentState.selectNotUseSubRoutines) emptyList() else currentState.subRoutineNames.filter { it.isNotEmpty() } val routineUpdateType = if (writeRoutineType.updateRoutineFromNowDate) { @@ -418,8 +418,8 @@ class WriteRoutineViewModel @AssistedInject constructor( ) if (editRoutineResult.isSuccess) { - postSideEffect(WriteRoutineSideEffect.MoveToPreviousScreen) - postSideEffect(WriteRoutineSideEffect.ShowToast("루틴 수정이 완료되었습니다.")) + postSideEffect(RoutineWriteSideEffect.MoveToPreviousScreen) + postSideEffect(RoutineWriteSideEffect.ShowToast("루틴 수정이 완료되었습니다.")) } else { reduce { state.copy( diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteSideEffect.kt new file mode 100644 index 00000000..dd665126 --- /dev/null +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteSideEffect.kt @@ -0,0 +1,6 @@ +package com.threegap.bitnagil.presentation.screen.routinewrite.contract + +sealed interface RoutineWriteSideEffect { + data object MoveToPreviousScreen : RoutineWriteSideEffect + data class ShowToast(val message: String) : RoutineWriteSideEffect +} diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt similarity index 95% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt index c0490b8b..765ff916 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt @@ -7,11 +7,11 @@ import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time -import com.threegap.bitnagil.presentation.screen.routinewrite.model.WriteRoutineType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType import kotlinx.parcelize.Parcelize @Parcelize -data class WriteRoutineState( +data class RoutineWriteState( val routineName: String, val subRoutineNames: List, val selectNotUseSubRoutines: Boolean, @@ -25,7 +25,7 @@ data class WriteRoutineState( val showTimePickerBottomSheet: Boolean, val showStartDatePickerBottomSheet: Boolean, val showEndDatePickerBottomSheet: Boolean, - val writeRoutineType: WriteRoutineType, + val routineWriteType: RoutineWriteType, val subRoutineUiExpanded: Boolean, val repeatDaysUiExpanded: Boolean, val periodUiExpanded: Boolean, @@ -35,7 +35,7 @@ data class WriteRoutineState( companion object { const val MAX_ROUTINE_NAME_LENGTH = 20 - val INIT = WriteRoutineState( + val INIT = RoutineWriteState( routineName = "", subRoutineNames = listOf("", "", ""), selectNotUseSubRoutines = false, @@ -76,7 +76,7 @@ data class WriteRoutineState( showStartDatePickerBottomSheet = false, showEndDatePickerBottomSheet = false, showTimePickerBottomSheet = false, - writeRoutineType = WriteRoutineType.Add, + routineWriteType = RoutineWriteType.Add, subRoutineUiExpanded = false, repeatDaysUiExpanded = false, periodUiExpanded = false, diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt deleted file mode 100644 index 44bee6af..00000000 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/WriteRoutineSideEffect.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.threegap.bitnagil.presentation.screen.routinewrite.contract - -sealed interface WriteRoutineSideEffect { - data object MoveToPreviousScreen : WriteRoutineSideEffect - data class ShowToast(val message: String) : WriteRoutineSideEffect -} diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RoutineWriteType.kt similarity index 51% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RoutineWriteType.kt index c74479db..27f34b8e 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/WriteRoutineType.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RoutineWriteType.kt @@ -4,10 +4,10 @@ import android.os.Parcelable import kotlinx.parcelize.Parcelize @Parcelize -sealed class WriteRoutineType : Parcelable { +sealed class RoutineWriteType : Parcelable { @Parcelize - data object Add : WriteRoutineType() + data object Add : RoutineWriteType() @Parcelize - data class Edit(val updateRoutineFromNowDate: Boolean) : WriteRoutineType() + data class Edit(val updateRoutineFromNowDate: Boolean) : RoutineWriteType() } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/WriteRoutineScreenArg.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/RoutineWriteScreenArg.kt similarity index 62% rename from presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/WriteRoutineScreenArg.kt rename to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/RoutineWriteScreenArg.kt index 0c7afc04..e5657fac 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/WriteRoutineScreenArg.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/navarg/RoutineWriteScreenArg.kt @@ -3,10 +3,10 @@ package com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg import kotlinx.serialization.Serializable @Serializable -sealed class WriteRoutineScreenArg { +sealed class RoutineWriteScreenArg { @Serializable - data class Add(val baseRoutineId: String?) : WriteRoutineScreenArg() + data class Add(val baseRoutineId: String?) : RoutineWriteScreenArg() @Serializable - data class Edit(val routineId: String, val updateRoutineFromNowDate: Boolean) : WriteRoutineScreenArg() + data class Edit(val routineId: String, val updateRoutineFromNowDate: Boolean) : RoutineWriteScreenArg() } From c2d363ac430b9eb87a61e21b325968f4bc3bc7af Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Thu, 26 Feb 2026 21:26:16 +0900 Subject: [PATCH 12/13] =?UTF-8?q?REFACTOR:=20=EC=A0=9C=EB=B3=B4=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=ED=99=94=EB=A9=B4=20Route=20object?= =?UTF-8?q?=EB=AA=85=EC=9D=84=20Report=EC=97=90=EC=84=9C=20ReportWrite?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/threegap/bitnagil/MainNavHost.kt | 4 ++-- app/src/main/java/com/threegap/bitnagil/Route.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt index 17fda9ad..8621fe2a 100644 --- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt +++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt @@ -140,7 +140,7 @@ fun MainNavHost( } }, navigateToReport = { - navigator.navController.navigate(Route.Report) { + navigator.navController.navigate(Route.ReportWrite) { launchSingleTop = true } }, @@ -305,7 +305,7 @@ fun MainNavHost( ) } - composable { + composable { ReportWriteScreenContainer( navigateToBack = { if (navigator.navController.previousBackStackEntry != null) { diff --git a/app/src/main/java/com/threegap/bitnagil/Route.kt b/app/src/main/java/com/threegap/bitnagil/Route.kt index 4da74356..3cbe365a 100644 --- a/app/src/main/java/com/threegap/bitnagil/Route.kt +++ b/app/src/main/java/com/threegap/bitnagil/Route.kt @@ -50,7 +50,7 @@ sealed interface Route { data object Guide : Route @Serializable - data object Report : Route + data object ReportWrite : Route @Serializable data object ReportHistory : Route From 377d7f7c2e666689e7a9ac1b2f4d280874be65fd Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Thu, 26 Feb 2026 21:41:15 +0900 Subject: [PATCH 13/13] =?UTF-8?q?CHORE:=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bitnagil/presentation/screen/routinewrite/RoutineWrite.kt | 2 +- .../presentation/screen/routinewrite/RoutineWriteViewModel.kt | 2 +- .../screen/routinewrite/contract/RoutineWriteState.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt index 7a0a614c..c75a1bba 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWrite.kt @@ -42,8 +42,8 @@ import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWr import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWriteState import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType -import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt index 34fbaa59..e4f3b61d 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/RoutineWriteViewModel.kt @@ -13,10 +13,10 @@ import com.threegap.bitnagil.presentation.screen.routinewrite.contract.RoutineWr import com.threegap.bitnagil.presentation.screen.routinewrite.model.Date import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay import com.threegap.bitnagil.presentation.screen.routinewrite.model.SubRoutineUiModel import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time -import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.RoutineWriteScreenArg import com.threegap.bitnagil.presentation.screen.routinewrite.model.toUiModel import dagger.assisted.Assisted diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt index 765ff916..3b8ec9ee 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/contract/RoutineWriteState.kt @@ -5,9 +5,9 @@ import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory import com.threegap.bitnagil.presentation.screen.routinewrite.model.Date import com.threegap.bitnagil.presentation.screen.routinewrite.model.Day import com.threegap.bitnagil.presentation.screen.routinewrite.model.RepeatType +import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType import com.threegap.bitnagil.presentation.screen.routinewrite.model.SelectableDay import com.threegap.bitnagil.presentation.screen.routinewrite.model.Time -import com.threegap.bitnagil.presentation.screen.routinewrite.model.RoutineWriteType import kotlinx.parcelize.Parcelize @Parcelize