🐛 :: conflict fix

:: conflict fix

Author: Chaejongin12

app/src/main/java/com/kdn/stack_knowledge/navigation/StackKnowledgeNavHost.kt

@@ -3,27 +3,32 @@ package com.kdn.stack_knowledge.navigation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
+import com.minstone.ui.navigation.NavigateType
 import com.stackknowledge.login.navigation.loginScreen
 import com.stackknowledge.login.navigation.navigateToLogin
 import com.stackknowledge.login.navigation.roleCheckRoute
 import com.stackknowledge.login.navigation.roleCheckScreen
 import com.stackknowledge.main.navigation.mainScreen
 import com.stackknowledge.main.navigation.navigateToMain
 import com.kdn.stack_knowledge.navigation.util.bottomNavigationNavigate
+import com.stackknowledge.ranking.navigation.navigateToRanking
+import com.stackknowledge.ranking.navigation.navigateToTeacherRanking
 import com.stackknowledge.ranking.navigation.rankingScreen
 import com.stackknowledge.ranking.navigation.teacherRankingScreen
 import com.stackknowledge.score_mission.navigation.gradingAnswerScreen
 import com.stackknowledge.score_mission.navigation.navigateToGradingAnswer
-import com.stackknowledge.score_mission.navigation.solvedMissionScreen
+import com.stackknowledge.score_mission.navigation.navigateToSolvedMission
 import com.stackknowledge.shop.navigation.shopRoute
 import com.stackknowledge.shop.navigation.shopScreen
-import com.stackknowledge.shop.navigation.teacherShopRoute
 import com.stackknowledge.shop.navigation.teacherShopScreen
 import com.kdn.stack_knowledge.ui.StackKnowledgeAppState
+import com.stackknowledge.score_mission.navigation.solvedMissionScreen
 import com.stackkowledge.mission.navigation.createMissionScreen
 import com.stackkowledge.mission.navigation.entireMissionScreen
+import com.stackkowledge.mission.navigation.navigateToEntireMission
 import com.stackkowledge.mission.navigation.navigateToResolveMission
 import com.stackkowledge.mission.navigation.resolveMissionScreen
+import enumdata.Authority
 
 @Composable
 fun StackKnowledgeNavHost(
@@ -47,7 +52,17 @@ fun StackKnowledgeNavHost(
             onRoleButtonClick = navController::navigateToLogin
         )
         mainScreen(
-            onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) }
+            onNavigate = { role, navType, index ->
+                if (index != null) {
+                    if (navType == NavigateType.MISSION.value) {
+                        if (role == Authority.ROLE_STUDENT) navController.navigateToEntireMission()
+                        else navController.navigateToSolvedMission()
+                    } else {
+                        if (role == Authority.ROLE_STUDENT) navController.navigateToRanking()
+                        else navController.navigateToTeacherRanking()
+                    }
+                } else bottomNavigationNavigate(role, navController, navType)
+            },
         )
         createMissionScreen(
             onNavigate = { role, navType -> bottomNavigationNavigate(role, navController, navType) },

core/design-system/src/main/java/com/stackknowledge/design_system/component/bottomsheet/StackKnowledgeBottomSheet.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -85,10 +86,10 @@ fun StackKnowledgeBottomSheet(
                 Spacer(modifier = modifier.height(8.dp))
                 StackKnowledgeButton(
                     text = stringResource(id = R.string.purchase),
+                    enable = ButtonState.ACTIVATE,
                     modifier = modifier
                         .height(60.dp),
-                    onClick = {},
-                )
+                ) {}
 
                 Spacer(modifier = modifier.height(24.dp))
             }

core/design-system/src/main/java/com/stackknowledge/design_system/component/button/StackKnowledgeButton.kt

