diff options
Diffstat (limited to 'androidApp/src/main/res/values')
| -rw-r--r-- | androidApp/src/main/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/dimen.xml | 1 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/map_layers.xml | 26 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/strings.xml | 11 |
4 files changed, 29 insertions, 11 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 new file mode 100644 index 0000000..bffceb9 --- /dev/null +++ b/androidApp/src/main/res/values/map_layers.xml @@ -0,0 +1,26 @@ +<?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" translatable="false"> + <item>https://a.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png</item> + <item>0</item> + <item>21</item> + <item>© OpenStreetMap France | © <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors</item> + </string-array> + + <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> + <item>Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community</item> + </string-array> + +</resources>
\ No newline at end of file diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 1caf502..1cc1f10 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -10,13 +10,6 @@ https://www.google.com/maps/place/%1$f,%2$f?z=19 </string> - <string name="maps_streets_tile_url" translatable="false"> - https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga - </string> - <string name="maps_satellite_url" translatable="false"> - https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga - </string> - <string name="notification_channel_id" translatable="false">default</string> <string name="notification_channel" translatable="false">Default</string> @@ -39,10 +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="layer_hybrid">Hybrid</string> - <string name="menu_account">Account</string> <string name="menu_about">About</string> <string name="menu_logout">Logout</string> |