Skip to content

Commit 4e7ac3b

Browse files
committed
✨ :: Add handing main navigate
1 parent 4387072 commit 4e7ac3b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

feature/main/src/main/java/com/stackknowledge/main/MainPageScreen.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
2121
import androidx.compose.ui.unit.dp
2222
import androidx.hilt.navigation.compose.hiltViewModel
2323
import androidx.lifecycle.compose.collectAsStateWithLifecycle
24+
import com.minstone.ui.navigation.NavigateType
2425
import com.minstone.ui.navigation.StackKnowledgeBottomNavigation
2526
import com.stackknowledge.design_system.component.dialog.JoinWaitingDialog
2627
import com.stackknowledge.design_system.component.dialog.StackKnowledgeDialog
@@ -37,7 +38,7 @@ import enumdatatype.Authority
3738

3839
@Composable
3940
internal fun MainPageRoute(
40-
onNavigate: (Authority, String) -> Unit,
41+
onNavigate: (Authority, String, Int?) -> Unit,
4142
viewModel: MainViewModel = hiltViewModel()
4243
) {
4344
var role by remember { mutableStateOf(Authority.ROLE_TEACHER) } //로그인 로직 적용후 변경
@@ -48,7 +49,7 @@ internal fun MainPageRoute(
4849
role = role,
4950
getMissionUiState = getMissionUiState,
5051
getRankingUiState = getRankingUiState,
51-
onNavigate = { navType -> onNavigate(role, navType) },
52+
onNavigate = { navType, index -> onNavigate(role, navType, index) },
5253
initMain = {
5354
with(viewModel) {
5455
getMission()
@@ -64,7 +65,7 @@ private fun MainPageScreen(
6465
role: Authority,
6566
getMissionUiState: GetMissionUiState,
6667
getRankingUiState: GetRankingUiState,
67-
onNavigate: (String) -> Unit,
68+
onNavigate: (String, Int?) -> Unit,
6869
initMain: () -> Unit,
6970
) {
7071
val scrollState = rememberScrollState()
@@ -91,11 +92,13 @@ private fun MainPageScreen(
9192
StackKnowledgePager()
9293
Spacer(modifier = modifier.height(28.dp))
9394
MissionList(
94-
getMissionUiState = getMissionUiState
95+
getMissionUiState = getMissionUiState,
96+
onClick = { onNavigate(NavigateType.MISSION.value, it) }
9597
)
9698
Spacer(modifier = modifier.height(20.dp))
9799
RankingList(
98-
getRankingUiState = getRankingUiState
100+
getRankingUiState = getRankingUiState,
101+
onClick = { onNavigate(NavigateType.RANKING.value, it) }
99102
)
100103
}
101104
}
@@ -112,7 +115,7 @@ private fun MainPageScreen(
112115
modifier = Modifier,
113116
role = role
114117
) {
115-
onNavigate(it)
118+
onNavigate(it, null)
116119
}
117120
}
118121
}

feature/main/src/main/java/com/stackknowledge/main/navigation/MainNavigation.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ fun NavController.navigateToMain(navOptions: NavOptions? = null) {
1414
}
1515

1616
fun NavGraphBuilder.mainScreen(
17-
onNavigate: (Authority, String) -> Unit,
17+
onNavigate: (Authority, String, Int?) -> Unit,
1818
) {
1919
composable(route = mainPageRoute) {
2020
MainPageRoute(
21-
onNavigate = onNavigate
21+
onNavigate = onNavigate,
2222
)
2323
}
2424
}

0 commit comments

Comments
 (0)