Skip to content

Commit f3689fd

Browse files
l5x5ll5x5l
committed
REFACTOR: 감정구슬, 설명서, 홈 화면 경로 수정
1 parent 5fcc901 commit f3689fd

46 files changed

Lines changed: 135 additions & 132 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import androidx.navigation.compose.NavHost
77
import androidx.navigation.compose.composable
88
import androidx.navigation.toRoute
99
import com.threegap.bitnagil.navigation.home.HomeNavHost
10-
import com.threegap.bitnagil.presentation.emotion.EmotionScreenContainer
11-
import com.threegap.bitnagil.presentation.guide.GuideScreenContainer
10+
import com.threegap.bitnagil.presentation.screen.emotion.EmotionScreenContainer
11+
import com.threegap.bitnagil.presentation.screen.guide.GuideScreenContainer
1212
import com.threegap.bitnagil.presentation.login.LoginScreenContainer
1313
import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
1414
import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel

‎app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilFloatingActionM
2929
import com.threegap.bitnagil.designsystem.component.atom.FloatingActionItem
3030
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
3131
import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
32-
import com.threegap.bitnagil.presentation.home.HomeScreenContainer
32+
import com.threegap.bitnagil.presentation.screen.home.HomeScreenContainer
3333
import com.threegap.bitnagil.presentation.mypage.MyPageScreenContainer
3434
import com.threegap.bitnagil.presentation.recommendroutine.RecommendRoutineScreenContainer
3535
import com.threegap.bitnagil.util.setStatusBarContentColor

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineForDayUseCase
88
import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineUseCase
99
import com.threegap.bitnagil.domain.routine.usecase.FetchWeeklyRoutinesUseCase
1010
import com.threegap.bitnagil.domain.writeroutine.usecase.GetWriteRoutineEventFlowUseCase
11-
import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays
11+
import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays
1212
import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListSideEffect
1313
import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState
1414
import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel

‎presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/WeeklyDatePicker.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import androidx.compose.ui.tooling.preview.Preview
2222
import androidx.compose.ui.unit.dp
2323
import com.threegap.bitnagil.designsystem.BitnagilTheme
2424
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
25-
import com.threegap.bitnagil.presentation.home.util.formatDayOfMonth
26-
import com.threegap.bitnagil.presentation.home.util.formatDayOfWeekShort
27-
import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays
25+
import com.threegap.bitnagil.presentation.screen.home.util.formatDayOfMonth
26+
import com.threegap.bitnagil.presentation.screen.home.util.formatDayOfWeekShort
27+
import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays
2828
import java.time.LocalDate
2929

3030
@Composable

‎presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/contract/RoutineListState.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.threegap.bitnagil.presentation.routinelist.contract
22

3-
import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays
3+
import com.threegap.bitnagil.presentation.screen.home.util.getCurrentWeekDays
44
import com.threegap.bitnagil.presentation.routinelist.model.RoutineScheduleUiModel
55
import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
66
import java.time.LocalDate

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.threegap.bitnagil.presentation.routinelist.model
33
import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
44
import com.threegap.bitnagil.domain.routine.model.DayOfWeek
55
import com.threegap.bitnagil.domain.routine.model.Routine
6-
import com.threegap.bitnagil.presentation.home.util.formatExecutionTime12Hour
7-
import com.threegap.bitnagil.presentation.home.util.toShortDateFormat
6+
import com.threegap.bitnagil.presentation.screen.home.util.formatExecutionTime12Hour
7+
import com.threegap.bitnagil.presentation.screen.home.util.toShortDateFormat
88

