Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile

1 files changed, 8 insertions, 4 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 bf5f1d8..1bbcb80 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
@@ -17,6 +17,7 @@ import mx.trackermap.TrackerMap.android.databinding.UnitsActivityBinding
 import mx.trackermap.TrackerMap.android.devices.DevicesFragment
 import mx.trackermap.TrackerMap.android.map.UnitMapFragment
 import mx.trackermap.TrackerMap.android.session.UserInformationActivity
+import mx.trackermap.TrackerMap.client.models.MapLayer
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 @DelicateCoroutinesApi
@@ -90,13 +91,16 @@ class UnitsActivity : AppCompatActivity() {
         val popOver = PopupMenu(this, view)
         popOver.menuInflater.inflate(R.menu.map_layers, popOver.menu)
         popOver.setOnMenuItemClickListener { item ->
-            unitsViewModel.setMapLayer(
+            val layer = resources.getStringArray(
                 when (item.itemId) {
-                    R.id.layerStreets -> getString(R.string.maps_streets_tile_url)
-                    R.id.layerSatellite -> getString(R.string.maps_satellite_url)
-                    else -> getString(R.string.maps_streets_tile_url)
+                    R.id.layerStreets -> R.array.maps_streets_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]
+            ))
             true
         }
         popOver.show()