aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'androidApp/src/main/res/values')
-rw-r--r--androidApp/src/main/res/values/colors.xml2
-rw-r--r--androidApp/src/main/res/values/dimen.xml1
-rw-r--r--androidApp/src/main/res/values/map_layers.xml7
-rw-r--r--androidApp/src/main/res/values/strings.xml3
4 files changed, 8 insertions, 5 deletions
diff --git a/androidApp/src/main/res/values/colors.xml b/androidApp/src/main/res/values/colors.xml
index bb4ab14..23fe6fb 100644
--- a/androidApp/src/main/res/values/colors.xml
+++ b/androidApp/src/main/res/values/colors.xml
@@ -12,6 +12,8 @@
<color name="colorGeofenceLabel">#1976D2</color>
<color name="colorGeofenceLabelOutline">#FFFFFF</color>
<color name="colorReport">#388E3C</color>
+ <color name="colorAttributionText">#66000000</color>
+ <color name="colorAttributionBackground">#4DFFFFFF</color>
<color name="colorOnline">#388E3C</color>
<color name="colorOffline">#D32F2F</color>
diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml
index 271a12b..92d5242 100644
--- a/androidApp/src/main/res/values/dimen.xml
+++ b/androidApp/src/main/res/values/dimen.xml
@@ -33,6 +33,7 @@
<dimen name="geofence_label_text_size">11sp</dimen>
<dimen name="geofence_label_width">4dp</dimen>
<dimen name="report_label_width">10dp</dimen>
+ <dimen name="attribution_text_size">11sp</dimen>
<!-- User Information -->
<dimen name="fields_spacing">8dp</dimen>
diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml
index c0e83a5..bffceb9 100644
--- a/androidApp/src/main/res/values/map_layers.xml
+++ b/androidApp/src/main/res/values/map_layers.xml
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <string name="layer_streets">Streets</string>
+ <string name="layer_satellite">Satellite</string>
+
<!-- Tile URLs -->
<!-- [0] = tile server URL -->
<!-- [1] = min zoom -->
<!-- [2] = max zoom -->
<!-- [3] = attribution text -->
- <string-array name="maps_streets_tile_url" translatable="false">
+ <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_satellite_tile_url" translatable="false">
+ <string-array name="maps_satellite_tile" translatable="false">
<item>https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}</item>
<item>0</item>
<item>20</item>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index a3d2f28..11c914f 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -32,9 +32,6 @@
<string name="switch_layer">Switch map layer</string>
<string name="open_profile">View account info</string>
- <string name="layer_streets">Streets</string>
- <string name="layer_satellite">Satellite</string>
-
<string name="menu_account">Account</string>
<string name="menu_about">About</string>
<string name="menu_logout">Logout</string>