From 61f014680defffafba7b2dc1d374de52ec1a0b9a Mon Sep 17 00:00:00 2001 From: murjune Date: Fri, 31 Jan 2025 22:28:33 +0900 Subject: [PATCH] chore: rename Event lambda, add private modifier --- .../com/chipichipi/dobedobe/navigation/DobeDobeNavHost.kt | 6 +++--- .../com/chipichipi/dobedobe/feature/goal/AddGoalScreen.kt | 4 ++-- .../chipichipi/dobedobe/feature/goal/DetailGoalScreen.kt | 6 +++--- .../dobedobe/feature/goal/navigation/GoalNavigation.kt | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/com/chipichipi/dobedobe/navigation/DobeDobeNavHost.kt b/app/src/main/kotlin/com/chipichipi/dobedobe/navigation/DobeDobeNavHost.kt index f6844890..eedc0bb9 100644 --- a/app/src/main/kotlin/com/chipichipi/dobedobe/navigation/DobeDobeNavHost.kt +++ b/app/src/main/kotlin/com/chipichipi/dobedobe/navigation/DobeDobeNavHost.kt @@ -44,7 +44,7 @@ internal fun DobeDobeNavHost( goalGraph( onShowSnackbar = onShowSnackbar, navigateToBack = navController::popBackStack, - saveSnackBarEvent = navController::saveSnackBarEvent, + sendSnackBarEvent = navController::saveSnackBarEvent, ) settingScreen( @@ -84,7 +84,7 @@ private fun GoalSnackBarEffect( } } -fun NavController.saveSnackBarEvent( +private fun NavController.saveSnackBarEvent( type: GoalSnackBarType, ) { val preBackStackEntry = previousBackStackEntry ?: return @@ -93,6 +93,6 @@ fun NavController.saveSnackBarEvent( } } -fun NavBackStackEntry.removeSnackBarEvent() { +private fun NavBackStackEntry.removeSnackBarEvent() { savedStateHandle.remove(GoalSnackBarType.KEY) } diff --git a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/AddGoalScreen.kt b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/AddGoalScreen.kt index 4dd73c64..0d8513a9 100644 --- a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/AddGoalScreen.kt +++ b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/AddGoalScreen.kt @@ -29,7 +29,7 @@ import org.koin.androidx.compose.koinViewModel fun AddGoalRoute( onShowSnackbar: suspend (String, String?) -> Boolean, navigateToBack: () -> Unit, - saveSnackBarEvent: (GoalSnackBarType) -> Unit, + sendSnackBarEvent: (GoalSnackBarType) -> Unit, viewModel: AddGoalViewModel = koinViewModel(), ) { val lifecycle = LocalLifecycleOwner.current.lifecycle @@ -46,7 +46,7 @@ fun AddGoalRoute( LaunchedEffect(Unit) { viewModel.addGoalEvent .onEach { - saveSnackBarEvent(GoalSnackBarType.ADD) + sendSnackBarEvent(GoalSnackBarType.ADD) onBack() } .flowWithLifecycle(lifecycle) diff --git a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/DetailGoalScreen.kt b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/DetailGoalScreen.kt index e39dd288..854e8ca8 100644 --- a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/DetailGoalScreen.kt +++ b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/DetailGoalScreen.kt @@ -46,7 +46,7 @@ import org.koin.androidx.compose.koinViewModel @Composable internal fun DetailGoalRoute( onShowSnackbar: suspend (String, String?) -> Boolean, - saveSnackBarEvent: (GoalSnackBarType) -> Unit, + sendSnackBarEvent: (GoalSnackBarType) -> Unit, navigateToBack: () -> Unit, modifier: Modifier = Modifier, viewModel: DetailGoalViewModel = koinViewModel(), @@ -57,7 +57,7 @@ internal fun DetailGoalRoute( val focusManager = LocalFocusManager.current val onBack = { if (isGoalChanged) { - saveSnackBarEvent(GoalSnackBarType.EDIT) + sendSnackBarEvent(GoalSnackBarType.EDIT) } focusManager.clearFocus() navigateToBack() @@ -70,7 +70,7 @@ internal fun DetailGoalRoute( LaunchedEffect(Unit) { viewModel.deleteGoalEvent .onEach { - saveSnackBarEvent(GoalSnackBarType.REMOVE) + sendSnackBarEvent(GoalSnackBarType.REMOVE) onBack() } .flowWithLifecycle(lifecycle) diff --git a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/navigation/GoalNavigation.kt b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/navigation/GoalNavigation.kt index d2936bc4..2f7867ed 100644 --- a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/navigation/GoalNavigation.kt +++ b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/navigation/GoalNavigation.kt @@ -19,14 +19,14 @@ fun NavController.navigateToGoalDetail( fun NavGraphBuilder.goalGraph( onShowSnackbar: suspend (String, String?) -> Boolean, - saveSnackBarEvent: (GoalSnackBarType) -> Unit, + sendSnackBarEvent: (GoalSnackBarType) -> Unit, navigateToBack: () -> Unit, ) { composable { AddGoalRoute( onShowSnackbar = onShowSnackbar, navigateToBack = navigateToBack, - saveSnackBarEvent = saveSnackBarEvent, + sendSnackBarEvent = sendSnackBarEvent, ) } @@ -34,7 +34,7 @@ fun NavGraphBuilder.goalGraph( DetailGoalRoute( onShowSnackbar = onShowSnackbar, navigateToBack = navigateToBack, - saveSnackBarEvent = saveSnackBarEvent, + sendSnackBarEvent = sendSnackBarEvent, ) } }