Move view model to AppModule to better reflect a typical DI use case

stadiamaps · Nov 11, 2024 · df63897 · df63897
1 parent 1d8d8db
commit df63897
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/android/demo-app/src/main/java/com/stadiamaps/ferrostar/AppModule.kt b/android/demo-app/src/main/java/com/stadiamaps/ferrostar/AppModule.kt
@@ -125,4 +125,6 @@ object AppModule {
 
   // The AndroidTtsObserver handles spoken instructions as they are triggered by FerrostarCore.
   val ttsObserver: AndroidTtsObserver by lazy { AndroidTtsObserver(appContext) }
+
+  val viewModel: DemoNavigationViewModel by lazy { DemoNavigationViewModel() }
 }
diff --git a/android/demo-app/src/main/java/com/stadiamaps/ferrostar/DemoNavigationScene.kt b/android/demo-app/src/main/java/com/stadiamaps/ferrostar/DemoNavigationScene.kt
@@ -43,11 +43,11 @@ import uniffi.ferrostar.WaypointKind
 fun DemoNavigationScene(
     savedInstanceState: Bundle?,
     locationProvider: LocationProvider = AppModule.locationProvider,
+    viewModel: DemoNavigationViewModel = AppModule.viewModel
 ) {
   // Keeps the screen on at consistent brightness while this Composable is in the view hierarchy.
   KeepScreenOnDisposableEffect()
 
-  val viewModel = remember { DemoNavigationViewModel() }
   val scope = rememberCoroutineScope()
 
   // Get location permissions.