diff options
Diffstat (limited to 'androidApp/src/main/res')
| -rw-r--r-- | androidApp/src/main/res/drawable/icon_layers.xml | 10 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/units_activity.xml | 17 | ||||
| -rw-r--r-- | androidApp/src/main/res/menu/map_layers.xml | 17 | ||||
| -rw-r--r-- | androidApp/src/main/res/values-es-rMX/strings.xml | 5 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/strings.xml | 18 |
5 files changed, 63 insertions, 4 deletions
diff --git a/androidApp/src/main/res/drawable/icon_layers.xml b/androidApp/src/main/res/drawable/icon_layers.xml new file mode 100644 index 0000000..478fe9d --- /dev/null +++ b/androidApp/src/main/res/drawable/icon_layers.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/> +</vector> diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml index 07b5dad..475598f 100644 --- a/androidApp/src/main/res/layout/units_activity.xml +++ b/androidApp/src/main/res/layout/units_activity.xml @@ -40,7 +40,7 @@ app:cardCornerRadius="@dimen/card_border_radius" app:cardElevation="@dimen/card_elevation" app:layout_constraintBottom_toBottomOf="@id/displayModeToggle" - app:layout_constraintEnd_toStartOf="@id/displayModeToggle" + app:layout_constraintEnd_toStartOf="@id/mapLayerToggle" app:layout_constraintStart_toEndOf="@id/userButton" app:layout_constraintTop_toTopOf="@id/displayModeToggle"> @@ -58,6 +58,21 @@ </com.google.android.material.card.MaterialCardView> <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/mapLayerToggle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + android:contentDescription="@string/switch_layer" + android:src="@drawable/icon_layers" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintEnd_toStartOf="@id/displayModeToggle" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/displayModeToggle" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml new file mode 100644 index 0000000..6830ff7 --- /dev/null +++ b/androidApp/src/main/res/menu/map_layers.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu + xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/layerStreets" + android:title="@string/layer_streets"/> + + <item + 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 823ddde..be656ad 100644 --- a/androidApp/src/main/res/values-es-rMX/strings.xml +++ b/androidApp/src/main/res/values-es-rMX/strings.xml @@ -10,8 +10,13 @@ <!-- UnitsActivity --> <string name="toggle_list">Cambiar a lista de dispositivos</string> <string name="toggle_map">Cambiar a mapa</string> + <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="menu_account">Cuenta</string> <string name="menu_about">Acerca de</string> <string name="menu_logout">Cerrar sesión</string> diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 4a7d03b..c59bb9f 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -3,13 +3,20 @@ <string name="app_name">TrackerMap</string> <!-- Non translatables --> - <string name="maps_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_url_template" translatable="false"> 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=s&hl=en&x={x}&y={y}&z={z}&s=Ga + </string> + <string name="maps_hybrid_url" translatable="false"> + https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga + </string> + <!-- LoginActivity --> <string name="login_username">Username</string> <string name="login_password">Password</string> @@ -18,8 +25,13 @@ <!-- UnitsActivity --> <string name="toggle_list">Switch to device list</string> <string name="toggle_map">Switch to map</string> + <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> |