1 files changed, 20 insertions, 12 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 f2ff30e..e9b9010 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
@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.TooltipCompat
 import androidx.core.widget.doAfterTextChanged
+import androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_FADE
 import androidx.fragment.app.commit
 import kotlinx.coroutines.DelicateCoroutinesApi
 import mx.trackermap.TrackerMap.android.R
@@ -79,7 +80,9 @@ class UnitsActivity : AppCompatActivity() {
         }
         binding.searchInput.doAfterTextChanged {
             Log.d("UnitsActivity", "Search changed to ${it.toString()}")
-            binding.searchInput
+            if (unitsViewModel.unitsDisplayMode.value == UnitsViewModel.UnitsDisplayMode.MAP) {
+                unitsViewModel.setDisplayMode(UnitsViewModel.UnitsDisplayMode.LIST)
+            }
             unitsViewModel.search(it.toString())
         }
         binding.searchInputLayout.setEndIconOnClickListener {
@@ -91,17 +94,12 @@ class UnitsActivity : AppCompatActivity() {
         val popOver = PopupMenu(this, view)
         popOver.menuInflater.inflate(R.menu.map_layers, popOver.menu)
         popOver.setOnMenuItemClickListener { item ->
-            val layer = resources.getStringArray(
-                when (item.itemId) {
-                    R.id.layerStreets -> R.array.maps_streets_tile
-                    R.id.layerGmaps -> R.array.maps_gmaps_tile
-                    R.id.layerSatellite -> R.array.maps_satellite_tile
-                    else -> R.array.maps_streets_tile
-                }
-            )
-            unitsViewModel.setMapLayer(MapLayer(
-                layer[0], layer[1].toInt(), layer[2].toInt(), layer[3]
-            ))
+            val layer = when (item.itemId) {
+                R.id.layerStreets -> MapLayer.Type.STREETS
+                R.id.layerSatellite -> MapLayer.Type.SATELLITE
+                else -> MapLayer.Type.STREETS
+            }
+            unitsViewModel.setMapLayerType(layer)
             true
         }
         popOver.show()
@@ -155,6 +153,7 @@ class UnitsActivity : AppCompatActivity() {
                 }
             supportFragmentManager.commit {
                 replace(R.id.displayContainer, newFragment)
+                setTransition(TRANSIT_FRAGMENT_FADE)
             }
         }
         unitsViewModel.selectedUnit.observe(this) {
@@ -164,5 +163,14 @@ class UnitsActivity : AppCompatActivity() {
 
     private fun removeObservers() {
         unitsViewModel.unitsDisplayMode.removeObservers(this)
+        unitsViewModel.selectedUnit.removeObservers(this)
+    }
+
+    override fun onBackPressed() {
+        if (unitsViewModel.unitsDisplayMode.value == UnitsViewModel.UnitsDisplayMode.LIST) {
+            unitsViewModel.setDisplayMode(UnitsViewModel.UnitsDisplayMode.MAP)
+        } else {
+            super.onBackPressed()
+        }
     }
 }
\ No newline at end of file