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

 Conflicts:

	androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt

	androidApp/src/main/res/values/map_layers.xml

3 files changed, 5 insertions, 34 deletions

diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index e2bee95..a86a7e9 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:name="mx.trackermap.TrackerMap.android.map.MapFragment"
-        tools:visibility="invisible"/>
+        tools:visibility="visible"/>
 
     <androidx.cardview.widget.CardView
         android:id="@+id/mapUnitCard"
diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml
index a468151..5abb95b 100644
--- a/androidApp/src/main/res/layout/units_activity.xml
+++ b/androidApp/src/main/res/layout/units_activity.xml
@@ -7,14 +7,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/displayContainer"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/displayModeToggle"
diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml
index 59c6af5..034f3e5 100644
--- a/androidApp/src/main/res/values/map_layers.xml
+++ b/androidApp/src/main/res/values/map_layers.xml
@@ -1,34 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="layer_streets">OpenStreetMap</string>
-    <string name="layer_gmaps">Google Streets</string>
-    <string name="layer_satellite">Google Satellite</string>
-
-    <!-- Tile URLs -->
-    <!-- [0] = tile server URL -->
-    <!-- [1] = min zoom -->
-    <!-- [2] = max zoom -->
-    <!-- [3] = attribution text -->
-
-    <string-array name="maps_streets_tile" translatable="false">
-        <item>https://a.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png</item>
-        <item>0</item>
-        <item>21</item>
-        <item>&#169; OpenStreetMap France | &#169; &lt;a href="https://www.openstreetmap.org/copyright"&gt;OpenStreetMap&lt;/a&gt; contributors</item>
-    </string-array>
-
-    <string-array name="maps_gmaps_tile" translatable="false">
-        <item>https://mt0.google.com/vt/lyrs=m&amp;hl=en&amp;x={x}&amp;y={y}&amp;z={z}&amp;s=Ga</item>
-        <item>0</item>
-        <item>21</item>
-        <item>&#169; Google</item>
-    </string-array>
-
-    <string-array name="maps_satellite_tile" translatable="false">
-        <item>https://mt0.google.com/vt/lyrs=y&amp;hl=en&amp;x={x}&amp;y={y}&amp;z={z}&amp;s=Ga</item>
-        <item>0</item>
-        <item>21</item>
-        <item>&#169; Google</item>
-    </string-array>
-
+    <string name="layer_streets">Streets</string>
+    <string name="layer_satellite">Satellite</string>
 </resources>
\ No newline at end of file