aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-15 20:15:12 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-15 20:15:12 -0600
commitf7d5ddf4ee3dade43e627c57b9024e11330de02e (patch)
tree942ddfa23384ab53171bc818c2969e6899757548 /androidApp/src/main
parent07d0d8b1171f5646f1c6795f1dfaab78aad06512 (diff)
parent081d26c8c44cd81f53795ad34eeddca022850d16 (diff)
downloadetbsa-trackermap-mobile-f7d5ddf4ee3dade43e627c57b9024e11330de02e.tar.gz
etbsa-trackermap-mobile-f7d5ddf4ee3dade43e627c57b9024e11330de02e.tar.bz2
etbsa-trackermap-mobile-f7d5ddf4ee3dade43e627c57b9024e11330de02e.zip
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Diffstat (limited to 'androidApp/src/main')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt1
-rw-r--r--androidApp/src/main/res/menu/map_layers.xml4
-rw-r--r--androidApp/src/main/res/values-es-rMX/strings.xml5
-rw-r--r--androidApp/src/main/res/values/strings.xml3
4 files changed, 2 insertions, 11 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 acc2c7c..94e8a57 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
@@ -87,7 +87,6 @@ class UnitsActivity : AppCompatActivity() {
when (item.itemId) {
R.id.layerStreets -> getString(R.string.maps_streets_tile_url)
R.id.layerSatellite -> getString(R.string.maps_satellite_url)
- R.id.layerHybrid -> getString(R.string.maps_hybrid_url)
else -> getString(R.string.maps_streets_tile_url)
}
)
diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml
index 6830ff7..334b9f9 100644
--- a/androidApp/src/main/res/menu/map_layers.xml
+++ b/androidApp/src/main/res/menu/map_layers.xml
@@ -10,8 +10,4 @@
android:id="@+id/layerSatellite"
android:title="@string/layer_satellite"/>
- <item
- android:id="@+id/layerHybrid"
- android:title="@string/layer_hybrid"/>
-
</menu> \ No newline at end of file
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index 2135710..47e4716 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -19,9 +19,8 @@
<string name="switch_layer">Cambiar capa del mapa</string>
<string name="open_profile">Ver información de cuenta</string>
- <string name="layer_streets">Streets</string>
- <string name="layer_satellite">Satellite</string>
- <string name="layer_hybrid">Hybrid</string>
+ <string name="layer_streets">Calles</string>
+ <string name="layer_satellite">Satélite</string>
<string name="menu_account">Cuenta</string>
<string name="menu_about">Acerca de</string>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index de239aa..1caf502 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -14,9 +14,6 @@
https://mt0.google.com/vt/lyrs=m&amp;hl=en&amp;x={x}&amp;y={y}&amp;z={z}&amp;s=Ga
</string>
<string name="maps_satellite_url" translatable="false">
- https://mt0.google.com/vt/lyrs=s&amp;hl=en&amp;x={x}&amp;y={y}&amp;z={z}&amp;s=Ga
- </string>
- <string name="maps_hybrid_url" translatable="false">
https://mt0.google.com/vt/lyrs=y&amp;hl=en&amp;x={x}&amp;y={y}&amp;z={z}&amp;s=Ga
</string>