Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/src/main/java/com/kikidan/todakun/TodakunApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ fun TodakunApp(
onNavigateToCompatibility = { navigator.push(TodakunRoute.CompatibilityInput) },
onNavigateToDateFortune = { navigator.push(TodakunRoute.DateFortuneInput) },
onNavigateToYearFortune = { navigator.push(TodakunRoute.YearFortuneInput) },
onNavigateToChat = { navigator.push(TodakunRoute.Chat()) },
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ fun FortuneReportRoute(
onBackClick = onNavigateToBack,
onNavigateToLuckAction = onNavigateToLuckAction,
onDetailDismiss = viewModel::closeDetail,
onNavigateToChat = onNavigateToChat,
onNavigateToChat = {
// 바텀시트를 띄운 채로 채팅에 진입하면, 채팅에서 뒤로가기 시 백스택 복귀와 함께 바텀시트가 다시 열린다.
viewModel.closeDetail()
onNavigateToChat()
},
onScoreProgressRowClick = viewModel::openDetail,
modifier = modifier,
)
Expand Down
6 changes: 6 additions & 0 deletions feature/home/src/main/java/com/kikidan/home/HomeRoute.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ fun HomeRoute(
onNavigateToCompatibility: () -> Unit,
onNavigateToDateFortune: () -> Unit,
onNavigateToYearFortune: () -> Unit,
onNavigateToChat: () -> Unit,
modifier: Modifier = Modifier,
viewModel: HomeViewModel = hiltViewModel(),
) {
Expand All @@ -46,6 +47,11 @@ fun HomeRoute(
onNavigateToCompatibility = onNavigateToCompatibility,
onNavigateToDateFortune = onNavigateToDateFortune,
onNavigateToYearFortune = onNavigateToYearFortune,
onNavigateToChat = {
// 바텀시트를 띄운 채로 채팅에 진입하면, 채팅에서 뒤로가기 시 백스택 복귀와 함께 바텀시트가 다시 열린다.
viewModel.closeDetail()
onNavigateToChat()
},
modifier = modifier,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import com.kikidan.home.util.categoryLabel
internal fun FortuneDetailBottomSheet(
detail: DetailSheetUiState,
onDismissRequest: () -> Unit,
onAskTodakClick: () -> Unit,
modifier: Modifier = Modifier,
) {
val screenHeight =
Expand Down Expand Up @@ -108,9 +109,7 @@ internal fun FortuneDetailBottomSheet(
PrimaryButton(
modifier = Modifier.fillMaxWidth(),
text = stringResource(R.string.home_detail_sheet_cta),
onClick = {
// TODO(#38): 챗봇 연결 미구현, 머지 후 연결
},
onClick = onAskTodakClick,
size = TodakunButtonSize.Large,
)
}
Expand Down Expand Up @@ -211,6 +210,7 @@ private fun FortuneDetailBottomSheetSuccessPreview() {
content = "오늘은 감정 표현이 풍부해지는 날이에요. 주변 사람들과의 교류가 활발해지고, 새로운 인연이 생길 수도 있어요.",
),
onDismissRequest = {},
onAskTodakClick = {},
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ internal fun FortuneReportScreen(
FortuneDetailBottomSheet(
detail = state.detail,
onDismissRequest = onDetailDismiss,
onAskTodakClick = onNavigateToChat,
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ internal fun HomeScreen(
onNavigateToCompatibility: () -> Unit,
onNavigateToDateFortune: () -> Unit,
onNavigateToYearFortune: () -> Unit,
onNavigateToChat: () -> Unit,
modifier: Modifier = Modifier,
) {
val backdrop = rememberLayerBackdrop()
Expand Down Expand Up @@ -117,6 +118,7 @@ internal fun HomeScreen(
FortuneDetailBottomSheet(
detail = state.detail,
onDismissRequest = onDetailDismiss,
onAskTodakClick = onNavigateToChat,
)
}

Expand Down Expand Up @@ -293,6 +295,7 @@ private fun HomeScreenSuccessPreview() {
onNavigateToCompatibility = {},
onNavigateToDateFortune = {},
onNavigateToYearFortune = {},
onNavigateToChat = {},
)
}
}
Loading