[feat] #62 navigation upload

Author: lsakee

feature/navigator/src/main/java/com/record/navigator/MainNavigator.kt

@@ -11,6 +11,9 @@ import com.record.home.navigation.HomeRoute
 import com.record.home.navigation.navigateHome
 import com.record.login.navigation.LoginRoute
 import com.record.mypage.navigation.navigateMypage
+import com.record.upload.navigation.navigateCompletedUpload
+import com.record.upload.navigation.navigateDefinedContent
+import com.record.upload.navigation.navigateSelectedKeyword
 import com.record.upload.navigation.navigateUpload
 import com.record.video.navigation.navigateVideo
 
@@ -35,7 +38,6 @@ internal class MainNavigator(
             launchSingleTop = true
             restoreState = true
         }
-
         when (tab) {
             MainNavTab.HOME -> navController.navigateHome(navOptions)
             MainNavTab.UPLOAD -> navController.navigateUpload(navOptions)
@@ -65,6 +67,15 @@ internal class MainNavigator(
             navController.popBackStack()
         }
     }
+    fun navigateSelectedKeyword() {
+        navController.navigateSelectedKeyword()
+    }
+    fun navigateDefinedContent() {
+        navController.navigateDefinedContent()
+    }
+    fun navigateCompletedUpload() {
+        navController.navigateCompletedUpload()
+    }
 
     private fun isSameCurrentDestination(route: String) =
         navController.currentDestination?.route == route

feature/navigator/src/main/java/com/record/navigator/MainScreen.kt

@@ -72,6 +72,9 @@ internal fun MainScreen(
 
                 uploadNavGraph(
                     padding = innerPadding,
+                    navigateSelectedKeyword = navigator::navigateSelectedKeyword,
+                    navigateDefinedContent = navigator::navigateDefinedContent,
+                    navigateCompletedUpload = navigator::navigateCompletedUpload,
                 )
 
                 videoNavGraph(

feature/upload/src/main/java/com/record/upload/CompletedUploadScreen.kt

@@ -19,9 +19,10 @@ import com.record.designsystem.theme.RecordyTheme
 @Composable
 fun CompletedUploadRoute(
     paddingValues: PaddingValues,
-){
+) {
     CompletedUploadScreen()
 }
+
 @Composable
 fun CompletedUploadScreen() {
     Box(

feature/upload/src/main/java/com/record/upload/DefinedContentScreen.kt

@@ -20,11 +20,16 @@ import com.record.designsystem.theme.RecordyTheme
 fun DefinedContentRoute(
     paddingValues: PaddingValues,
     navigateCompletedUpload: () -> Unit,
-){
-    DefinedContentScreen()
+) {
+    DefinedContentScreen(
+        navigateCompletedUpload = navigateCompletedUpload,
+    )
 }
+
 @Composable
-fun DefinedContentScreen() {
+fun DefinedContentScreen(
+    navigateCompletedUpload: () -> Unit,
+) {
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -48,7 +53,7 @@ fun DefinedContentScreen() {
             modifier = Modifier.align(Alignment.BottomCenter),
             text = "다음",
             enabled = true,
-            onClick = { /*TODO*/ },
+            onClick = navigateCompletedUpload,
         )
     }
 }

feature/upload/src/main/java/com/record/upload/SelectedKeywordScreen.kt

@@ -16,15 +16,19 @@ import com.record.designsystem.component.navbar.TopNavigationBar
 import com.record.designsystem.theme.Background
 import com.record.designsystem.theme.Gray03
 import com.record.designsystem.theme.RecordyTheme
+
 @Composable
 fun SelectedKeywordRoute(
     paddingValues: PaddingValues,
     navigateDefinedContent: () -> Unit,
-){
-    SelectedKeywordScreen()
+) {
+    SelectedKeywordScreen(navigateDefinedContent = navigateDefinedContent)
 }
+
 @Composable
-fun SelectedKeywordScreen() {
+fun SelectedKeywordScreen(
+    navigateDefinedContent: () -> Unit,
+) {
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -48,7 +52,7 @@ fun SelectedKeywordScreen() {
             modifier = Modifier.align(Alignment.BottomCenter),
             text = "다음",
             enabled = true,
-            onClick = { /*TODO*/ },
+            onClick = navigateDefinedContent,
         )
     }
 }

feature/upload/src/main/java/com/record/upload/VideoPickerScreen.kt

@@ -21,11 +21,16 @@ import com.record.designsystem.theme.RecordyTheme
 fun VideoPickerRoute(
     paddingValues: PaddingValues,
     navigateSelectedKeyword: () -> Unit,
-){
-    VideoPickerScreen()
+) {
+    VideoPickerScreen(
+        navigateSelectedKeyword = navigateSelectedKeyword,
+    )
 }
+
 @Composable
-fun VideoPickerScreen() {
+fun VideoPickerScreen(
+    navigateSelectedKeyword: () -> Unit,
+) {
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -46,10 +51,10 @@ fun VideoPickerScreen() {
             )
         }
         RecordyButton(
-            modifier = Modifier.align(Alignment.BottomCenter),
+            modifier = Modifier.align(Alignment.Center),
             text = "다음",
             enabled = true,
-            onClick = { /*TODO*/ },
+            onClick = navigateSelectedKeyword,
         )
     }
 }

feature/upload/src/main/java/com/record/upload/navigation/UploadNavigation.kt

@@ -14,6 +14,15 @@ import com.record.upload.VideoPickerRoute
 fun NavController.navigateUpload(navOptions: NavOptions) {
     navigate(UploadRoute.ROUTE, navOptions)
 }
+fun NavController.navigateSelectedKeyword() {
+    navigate(UploadRoute.SELECTED_KEYWORD)
+}
+fun NavController.navigateDefinedContent() {
+    navigate(UploadRoute.DEFINED_CONTENT)
+}
+fun NavController.navigateCompletedUpload() {
+    navigate(UploadRoute.COMPLETED_UPLOAD)
+}
 
 fun NavGraphBuilder.uploadNavGraph(
     padding: PaddingValues,
@@ -25,24 +34,24 @@ fun NavGraphBuilder.uploadNavGraph(
     composable(route = UploadRoute.ROUTE) {
         VideoPickerRoute(
             paddingValues = padding,
-            navigateSelectedKeyword = navigateSelectedKeyword
+            navigateSelectedKeyword = navigateSelectedKeyword,
         )
     }
     composable(route = UploadRoute.SELECTED_KEYWORD) {
         SelectedKeywordRoute(
             paddingValues = padding,
-            navigateDefinedContent = navigateDefinedContent
+            navigateDefinedContent = navigateDefinedContent,
         )
     }
     composable(route = UploadRoute.DEFINED_CONTENT) {
         DefinedContentRoute(
             paddingValues = padding,
-            navigateCompletedUpload=navigateCompletedUpload
+            navigateCompletedUpload = navigateCompletedUpload,
         )
     }
     composable(route = UploadRoute.COMPLETED_UPLOAD) {
         CompletedUploadRoute(
-            paddingValues = padding
+            paddingValues = padding,
         )
     }
 }