[FEATURE]#74 : Navigator 전역 주입되도록 변경

wespot-bff · Aug 4, 2024 · 761c911 · 761c911
1 parent 5d5decd
commit 761c911
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/bff/wespot/AppNavGraphs.kt b/app/src/main/kotlin/com/bff/wespot/AppNavGraphs.kt
@@ -26,6 +26,7 @@ import com.bff.wespot.message.screen.destinations.MessageWriteScreenDestination
 import com.bff.wespot.message.screen.destinations.ReceiverSelectionScreenDestination
 import com.bff.wespot.message.screen.destinations.ReservedMessageScreenDestination
 import com.bff.wespot.message.viewmodel.SendViewModel
+import com.bff.wespot.navigation.Navigator
 import com.bff.wespot.vote.screen.destinations.IndividualVoteScreenDestination
 import com.bff.wespot.vote.screen.destinations.VoteHomeScreenDestination
 import com.bff.wespot.vote.screen.destinations.VoteResultScreenDestination
@@ -142,6 +143,7 @@ fun DestinationScopeWithNoDependencies<*>.currentNavigator(): CommonNavGraphNavi
 @Composable
 internal fun AppNavigation(
     navController: NavHostController,
+    navigator: Navigator,
     modifier: Modifier = Modifier,
 ) {
     val engine = rememberNavHostEngine(
@@ -161,6 +163,7 @@ internal fun AppNavigation(
         modifier = modifier,
         dependenciesContainerBuilder = {
             dependency(currentNavigator())
+            dependency(navigator)
             dependency(sendViewModel)
             dependency(votingViewModel)
         },

diff --git a/app/src/main/kotlin/com/bff/wespot/MainActivity.kt b/app/src/main/kotlin/com/bff/wespot/MainActivity.kt
@@ -40,27 +40,32 @@ import com.bff.wespot.designsystem.component.header.WSTopBar
 import com.bff.wespot.designsystem.theme.StaticTypeScale
 import com.bff.wespot.designsystem.theme.WeSpotTheme
 import com.bff.wespot.designsystem.theme.WeSpotThemeManager
+import com.bff.wespot.navigation.Navigator
 import com.ramcosta.composedestinations.navigation.navigate
 import com.ramcosta.composedestinations.spec.NavGraphSpec
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
+    @Inject
+    lateinit var navigator: Navigator
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContent {
             WeSpotTheme {
-                MainScreen()
+                MainScreen(navigator)
             }
         }
     }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun MainScreen() {
+private fun MainScreen(navigator: Navigator) {
     val navController = rememberNavController()
 
     val checkScreen by navController.checkCurrentScreen()
@@ -118,7 +123,11 @@ private fun MainScreen() {
             }
         },
     ) {
-        AppNavigation(navController = navController, modifier = Modifier.padding(it))
+        AppNavigation(
+            navController = navController,
+            modifier = Modifier.padding(it),
+            navigator = navigator,
+        )
     }
 }