Skip to content
Open
Show file tree
Hide file tree
Changes from 14 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
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 @@ -25,6 +25,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 @@ -183,6 +185,14 @@ class MainNavigator(
)
}

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

fun navigateToQuestRecordingComplete(
questId: Long,
navOptions: NavOptions? = null,
Expand All @@ -197,6 +207,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 @@ -37,6 +37,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 @@ -67,6 +68,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 @@ -80,6 +83,7 @@ fun QuestRoute(
listState = listState,
paddingValues = paddingValues,
onQuestClick = viewModel::onQuestClick,
onCommonQuestClick = navigateToQuestCommon ,
onDismissModal = viewModel::onQuitDismissModal,
onTipClick = viewModel::onTipClick,
onQuestStart = viewModel::onQuestStart,
Expand All @@ -94,6 +98,7 @@ private fun QuestScreen(
listState: LazyListState,
paddingValues: PaddingValues,
onQuestClick: (Long) -> Unit,
onCommonQuestClick: (Long) -> Unit,
onDismissModal: () -> Unit,
onTipClick: () -> Unit,
onQuestStart: () -> Unit,
Expand Down Expand Up @@ -148,6 +153,7 @@ private fun QuestScreen(
CommonJourneyScreen(
state = uiState.commonJourneyState,
onDateChange = onDateChange,
onCommonQuestClick = onCommonQuestClick
)
}
}
Expand Down
Loading