[chore] #230 내가 등록한 코스 -> 코스 상세

TeamDATEROAD · Aug 31, 2024 · ca60cc6 · ca60cc6
1 parent 4534dc4
commit ca60cc6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseContract.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseContract.kt
@@ -15,6 +15,8 @@ class MyCourseContract {
     ) : UiState
 
     sealed interface MyCourseSideEffect : UiSideEffect {
+        data class NavigateToEnroll(val courseId: Int) : MyCourseSideEffect
+        data class NavigateToCourseDetail(val courseId: Int) : MyCourseSideEffect
         data object PopBackStack : MyCourseSideEffect
     }
 

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt
@@ -40,6 +40,7 @@ fun MyCourseRoute(
     viewModel: MyCourseViewModel = hiltViewModel(),
     popBackStack: () -> Unit,
     navigateToEnroll: (EnrollType, Int?) -> Unit,
+    navigateToCourseDetail: (Int) -> Unit,
     myCourseType: MyCourseType
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -60,6 +61,8 @@ fun MyCourseRoute(
         viewModel.sideEffect.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle)
             .collect { myCourseSideEffect ->
                 when (myCourseSideEffect) {
+                    is MyCourseContract.MyCourseSideEffect.NavigateToEnroll -> navigateToEnroll(EnrollType.TIMELINE, myCourseSideEffect.courseId)
+                    is MyCourseContract.MyCourseSideEffect.NavigateToCourseDetail -> navigateToCourseDetail(myCourseSideEffect.courseId)
                     is MyCourseContract.MyCourseSideEffect.PopBackStack -> popBackStack()
                 }
             }
@@ -75,7 +78,8 @@ fun MyCourseRoute(
                 padding = padding,
                 myCourseUiState = uiState,
                 onIconClick = popBackStack,
-                onCourseCardClick = navigateToEnroll
+                navigateToEnroll = { courseId -> viewModel.setSideEffect(MyCourseContract.MyCourseSideEffect.NavigateToEnroll(courseId = courseId)) },
+                navigateToCourseDetail = { courseId -> viewModel.setSideEffect(MyCourseContract.MyCourseSideEffect.NavigateToCourseDetail(courseId = courseId)) }
             )
         }
 
@@ -88,7 +92,8 @@ fun MyCourseScreen(
     padding: PaddingValues,
     myCourseUiState: MyCourseContract.MyCourseUiState = MyCourseContract.MyCourseUiState(),
     onIconClick: () -> Unit,
-    onCourseCardClick: (EnrollType, Int?) -> Unit
+    navigateToEnroll: (Int) -> Unit,
+    navigateToCourseDetail: (Int) -> Unit
 ) {
     Column(
         modifier = Modifier
@@ -123,8 +128,8 @@ fun MyCourseScreen(
                     course = course,
                     onClick = {
                         when (myCourseUiState.myCourseType) {
-                            MyCourseType.ENROLL -> {}
-                            MyCourseType.READ -> onCourseCardClick(EnrollType.TIMELINE, course.courseId)
+                            MyCourseType.ENROLL -> navigateToCourseDetail(course.courseId)
+                            MyCourseType.READ -> navigateToEnroll(course.courseId)
                         }
                     }
                 )
@@ -182,7 +187,8 @@ fun MyCourseScreenPreview() {
                 )
             ),
             onIconClick = {},
-            onCourseCardClick = { _, _ -> }
+            navigateToEnroll = {},
+            navigateToCourseDetail = {}
         )
     }
 }
diff --git a/...src/main/java/org/sopt/dateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt b/...src/main/java/org/sopt/dateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt
@@ -18,7 +18,8 @@ fun NavController.navigateMyCourses(myCourseType: MyCourseType) {
 fun NavGraphBuilder.myCoursesNavGraph(
     padding: PaddingValues,
     popBackStack: () -> Unit,
-    navigateToEnroll: (EnrollType, Int?) -> Unit
+    navigateToEnroll: (EnrollType, Int?) -> Unit,
+    navigateToCourseDetail: (Int) -> Unit
 ) {
     composable(
         route = ROUTE_WITH_ARGUMENT,
@@ -32,7 +33,7 @@ fun NavGraphBuilder.myCoursesNavGraph(
             MyCourseType.valueOf(it)
         } ?: MyCourseType.ENROLL
 
-        MyCourseRoute(padding = padding, popBackStack = popBackStack, myCourseType = myCourseType, navigateToEnroll = navigateToEnroll)
+        MyCourseRoute(padding = padding, popBackStack = popBackStack, myCourseType = myCourseType, navigateToEnroll = navigateToEnroll, navigateToCourseDetail = navigateToCourseDetail)
     }
 }
 

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainNavHost.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainNavHost.kt
@@ -77,7 +77,8 @@ fun MainNavHost(
             myCoursesNavGraph(
                 padding = padding,
                 popBackStack = navigator::popBackStackIfNotHome,
-                navigateToEnroll = navigator::navigateToEnroll
+                navigateToEnroll = navigator::navigateToEnroll,
+                navigateToCourseDetail = navigator::navigateToCourseDetail
             )
 
             myPageNavGraph(