aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-16 04:02:30 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-16 04:02:30 -0600
commit3f6958e68f6e4dd5d42e1049c05059502d939cf9 (patch)
treed451027198866bacc7a9404d11380276cb65e7e9 /androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
parentf8e7e755dc8e557e1e5b9e9be318f8415a2c7f8e (diff)
downloadetbsa-trackermap-mobile-3f6958e68f6e4dd5d42e1049c05059502d939cf9.tar.gz
etbsa-trackermap-mobile-3f6958e68f6e4dd5d42e1049c05059502d939cf9.tar.bz2
etbsa-trackermap-mobile-3f6958e68f6e4dd5d42e1049c05059502d939cf9.zip
Added attribution and refactored map layers code
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt11
1 files changed, 7 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 cbd543a..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
@@ -92,12 +93,14 @@ class UnitsActivity : AppCompatActivity() {
popOver.setOnMenuItemClickListener { item ->
val layer = resources.getStringArray(
when (item.itemId) {
- R.id.layerStreets -> R.array.maps_streets_tile_url
- R.id.layerSatellite -> R.array.maps_satellite_tile_url
- else -> R.array.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(layer[0], layer[1].toInt(), layer[2].toInt())
+ unitsViewModel.setMapLayer(MapLayer(
+ layer[0], layer[1].toInt(), layer[2].toInt(), layer[3]
+ ))
true
}
popOver.show()