Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
67a60e8
#267 [move]: quest 작성, 완료 패키지 분리
znayeonzn Feb 22, 2026
3818121
#267 [move]: quest 작성, 완료 패키지 분리
znayeonzn Feb 22, 2026
6f81ee3
#267 [feat]: 퀘스트 작성 UI 수정 및 텍스트 스크롤 추가
znayeonzn Feb 22, 2026
70e256e
#267 [feat]: 퀘스트 완료 모달 띄우기
znayeonzn Feb 22, 2026
6a705c1
#267 [chore]: ktlint format
znayeonzn Feb 22, 2026
d6c40a3
#267 [merge] : develop 브랜치 반영
znayeonzn Feb 22, 2026
216434a
#267 [move] : behavior quest package 분리
znayeonzn Feb 22, 2026
cf71910
#267 [fix] : 텍스트 필드가 포커스된 상태일 때만 스크롤 동작하도록 수정
znayeonzn Feb 22, 2026
3713b4e
#267 [chore] : 함수 네이밍 수정
znayeonzn Feb 23, 2026
6359e7a
#267 [feat] : 행동형 퀘스트 작성 UI 및 스크롤 기능 추가
znayeonzn Feb 23, 2026
18244dd
#267 [merge]: conflict 해결
znayeonzn Feb 23, 2026
300a3ca
#267 [fix]: imepadding, scroll 문제 해결
znayeonzn Feb 24, 2026
2952ad7
#267 [feat]: 공통 퀘스트 UI
znayeonzn Feb 24, 2026
df06ebf
#267 [feat]: 공통 퀘스트 네비 연결
znayeonzn Feb 24, 2026
3d354b8
#267 [merge] : develop 브랜치 반영
znayeonzn Feb 26, 2026
33b4296
#267 [feat] : response 필드 추가
znayeonzn Feb 27, 2026
7f14a5c
#267 [feat] : 행동형 퀘스트 완료 화면 UI 구현
znayeonzn Feb 27, 2026
84bfc02
#267 [mod] : 코드 리뷰 반영
znayeonzn Feb 27, 2026
0285cf2
#267 [chore] : 코드리뷰 반영
sohee6989 Feb 28, 2026
20cdad8
#267 [chore] : ktlinnt 체크
sohee6989 Feb 28, 2026
23d91e0
#267 [feat] : 다시보기 화면 - ai 답장 버튼 구현
sohee6989 Feb 28, 2026
687f842
#267 [chore] : 행동형 완료 화면 버튼 간격 변경
sohee6989 Feb 28, 2026
be2b7cb
#267 [chore] : 안쓰는 주석 삭제
sohee6989 Feb 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ data class QuestRecordedDetailResponseDto(
val questEmotionState: String,
@SerialName("emotionDescription")
val emotionDescription: String,
@SerialName("aiAnswerExists")
val aiAnswerExists: Boolean,
)
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ fun QuestRecordedDetailResponseDto.toDomain(): QuestRecordedDetailModel =
imageKey = this.imageKey,
imageUrl = this.imageUrl,
emotionDescription = this.emotionDescription,
aiAnswerExists = this.aiAnswerExists,
)
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ data class QuestRecordedDetailModel(
val imageKey: String? = null,
val imageUrl: String? = null,
val emotionDescription: String,
val aiAnswerExists: Boolean,
)
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ fun MainNavHost(
navigateToHome = { navigator.navigateToHome(questNavOptions) },
navigateToQuestRecording = { questId -> navigator.navigateToQuestRecording(questId) },
navigateToQuestBehavior = { questId -> navigator.navigateToQuestBehavior(questId) },
navigateToQuestCommon = { questId -> navigator.navigateToQuestCommon(questId) },
navigateToQuestReview = { questId -> navigator.navigateToQuestReview(questId) },
navigateToOffboardingCompletedGuide = {
navigator.navigateToOffboardingCompletedGuide(
Expand Down Expand Up @@ -133,6 +134,12 @@ fun MainNavHost(
navOptions = clearStackNavOptions,
)
},
navigateToQuestCommonComplete = { questId ->
navigator.navigateToQuestCommonComplete(
questId = questId,
navOptions = clearStackNavOptions,
)
},
navigateUp = navigator::navigateUp,
paddingValues = paddingValues,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import com.byeboo.app.presentation.offboarding.navigation.navigateToOffboardingQ
import com.byeboo.app.presentation.offboarding.navigation.navigateToOffboardingQuestReview
import com.byeboo.app.presentation.quest.behavior.navigation.navigateToQuestBehavior
import com.byeboo.app.presentation.quest.behavior.navigation.navigateToQuestBehaviorComplete
import com.byeboo.app.presentation.quest.common.navigation.navigateToQuestCommon
import com.byeboo.app.presentation.quest.common.navigation.navigateToQuestCommonComplete
import com.byeboo.app.presentation.quest.navigation.Quest
import com.byeboo.app.presentation.quest.navigation.navigateToQuest
import com.byeboo.app.presentation.quest.navigation.navigateToQuestReview
Expand Down Expand Up @@ -184,6 +186,12 @@ class MainNavigator(
)
}

fun navigateToQuestCommon(questId: Long) {
navController.navigateToQuestCommon(
questId = questId,
)
}

fun navigateToQuestRecordingComplete(
questId: Long,
navOptions: NavOptions? = null,
Expand All @@ -198,6 +206,13 @@ class MainNavigator(
navController.navigateToQuestBehaviorComplete(questId = questId, navOptions = navOptions)
}

fun navigateToQuestCommonComplete(
questId: Long,
navOptions: NavOptions? = null,
) {
navController.navigateToQuestCommonComplete(questId = questId, navOptions = navOptions)
}

fun navigateToQuestReview(
questId: Long,
navOptions: NavOptions? = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ fun QuestRoute(
navigateToQuestTip: (Long, QuestType) -> Unit,
navigateToQuestRecording: (Long) -> Unit,
navigateToQuestBehavior: (Long) -> Unit,
navigateToQuestCommon: (Long) -> Unit,
navigateToQuestReview: (Long) -> Unit,
paddingValues: PaddingValues,
viewModel: QuestViewModel = hiltViewModel(),
Expand Down Expand Up @@ -66,6 +67,8 @@ fun QuestRoute(
navigateToQuestRecording(effect.questId)
is QuestSideEffect.NavigateToQuestBehavior ->
navigateToQuestBehavior(effect.questId)
is QuestSideEffect.NavigateToQuestCommon ->
navigateToQuestCommon(effect.questId)
is QuestSideEffect.NavigateToQuestReview ->
navigateToQuestReview(effect.questId)
is QuestSideEffect.ShowSnackBar ->
Expand All @@ -79,6 +82,7 @@ fun QuestRoute(
listState = listState,
paddingValues = paddingValues,
onQuestClick = viewModel::onQuestClick,
onCommonQuestClick = navigateToQuestCommon,
onDismissModal = viewModel::onQuitDismissModal,
onTipClick = viewModel::onTipClick,
onQuestStart = viewModel::onQuestStart,
Expand All @@ -93,6 +97,7 @@ private fun QuestScreen(
listState: LazyListState,
paddingValues: PaddingValues,
onQuestClick: (Long) -> Unit,
onCommonQuestClick: (Long) -> Unit,
onDismissModal: () -> Unit,
onTipClick: () -> Unit,
onQuestStart: () -> Unit,
Expand Down Expand Up @@ -146,6 +151,7 @@ private fun QuestScreen(
CommonJourneyScreen(
state = uiState.commonJourneyState,
onDateChange = onDateChange,
onCommonQuestClick = onCommonQuestClick,
)
}
}
Expand Down
Loading