Skip to content

Commit 38e8284

Browse files
committed
FIX: 온보딩 수정시 루틴 선택 불가능하도록 수정, 온보딩 설정 API의 request 부분 수정
1 parent 6e8c5ee commit 38e8284

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

data/src/main/java/com/threegap/bitnagil/data/onboarding/model/dto/OnBoardingItemDto.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@ data class OnBoardingItemDto(
3535
)
3636

3737
val RealOutingZeroPerWeek = OnBoardingItemDto(
38-
id = "ZERO_PER_WEEK",
38+
id = "NEVER",
3939
title = "밖에 나가지 않고 집에서만 지냈어요",
4040
description = null,
4141
)
4242

4343
val RealOutingOneToTwoPerWeek = OnBoardingItemDto(
44-
id = "ONE_TO_TWO_PER_WEEK",
44+
id = "SHORT",
4545
title = "잠깐 외출했어요",
4646
description = null,
4747
)
4848

4949
val RealOutingThreeToFourPerWeek = OnBoardingItemDto(
50-
id = "THREE_TO_FOUR_PER_WEEK",
50+
id = "SOMETIMES",
5151
title = "가끔 나가요",
5252
description = null,
5353
)
5454

5555
val RealOutingMoreThanFivePerWeek = OnBoardingItemDto(
56-
id = "MORE_THAN_FIVE_PER_WEEK",
56+
id = "OFTEN",
5757
title = "자주 외출해요",
5858
description = null,
5959
)
@@ -83,19 +83,19 @@ data class OnBoardingItemDto(
8383
)
8484

8585
val TargetOutingOneToTwoPerWeek = OnBoardingItemDto(
86-
id = "ONE_TO_TWO_PER_WEEK",
86+
id = "ONE_PER_WEEK",
8787
title = "시작이 더 중요해요",
8888
description = "일주일에 1회",
8989
)
9090

9191
val TargetOutingThreeToFourPerWeek = OnBoardingItemDto(
92-
id = "THREE_TO_FOUR_PER_WEEK",
92+
id = "TWO_TO_THREE_PER_WEEK",
9393
title = "너무 무리하지 않아도 괜찮아요",
9494
description = "일주일에 2~3회",
9595
)
9696

9797
val TargetOutingMoreThenFivePerWeek = OnBoardingItemDto(
98-
id = "MORE_THAN_FIVE_PER_WEEK",
98+
id = "MORE_THAN_FOUR_PER_WEEK",
9999
title = "이 정도면 충분히 활력 있는 한 주가 될거에요",
100100
description = "일주일에 4회 이상",
101101
)

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class OnBoardingViewModel @AssistedInject constructor(
147147
return currentState.copy(
148148
currentOnBoardingPageInfo = recommendRoutinePageInfo,
149149
currentStep = currentState.currentStep + 1,
150-
nextButtonEnable = false,
150+
nextButtonEnable = !currentState.onBoardingSetType.canSelectRoutine,
151151
)
152152
}
153153

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingSetType.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ enum class OnBoardingSetType(
1010
NEW(
1111
subText = "당신의 생활 패턴과 목표에 맞춰 구성된 맞춤 루틴이에요.\n지금부터 가볍게 시작해보세요.",
1212
canSkip = true,
13-
canSelectRoutine = false,
13+
canSelectRoutine = true,
1414
),
1515
RESET(
1616
subText = "생활 패턴과 목표에 맞춰 다시 구성된 맞춤 루틴이에요.\n원하는 루틴을 선택해서 가볍게 시작해보세요.",
1717
canSkip = false,
18-
canSelectRoutine = true,
18+
canSelectRoutine = false,
1919
),
2020
;
2121

0 commit comments

Comments
 (0)