Skip to content

Commit 5b71f6f

Browse files
committed
FIX: 목표 재설정시 추천 루틴을 선택 가능하도록 수정
1 parent 3cb9ea7 commit 5b71f6f

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,7 @@ private fun OnBoardingScreen(
115115
items = currentOnBoardingPageInfo.routines,
116116
nextButtonEnable = state.nextButtonEnable,
117117
onClickNextButton = onClickRegister,
118-
onClickItem = if (state.onBoardingSetType.canSelectRoutine) {
119-
onClickRoutine
120-
} else {
121-
null
122-
},
118+
onClickItem = onClickRoutine,
123119
onClickSkip = if (state.onBoardingSetType.canSkip) {
124120
onClickSkip
125121
} else {

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
@@ -237,7 +237,7 @@ class OnBoardingViewModel @AssistedInject constructor(
237237
return currentState.copy(
238238
currentOnBoardingPageInfo = recommendRoutinePageInfo,
239239
currentStep = currentState.currentStep + 1,
240-
nextButtonEnable = !currentState.onBoardingSetType.canSelectRoutine,
240+
nextButtonEnable = !currentState.onBoardingSetType.mustSelectRecommendRoutine,
241241
)
242242
}
243243

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScre
55
enum class OnBoardingSetType(
66
val subText: String,
77
val canSkip: Boolean,
8-
val canSelectRoutine: Boolean,
8+
val mustSelectRecommendRoutine: Boolean,
99
) {
1010
NEW(
1111
subText = "당신의 생활 패턴과 목표에 맞춰 구성된 맞춤 루틴이에요.\n지금부터 가볍게 시작해보세요.",
1212
canSkip = true,
13-
canSelectRoutine = true,
13+
mustSelectRecommendRoutine = true,
1414
),
1515
RESET(
1616
subText = "생활 패턴과 목표에 맞춰 다시 구성된 맞춤 루틴이에요.\n원하는 루틴을 선택해서 가볍게 시작해보세요.",
1717
canSkip = false,
18-
canSelectRoutine = false,
18+
mustSelectRecommendRoutine = false,
1919
),
2020
;
2121

0 commit comments

Comments
 (0)