Skip to content

Commit ad6d514

Browse files
committed
[feat] #62 navigateToUpload
1 parent 0811d8d commit ad6d514

File tree

6 files changed

+9
-20
lines changed

6 files changed

+9
-20
lines changed

feature/home/src/main/java/com/record/home/HomeScreen.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ fun HomeRoute(
6161
padding: PaddingValues,
6262
modifier: Modifier = Modifier,
6363
viewModel: HomeViewModel = hiltViewModel(),
64+
navigateToUpload: () -> Unit = {},
6465
) {
6566
val state by viewModel.uiState.collectAsStateWithLifecycle()
6667

6768
LaunchedEffectWithLifecycle {
6869
viewModel.sideEffect.collectLatest { sideEffect ->
6970
when (sideEffect) {
70-
HomeSideEffect.navigateToUpload -> {
71-
}
71+
HomeSideEffect.navigateToUpload -> navigateToUpload()
7272
is HomeSideEffect.navigateToVideo -> {
7373
}
7474
}

feature/home/src/main/java/com/record/home/navigation/HomeNavigation.kt

+2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ fun NavController.navigateHome(navOptions: NavOptions) {
1515
fun NavGraphBuilder.homeNavGraph(
1616
padding: PaddingValues,
1717
modifier: Modifier = Modifier,
18+
navigateToUpload: () -> Unit = {},
1819
) {
1920
composable(route = HomeRoute.route) {
2021
HomeRoute(
2122
padding = padding,
2223
modifier = modifier,
24+
navigateToUpload = navigateToUpload,
2325
)
2426
}
2527
}

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

+4-11
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import com.record.login.navigation.LoginRoute
1414
import com.record.login.navigation.SignupRoute
1515
import com.record.mypage.navigation.navigateMypage
1616
import com.record.profile.navigation.navigateProfile
17-
import com.record.upload.navigation.UploadRoute
18-
import com.record.upload.navigation.navigateSelectedVideo
17+
import com.record.upload.navigation.navigateUpload
1918
import com.record.video.navigation.navigateVideo
2019
import com.record.video.navigation.navigateVideoDetail
2120

@@ -87,20 +86,14 @@ internal class MainNavigator(
8786
navController.navigateProfile(navOptions { })
8887
}
8988

89+
fun navigateToUpload() {
90+
navController.navigateUpload(navOptions { })
91+
}
9092
fun popBackStackIfNotHome() {
9193
if (!isSameCurrentDestination(HomeRoute.route)) {
9294
navController.popBackStack()
9395
}
9496
}
95-
fun navigateSelectedKeyword() {
96-
navController.navigateSelectedKeyword()
97-
}
98-
fun navigateDefinedContent() {
99-
navController.navigateDefinedContent()
100-
}
101-
fun navigateCompletedUpload() {
102-
navController.navigateCompletedUpload()
103-
}
10497

10598
private fun isSameCurrentDestination(route: String) =
10699
navController.currentDestination?.route == route

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ internal fun MainScreen(
7878

7979
homeNavGraph(
8080
padding = innerPadding,
81+
navigateToUpload = navigator::navigateToUpload,
8182
)
8283

8384
profileNavGraph(
@@ -86,7 +87,6 @@ internal fun MainScreen(
8687

8788
uploadNavGraph(
8889
padding = innerPadding,
89-
navigateSelectedVideo = navigator::navigateSelectedVideo,
9090
)
9191

9292
videoNavGraph(

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

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ import timber.log.Timber
7474
fun VideoPickerRoute(
7575
paddingValues: PaddingValues,
7676
viewModel: UploadViewModel = hiltViewModel(),
77-
navigateSelectedVideo: () -> Unit,
7877
) {
7978
val state by viewModel.uiState.collectAsStateWithLifecycle()
8079

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

-5
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,15 @@ import com.record.upload.VideoPickerRoute
1414
fun NavController.navigateUpload(navOptions: NavOptions) {
1515
navigate(UploadRoute.ROUTE, navOptions)
1616
}
17-
fun NavController.navigateSelectedVideo() {
18-
navigate(UploadRoute.SELECTED_VIDEO)
19-
}
2017

2118
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
2219
fun NavGraphBuilder.uploadNavGraph(
2320
padding: PaddingValues,
2421
modifier: Modifier = Modifier,
25-
navigateSelectedVideo: () -> Unit,
2622
) {
2723
composable(route = UploadRoute.ROUTE) {
2824
VideoPickerRoute(
2925
paddingValues = padding,
30-
navigateSelectedVideo = navigateSelectedVideo,
3126
)
3227
}
3328
composable(route = UploadRoute.SELECTED_VIDEO) {

0 commit comments

Comments
 (0)