@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
21
21
import androidx.compose.ui.unit.dp
22
22
import androidx.hilt.navigation.compose.hiltViewModel
23
23
import androidx.lifecycle.compose.collectAsStateWithLifecycle
24
+ import com.minstone.ui.navigation.NavigateType
24
25
import com.minstone.ui.navigation.StackKnowledgeBottomNavigation
25
26
import com.stackknowledge.design_system.component.dialog.JoinWaitingDialog
26
27
import com.stackknowledge.design_system.component.dialog.StackKnowledgeDialog
@@ -37,7 +38,7 @@ import enumdatatype.Authority
37
38
38
39
@Composable
39
40
internal fun MainPageRoute (
40
- onNavigate : (Authority , String ) -> Unit ,
41
+ onNavigate : (Authority , String , Int? ) -> Unit ,
41
42
viewModel : MainViewModel = hiltViewModel()
42
43
) {
43
44
var role by remember { mutableStateOf(Authority .ROLE_TEACHER ) } // 로그인 로직 적용후 변경
@@ -48,7 +49,7 @@ internal fun MainPageRoute(
48
49
role = role,
49
50
getMissionUiState = getMissionUiState,
50
51
getRankingUiState = getRankingUiState,
51
- onNavigate = { navType -> onNavigate(role, navType) },
52
+ onNavigate = { navType, index -> onNavigate(role, navType, index ) },
52
53
initMain = {
53
54
with (viewModel) {
54
55
getMission()
@@ -64,7 +65,7 @@ private fun MainPageScreen(
64
65
role : Authority ,
65
66
getMissionUiState : GetMissionUiState ,
66
67
getRankingUiState : GetRankingUiState ,
67
- onNavigate : (String ) -> Unit ,
68
+ onNavigate : (String , Int? ) -> Unit ,
68
69
initMain : () -> Unit ,
69
70
) {
70
71
val scrollState = rememberScrollState()
@@ -91,11 +92,13 @@ private fun MainPageScreen(
91
92
StackKnowledgePager ()
92
93
Spacer (modifier = modifier.height(28 .dp))
93
94
MissionList (
94
- getMissionUiState = getMissionUiState
95
+ getMissionUiState = getMissionUiState,
96
+ onClick = { onNavigate(NavigateType .MISSION .value, it) }
95
97
)
96
98
Spacer (modifier = modifier.height(20 .dp))
97
99
RankingList (
98
- getRankingUiState = getRankingUiState
100
+ getRankingUiState = getRankingUiState,
101
+ onClick = { onNavigate(NavigateType .RANKING .value, it) }
99
102
)
100
103
}
101
104
}
@@ -112,7 +115,7 @@ private fun MainPageScreen(
112
115
modifier = Modifier ,
113
116
role = role
114
117
) {
115
- onNavigate(it)
118
+ onNavigate(it, null )
116
119
}
117
120
}
118
121
}
0 commit comments