@@ -11,23 +11,36 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 
 @Composable
 fun StackKnowledgeButton(
     modifier: Modifier = Modifier,
-    onClick: () -> Unit = {},
     text: String,
+    enable: ButtonState,
+    onClick: () -> Unit,
 ) {
     StackKnowledgeAndroidTheme { colors, typography ->
+        val color = when (enable) {
+            ButtonState.ACTIVATE -> {
+                colors.P1
+            }
+
+            ButtonState.DISABLED -> {
+                colors.G1
+            }
+        }
         Button(
-            onClick = { onClick() },
+            onClick = {
+                if (enable.buttonState) onClick()
+            },
             modifier = modifier
                 .fillMaxWidth()
                 .clip(shape = RoundedCornerShape(10.dp))
-                .background(color = colors.P1),
+                .background(color = color),
             colors = ButtonDefaults.buttonColors(
-                containerColor = colors.P1
+                containerColor = color
             )
         ) {
             Text(
@@ -44,6 +57,6 @@ fun StackKnowledgeButton(
 fun StackKnowledgeButtonPre() {
     StackKnowledgeButton(
         text = "제출하기",
-        onClick = {}
-    )
+        enable = ButtonState.ACTIVATE
+    ) {}
 }

core/design-system/src/main/java/com/stackknowledge/design_system/component/button/enumclass/ButtonState.kt

@@ -0,0 +1,6 @@
+package com.stackknowledge.design_system.component.button.enumclass
+
+enum class ButtonState(val buttonState: Boolean) {
+    ACTIVATE(true),
+    DISABLED(false)
+}

core/ui/src/main/java/com/minstone/ui/navigation/StackKnowledgeBottomNavigation.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -54,7 +55,7 @@ fun StackKnowledgeBottomNavigation(
                 )
 
                 navItems.forEachIndexed { index, (iconRes, navigateType, stringResId) ->
-                    if (index != 2 || role == Authority.ROLE_TEACHER) { // 로그인 로직 적용후 변경
+                    if (index != 2 || role == Authority.ROLE_TEACHER) {
                         BottomNavigationComponent(
                             modifier = modifier
                                 .weight(1f)

feature/login/src/main/java/com/stackknowledge/login/RoleCheckScreen.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.login.background.LoginBackground
 import com.stackknowledge.login.viewmodel.AuthViewModel
@@ -79,6 +80,7 @@ private fun RoleCheckScreen(
                 ) {
                     StackKnowledgeButton(
                         text = stringResource(id = R.string.student),
+                        enable = ButtonState.ACTIVATE,
                         modifier = modifier
                             .height(60.dp)
                             .weight(1f),
@@ -91,6 +93,7 @@ private fun RoleCheckScreen(
 
                     StackKnowledgeButton(
                         text = stringResource(id = R.string.teacher),
+                        enable = ButtonState.ACTIVATE,
                         modifier = modifier
                             .height(60.dp)
                             .weight(1f),

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

@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.minstone.ui.navigation.NavigateType
 import com.minstone.ui.navigation.StackKnowledgeBottomNavigation
 import com.stackknowledge.design_system.component.dialog.JoinWaitingDialog
 import com.stackknowledge.design_system.component.dialog.StackKnowledgeDialog
@@ -37,7 +38,7 @@ import enumdata.Authority
 
 @Composable
 internal fun MainPageRoute(
-    onNavigate: (Authority, String) -> Unit,
+    onNavigate: (Authority, String, Int?) -> Unit,
     viewModel: MainViewModel = hiltViewModel()
 ) {
     var role by remember { mutableStateOf(Authority.ROLE_TEACHER) } //로그인 로직 적용후 변경
@@ -48,7 +49,7 @@ internal fun MainPageRoute(
         role = role,
         getMissionUiState = getMissionUiState,
         getRankingUiState = getRankingUiState,
-        onNavigate = { navType -> onNavigate(role, navType) },
+        onNavigate = { navType, index -> onNavigate(role, navType, index) },
         initMain = {
             with(viewModel) {
                 getMission()
@@ -64,7 +65,7 @@ private fun MainPageScreen(
     role: Authority,
     getMissionUiState: GetMissionUiState,
     getRankingUiState: GetRankingUiState,
-    onNavigate: (String) -> Unit,
+    onNavigate: (String, Int?) -> Unit,
     initMain: () -> Unit,
 ) {
     val scrollState = rememberScrollState()
@@ -91,11 +92,13 @@ private fun MainPageScreen(
                     StackKnowledgePager()
                     Spacer(modifier = modifier.height(28.dp))
                     MissionList(
-                        getMissionUiState = getMissionUiState
+                        getMissionUiState = getMissionUiState,
+                        onClick = { onNavigate(NavigateType.MISSION.value, it) }
                     )
                     Spacer(modifier = modifier.height(20.dp))
                     RankingList(
-                        getRankingUiState = getRankingUiState
+                        getRankingUiState = getRankingUiState,
+                        onClick = { onNavigate(NavigateType.RANKING.value, it) }
                     )
                 }
             }
@@ -112,7 +115,7 @@ private fun MainPageScreen(
                     modifier = Modifier,
                     role = role
                 ) {
-                    onNavigate(it)
+                    onNavigate(it, null)
                 }
             }
         }

feature/main/src/main/java/com/stackknowledge/main/component/MissionList.kt

@@ -31,6 +31,7 @@ import remote.response.mission.MissionResponseModel
 fun MissionList(
     modifier: Modifier = Modifier,
     getMissionUiState: GetMissionUiState,
+    onClick: (Int) -> Unit,
 ) {
     StackKnowledgeAndroidTheme { colors, typography ->
         Column(
@@ -75,7 +76,8 @@ fun MissionList(
                                 MissionListItem(
                                     teacherName = list[index].user.name,
                                     title = list[index].title,
-                                    point = list[index].point.toString()
+                                    point = list[index].point.toString(),
+                                    onClick = { onClick(index) },
                                 )
                                 Spacer(modifier = modifier.width(16.dp))
                             }

feature/main/src/main/java/com/stackknowledge/main/component/MissionListItem.kt

@@ -1,6 +1,7 @@
 package com.stackknowledge.main.component
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -24,6 +25,7 @@ fun MissionListItem(
     teacherName: String,
     title: String,
     point: String,
+    onClick: () -> Unit,
 ) {
     StackKnowledgeAndroidTheme { colors, typography ->
         Box(
@@ -33,7 +35,8 @@ fun MissionListItem(
                 .background(
                     color = colors.WHITE,
                     shape = RoundedCornerShape(20.dp)
-                ),
+                )
+                .clickable(onClick = onClick),
             contentAlignment = Alignment.Center
         ) {
             Column(
@@ -77,6 +80,7 @@ fun MissionListItemPre() {
     MissionListItem(
         teacherName = "미소쌤",
         title = "북학파의 배경",
-        point = "1000"
+        point = "1000",
+        onClick = {}
     )
 }

feature/main/src/main/java/com/stackknowledge/main/component/RankingList.kt

@@ -23,6 +23,7 @@ import com.stackknowledge.main.viewModel.uistate.GetRankingUiState
 fun RankingList(
     modifier: Modifier = Modifier,
     getRankingUiState: GetRankingUiState,
+    onClick: (Int) -> Unit,
 ) {
     StackKnowledgeAndroidTheme { colors, _ ->
         Column(
@@ -66,7 +67,8 @@ fun RankingList(
                                         RankingListItem(
                                             profileImage = list[index].user.profileImage,
                                             name = list[index].user.name,
-                                            point = list[index].cumulatePoint.toString()
+                                            point = list[index].cumulatePoint.toString(),
+                                            onClick =  { onClick(index) },
                                         )
                                     }
                                     if (index < 3) {

feature/main/src/main/java/com/stackknowledge/main/component/RankingListItem.kt

@@ -2,6 +2,7 @@ package com.stackknowledge.main.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -29,6 +30,7 @@ fun RankingListItem(
     profileImage: String?,
     name: String,
     point: String,
+    onClick: () -> Unit,
 ) {
     StackKnowledgeAndroidTheme { colors, typography ->
         Box(
@@ -38,7 +40,8 @@ fun RankingListItem(
                 .background(
                     color = colors.WHITE,
                     shape = RoundedCornerShape(20.dp)
-                ),
+                )
+                .clickable(onClick = onClick),
             contentAlignment = Alignment.Center
         ) {
             Column(
@@ -98,6 +101,7 @@ fun RankingListItemPre() {
     RankingListItem(
         profileImage = "",
         name = "미소쌤",
-        point = "1000"
+        point = "1000",
+        onClick = {}
     )
 }

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

@@ -14,11 +14,11 @@ fun NavController.navigateToMain(navOptions: NavOptions? = null) {
 }
 
 fun NavGraphBuilder.mainScreen(
-    onNavigate: (Authority, String) -> Unit,
+    onNavigate: (Authority, String, Int?) -> Unit,
 ) {
     composable(route = mainPageRoute) {
         MainPageRoute(
-            onNavigate = onNavigate
+            onNavigate = onNavigate,
         )
     }
 }

feature/mission/src/main/java/com/stackkowledge/mission/component/InputAnswer.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.component.textfield.StackKnowledgeTextField
 
 @Composable
@@ -52,6 +53,7 @@ fun InputAnswer(
 
                 StackKnowledgeButton(
                     text = stringResource(id = R.string.submit),
+                    enable = ButtonState.ACTIVATE,
                     modifier = modifier
                         .height(60.dp),
                     onClick = openDialog