chore: resolve conflict

YAPP-Github · Jan 22, 2024 · a6f015f · a6f015f
1 parent a51c671
commit a6f015f
Showing 1 changed file with 24 additions and 49 deletions.
diff --git a/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt b/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt
@@ -74,14 +74,15 @@ internal fun MainScreen(
                     onShowToast = viewModel::onShowSnackbar,
                     padding = innerPadding,
                 )
-                    sentNavGraph(
-                        padding = innerPadding,
-                        popBackStack = navigator::popBackStackIfNotHome,
-                        navigateSentEnvelope = navigator::navigateSentEnvelope,
-                        navigateSentEnvelopeDetail = navigator::navigateSentEnvelopeDetail,
-                        navigateSentEnvelopeEdit = navigator::navigateSentEnvelopeEdit,
-                        navigateSentEnvelopeAdd = navigator::navigateSentEnvelopeAdd,
-                    )
+
+                sentNavGraph(
+                    padding = innerPadding,
+                    popBackStack = navigator::popBackStackIfNotHome,
+                    navigateSentEnvelope = navigator::navigateSentEnvelope,
+                    navigateSentEnvelopeDetail = navigator::navigateSentEnvelopeDetail,
+                    navigateSentEnvelopeEdit = navigator::navigateSentEnvelopeEdit,
+                    navigateSentEnvelopeAdd = navigator::navigateSentEnvelopeAdd,
+                )
 
                 receivedNavGraph(
                     padding = innerPadding,
@@ -112,39 +113,13 @@ internal fun MainScreen(
                     navigateLedgerEdit = navigator::navigateLedgerEdit,
                     navigateLedgerFilter = navigator::navigateLedgerFilter,
                     navigateLedgerAdd = navigator::navigateLedgerAdd,
+                    navigateEnvelopAdd = navigator::navigateReceivedEnvelopeAdd,
+                    navigateEnvelopeDetail = navigator::navigateReceivedEnvelopeDetail,
+                    navigateEnvelopeEdit = navigator::navigateReceivedEnvelopeEdit,
                     onShowSnackbar = viewModel::onShowSnackbar,
                     onShowDialog = viewModel::onShowDialog,
                     handleException = viewModel::handleException,
                 )
-                    receivedNavGraph(
-                        padding = innerPadding,
-                        popBackStack = navigator::popBackStackIfNotHome,
-                        popBackStackWithLedger = { ledger ->
-                            navigator.navController.previousBackStackEntry?.savedStateHandle?.set(
-                                ReceivedRoute.LEDGER_ARGUMENT_NAME,
-                                ledger,
-                            )
-                            navigator.popBackStackIfNotHome()
-                        },
-                        popBackStackWithDeleteLedgerId = { ledgerId ->
-                            navigator.navController.previousBackStackEntry?.savedStateHandle?.set(
-                                ReceivedRoute.LEDGER_ID_ARGUMENT_NAME,
-                                ledgerId,
-                            )
-                            navigator.popBackStackIfNotHome()
-                        },
-                        navigateLedgerSearch = navigator::navigateLedgerSearch,
-                        navigateLedgerDetail = navigator::navigateLedgerDetail,
-                        navigateLedgerEdit = navigator::navigateLedgerEdit,
-                        navigateLedgerFilter = navigator::navigateLedgerFilter,
-                        navigateLedgerAdd = navigator::navigateLedgerAdd,
-                        navigateEnvelopAdd = navigator::navigateReceivedEnvelopeAdd,
-                        navigateEnvelopeDetail = navigator::navigateReceivedEnvelopeDetail,
-                        navigateEnvelopeEdit = navigator::navigateReceivedEnvelopeEdit,
-                        onShowSnackbar = viewModel::onShowSnackbar,
-                        onShowDialog = viewModel::onShowDialog,
-                        handleException = viewModel::handleException,
-                    )
 
                 statisticsNavGraph(
                     padding = innerPadding,
@@ -153,18 +128,18 @@ internal fun MainScreen(
                 communityNavGraph(
                     padding = innerPadding,
                 )
-                    )
-                    myPageNavGraph(
-                        padding = innerPadding,
-                        navigateToLogin = navigator::navigateLogin,
-                        navigateToInfo = navigator::navigateMyPageInfo,
-                        navigateToSocial = navigator::navigateMyPageSocial,
-                        popBackStack = navigator::popBackStackIfNotHome,
-                        onShowSnackbar = viewModel::onShowSnackbar,
-                        onShowDialog = viewModel::onShowDialog,
-                        handleException = viewModel::handleException,
-                    )
-                }
+
+                myPageNavGraph(
+                    padding = innerPadding,
+                    navigateToLogin = navigator::navigateLogin,
+                    navigateToInfo = navigator::navigateMyPageInfo,
+                    navigateToSocial = navigator::navigateMyPageSocial,
+                    popBackStack = navigator::popBackStackIfNotHome,
+                    onShowSnackbar = viewModel::onShowSnackbar,
+                    onShowDialog = viewModel::onShowDialog,
+                    handleException = viewModel::handleException,
+                )
+            }
 
             with(uiState) {
                 SusuSnackbar(