Center map on device click

2 files changed, 17 insertions, 2 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
index ea40d91..452ece7 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
@@ -20,6 +20,9 @@ class UnitsActivity : AppCompatActivity() {
 
     private val unitsViewModel: UnitsViewModel by viewModel()
 
+    private val mapFragment = MapFragment()
+    private val devicesFragment = DevicesFragment()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -66,8 +69,8 @@ class UnitsActivity : AppCompatActivity() {
 
             val newFragment =
                 when (displayMode) {
-                    UnitsViewModel.UnitsDisplayMode.LIST -> DevicesFragment()
-                    UnitsViewModel.UnitsDisplayMode.MAP -> MapFragment()
+                    UnitsViewModel.UnitsDisplayMode.LIST -> devicesFragment
+                    UnitsViewModel.UnitsDisplayMode.MAP -> mapFragment
                     else -> DevicesFragment()
                 }
             supportFragmentManager.commit {
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
index bcb0818..bb4efde 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
@@ -27,6 +27,7 @@ class UnitsViewModel(
     var searchQuery = savedStateHandle.getLiveData("searchQuery", "")
     var unitsDisplayMode = MutableLiveData(UnitsDisplayMode.LIST)
     var units = MutableLiveData<List<UnitInformation>>()
+    var selectedUnit = MutableLiveData<UnitInformation?>()
 
     init {
         Log.d("UnitsViewModel", "Initializing Units View Model")
@@ -42,6 +43,17 @@ class UnitsViewModel(
         }
     }
 
+    fun selectUnit(unit: UnitInformation) {
+        Log.d("UnitsViewModel", "Selecting unit ${unit.device.name}")
+        selectedUnit.postValue(unit)
+        setDisplayMode(UnitsDisplayMode.MAP)
+    }
+
+    fun setDisplayMode(displayMode: UnitsDisplayMode) {
+        Log.d("UnitsViewModel", "Setting Display mode to $displayMode")
+        unitsDisplayMode.postValue(displayMode)
+    }
+
     fun toggleDisplayMode() {
         Log.d("UnitsViewModel", "Toggling Display mode")
         val newDisplayMode =