99
data class RoutineUiModel(
1010
val routineId: String,

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.emotion
1+
package com.threegap.bitnagil.presentation.screen.emotion
22

33
import androidx.activity.compose.BackHandler
44
import androidx.compose.foundation.layout.BoxWithConstraints
@@ -11,11 +11,11 @@ import androidx.compose.ui.unit.dp
1111
import androidx.hilt.navigation.compose.hiltViewModel
1212
import com.threegap.bitnagil.presentation.common.dimension.pxToDp
1313
import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
14-
import com.threegap.bitnagil.presentation.emotion.component.template.EmotionRecommendRoutineScreen
15-
import com.threegap.bitnagil.presentation.emotion.component.template.SimpleEmotionSelectionScreen
16-
import com.threegap.bitnagil.presentation.emotion.component.template.SwipeEmotionSelectionScreen
17-
import com.threegap.bitnagil.presentation.emotion.contract.EmotionSideEffect
18-
import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep
14+
import com.threegap.bitnagil.presentation.screen.emotion.component.template.EmotionRecommendRoutineScreen
15+
import com.threegap.bitnagil.presentation.screen.emotion.component.template.SimpleEmotionSelectionScreen
16+
import com.threegap.bitnagil.presentation.screen.emotion.component.template.SwipeEmotionSelectionScreen
17+
import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionSideEffect
18+
import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep
1919
import org.orbitmvi.orbit.compose.collectAsState
2020
import org.orbitmvi.orbit.compose.collectSideEffect
2121

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package com.threegap.bitnagil.presentation.emotion
1+
package com.threegap.bitnagil.presentation.screen.emotion
22

33
import androidx.lifecycle.SavedStateHandle
44
import androidx.lifecycle.ViewModel
55
import androidx.lifecycle.viewModelScope
66
import com.threegap.bitnagil.domain.emotion.usecase.GetEmotionsUseCase
77
import com.threegap.bitnagil.domain.emotion.usecase.RegisterEmotionUseCase
88
import com.threegap.bitnagil.domain.onboarding.usecase.RegisterRecommendOnBoardingRoutinesUseCase
9-
import com.threegap.bitnagil.presentation.emotion.contract.EmotionSideEffect
10-
import com.threegap.bitnagil.presentation.emotion.contract.EmotionState
11-
import com.threegap.bitnagil.presentation.emotion.model.EmotionScreenStep
12-
import com.threegap.bitnagil.presentation.emotion.model.toUiModel
9+
import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionSideEffect
10+
import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionState
11+
import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep
12+
import com.threegap.bitnagil.presentation.screen.emotion.model.toUiModel
1313
import dagger.hilt.android.lifecycle.HiltViewModel
1414
import kotlinx.coroutines.delay
1515
import kotlinx.coroutines.launch
@@ -26,7 +26,7 @@ class EmotionViewModel @Inject constructor(
2626
savedStateHandle: SavedStateHandle,
2727
) : ContainerHost<EmotionState, EmotionSideEffect>, ViewModel() {
2828

29-
override val container: Container<EmotionState, EmotionSideEffect> = container(initialState = EmotionState.Init, savedStateHandle = savedStateHandle)
29+
override val container: Container<EmotionState, EmotionSideEffect> = container(initialState = EmotionState.Companion.Init, savedStateHandle = savedStateHandle)
3030

3131
init {
3232
loadEmotions()

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/EmotionMarbleImage.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/EmotionMarbleImage.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.emotion.component.atom
1+
package com.threegap.bitnagil.presentation.screen.emotion.component.atom
22

33
import androidx.compose.foundation.Image
44
import androidx.compose.runtime.Composable
@@ -8,7 +8,7 @@ import androidx.compose.ui.res.painterResource
88
import coil3.compose.AsyncImage
99
import coil3.request.ImageRequest
1010
import coil3.request.crossfade
11-
import com.threegap.bitnagil.presentation.emotion.model.EmotionImageUiModel
11+
import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionImageUiModel
1212

1313
@Composable
1414
fun EmotionMarbleImage(

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/SpeechBubbleText.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/atom/SpeechBubbleText.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.emotion.component.atom
1+
package com.threegap.bitnagil.presentation.screen.emotion.component.atom
22

33
import androidx.compose.foundation.Canvas
44
import androidx.compose.foundation.background

0 commit comments

Comments
 (0)