Merge remote-tracking branch 'origin/main'

# Conflicts:
#	androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
#	androidApp/src/main/res/layout/unit_item.xml

1 files changed, 2 insertions, 0 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
index e23c0de..7929832 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
@@ -1,6 +1,7 @@
 package mx.trackermap.TrackerMap.android
 
 import android.app.Application
+import mx.trackermap.TrackerMap.android.details.information.UnitInformationViewModel
 import mx.trackermap.TrackerMap.android.session.LoginViewModel
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
 import mx.trackermap.TrackerMap.client.apis.DevicesApi
@@ -27,6 +28,7 @@ class TrackerApp : Application() {
             single { UnitsController(get(), get()) }
 
             viewModel { LoginViewModel(get(), get()) }
+            viewModel { UnitInformationViewModel() }
             single { UnitsViewModel(get()) }
         }