Skip to content

Commit 0964af7

Browse files
committed
[feat] #62 navigation upload
1 parent 417da38 commit 0964af7

File tree

6 files changed

+45
-18
lines changed

6 files changed

+45
-18
lines changed

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

+3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ internal fun MainScreen(
8383

8484
uploadNavGraph(
8585
padding = innerPadding,
86+
navigateSelectedKeyword = navigator::navigateSelectedKeyword,
87+
navigateDefinedContent = navigator::navigateDefinedContent,
88+
navigateCompletedUpload = navigator::navigateCompletedUpload,
8689
)
8790

8891
videoNavGraph(

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ import com.record.designsystem.theme.RecordyTheme
1919
@Composable
2020
fun CompletedUploadRoute(
2121
paddingValues: PaddingValues,
22-
){
22+
) {
2323
CompletedUploadScreen()
2424
}
25+
2526
@Composable
2627
fun CompletedUploadScreen() {
2728
Box(

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

+9-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@ import com.record.designsystem.theme.RecordyTheme
2020
fun DefinedContentRoute(
2121
paddingValues: PaddingValues,
2222
navigateCompletedUpload: () -> Unit,
23-
){
24-
DefinedContentScreen()
23+
) {
24+
DefinedContentScreen(
25+
navigateCompletedUpload = navigateCompletedUpload,
26+
)
2527
}
28+
2629
@Composable
27-
fun DefinedContentScreen() {
30+
fun DefinedContentScreen(
31+
navigateCompletedUpload: () -> Unit,
32+
) {
2833
Box(
2934
modifier = Modifier
3035
.fillMaxSize()
@@ -48,7 +53,7 @@ fun DefinedContentScreen() {
4853
modifier = Modifier.align(Alignment.BottomCenter),
4954
text = "다음",
5055
enabled = true,
51-
onClick = { /*TODO*/ },
56+
onClick = navigateCompletedUpload,
5257
)
5358
}
5459
}

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@ import com.record.designsystem.component.navbar.TopNavigationBar
1616
import com.record.designsystem.theme.Background
1717
import com.record.designsystem.theme.Gray03
1818
import com.record.designsystem.theme.RecordyTheme
19+
1920
@Composable
2021
fun SelectedKeywordRoute(
2122
paddingValues: PaddingValues,
2223
navigateDefinedContent: () -> Unit,
23-
){
24-
SelectedKeywordScreen()
24+
) {
25+
SelectedKeywordScreen(navigateDefinedContent = navigateDefinedContent)
2526
}
27+
2628
@Composable
27-
fun SelectedKeywordScreen() {
29+
fun SelectedKeywordScreen(
30+
navigateDefinedContent: () -> Unit,
31+
) {
2832
Box(
2933
modifier = Modifier
3034
.fillMaxSize()
@@ -48,7 +52,7 @@ fun SelectedKeywordScreen() {
4852
modifier = Modifier.align(Alignment.BottomCenter),
4953
text = "다음",
5054
enabled = true,
51-
onClick = { /*TODO*/ },
55+
onClick = navigateDefinedContent,
5256
)
5357
}
5458
}

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

+10-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ import com.record.designsystem.theme.RecordyTheme
2121
fun VideoPickerRoute(
2222
paddingValues: PaddingValues,
2323
navigateSelectedKeyword: () -> Unit,
24-
){
25-
VideoPickerScreen()
24+
) {
25+
VideoPickerScreen(
26+
navigateSelectedKeyword = navigateSelectedKeyword,
27+
)
2628
}
29+
2730
@Composable
28-
fun VideoPickerScreen() {
31+
fun VideoPickerScreen(
32+
navigateSelectedKeyword: () -> Unit,
33+
) {
2934
Box(
3035
modifier = Modifier
3136
.fillMaxSize()
@@ -46,10 +51,10 @@ fun VideoPickerScreen() {
4651
)
4752
}
4853
RecordyButton(
49-
modifier = Modifier.align(Alignment.BottomCenter),
54+
modifier = Modifier.align(Alignment.Center),
5055
text = "다음",
5156
enabled = true,
52-
onClick = { /*TODO*/ },
57+
onClick = navigateSelectedKeyword,
5358
)
5459
}
5560
}

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ import com.record.upload.VideoPickerRoute
1414
fun NavController.navigateUpload(navOptions: NavOptions) {
1515
navigate(UploadRoute.ROUTE, navOptions)
1616
}
17+
fun NavController.navigateSelectedKeyword() {
18+
navigate(UploadRoute.SELECTED_KEYWORD)
19+
}
20+
fun NavController.navigateDefinedContent() {
21+
navigate(UploadRoute.DEFINED_CONTENT)
22+
}
23+
fun NavController.navigateCompletedUpload() {
24+
navigate(UploadRoute.COMPLETED_UPLOAD)
25+
}
1726

1827
fun NavGraphBuilder.uploadNavGraph(
1928
padding: PaddingValues,
@@ -25,24 +34,24 @@ fun NavGraphBuilder.uploadNavGraph(
2534
composable(route = UploadRoute.ROUTE) {
2635
VideoPickerRoute(
2736
paddingValues = padding,
28-
navigateSelectedKeyword = navigateSelectedKeyword
37+
navigateSelectedKeyword = navigateSelectedKeyword,
2938
)
3039
}
3140
composable(route = UploadRoute.SELECTED_KEYWORD) {
3241
SelectedKeywordRoute(
3342
paddingValues = padding,
34-
navigateDefinedContent = navigateDefinedContent
43+
navigateDefinedContent = navigateDefinedContent,
3544
)
3645
}
3746
composable(route = UploadRoute.DEFINED_CONTENT) {
3847
DefinedContentRoute(
3948
paddingValues = padding,
40-
navigateCompletedUpload=navigateCompletedUpload
49+
navigateCompletedUpload = navigateCompletedUpload,
4150
)
4251
}
4352
composable(route = UploadRoute.COMPLETED_UPLOAD) {
4453
CompletedUploadRoute(
45-
paddingValues = padding
54+
paddingValues = padding,
4655
)
4756
}
4857
}

0 commit comments

Comments
 (0)