From 3e15173c529b2b307e813288f4728f5110fb5a78 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Tue, 4 Jan 2022 22:37:36 -0600
Subject: Implemented formatSpeed, redesigned UnitInformationFragment, added
 button to open device location in map, minor UI tweaks and added
 translations.

---
 .../main/res/layout/unit_details_information.xml   | 22 ++--------------
 androidApp/src/main/res/values-es-rMX/strings.xml  | 29 +++++++++++++++++++---
 androidApp/src/main/res/values/dimen.xml           |  2 +-
 androidApp/src/main/res/values/strings.xml         | 21 ++++++++++++----
 4 files changed, 44 insertions(+), 30 deletions(-)

(limited to 'androidApp/src/main/res')

diff --git a/androidApp/src/main/res/layout/unit_details_information.xml b/androidApp/src/main/res/layout/unit_details_information.xml
index f4b6fae..24f792c 100644
--- a/androidApp/src/main/res/layout/unit_details_information.xml
+++ b/androidApp/src/main/res/layout/unit_details_information.xml
@@ -17,6 +17,7 @@
         app:contentPadding="@dimen/card_padding">
 
         <LinearLayout
+            android:id="@+id/detailsLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -27,27 +28,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/colorPrimaryDark"
+                android:layout_marginBottom="@dimen/padding"
                 tools:text="1AAUTO" />
-
-            <TableLayout
-                android:id="@+id/informationTable"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:stretchColumns="*">
-                <TableRow
-                    android:background="@color/colorPrimary">
-                    <TextView
-                        android:text="@string/key"
-                        android:textColor="@color/background"
-                        android:paddingHorizontal="@dimen/padding"/>
-
-                    <TextView
-                        android:text="@string/value"
-                        android:textColor="@color/background"
-                        android:paddingHorizontal="@dimen/padding"/>
-                </TableRow>
-            </TableLayout>
-
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index 69ca1a8..7397599 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -22,13 +22,34 @@
     <string name="unit_last_address">Dirección de la última posición</string>
     <string name="unit_last_date">Fecha y hora de la última posición</string>
 
-    <string name="unit_speed_format">%1$d km/h</string>
-
+    <!-- Details -->
     <string name="unit_details">Detalles</string>
     <string name="unit_reports">Reportes</string>
     <string name="unit_commands">Comandos</string>
     <string name="units_search">Escribe para buscar</string>
 
-    <string name="key">Key</string>
-    <string name="value">Value</string>
+    <!-- Unit Information -->
+    <string name="unit_info_contact">Contacto</string>
+    <string name="unit_info_speed">Velocidad</string>
+    <string name="unit_info_address">Dirección</string>
+    <string name="unit_info_latitude">Latitud</string>
+    <string name="unit_info_longitude">Longitud</string>
+    <string name="unit_info_datetime">Fecha y hora</string>
+    <string name="unit_info_protocol">Protocolo</string>
+    <string name="unit_info_map_button">Abrir ubicación en navegador</string>
+
+    <!-- Commands -->
+    <string name="send_command">Enviar comando</string>
+
+    <!-- Reports -->
+    <string name="positions">Posiciones</string>
+    <string name="events">Eventos</string>
+    <string name="stops">Paradas</string>
+    <string name="day_period">Día</string>
+    <string name="week_period">Semana</string>
+    <string name="month_period">Mes</string>
+    <string name="period">Periodo</string>
+    <string name="select_period">Seleccionar</string>
+    <string name="table_event">Evento</string>
+    <string name="table_datetime">Fecha y hora</string>
 </resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml
index 18fd0eb..283f476 100644
--- a/androidApp/src/main/res/values/dimen.xml
+++ b/androidApp/src/main/res/values/dimen.xml
@@ -15,6 +15,6 @@
     <dimen name="search_vertical_margin">4dp</dimen>
 
     <!-- Floating Button -->
-    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="fab_margin">12dp</dimen>
     <dimen name="fab_elevation">8dp</dimen>
 </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 453bc16..b50d096 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -2,6 +2,11 @@
 <resources>
     <string name="app_name">TrackerMap</string>
 
+    <!-- Non translatables -->
+    <string name="maps_url_template" translatable="false">
+        https://www.google.com/maps/place/%1$f,%2$f?z=19
+    </string>
+
     <!-- LoginActivity -->
     <string name="login_username">Username</string>
     <string name="login_password">Password</string>
@@ -22,17 +27,23 @@
     <string name="unit_last_address">Last position address</string>
     <string name="unit_last_date">Last position datetime</string>
 
-    <string name="unit_speed_format">%1$d km/h</string>
-
     <!-- Details -->
     <string name="unit_details">Details</string>
     <string name="unit_reports">Reports</string>
     <string name="unit_commands">Commands</string>
     <string name="units_search">Type to search</string>
 
-    <!-- Commads -->
-    <string name="key">Key</string>
-    <string name="value">Value</string>
+    <!-- Unit Information -->
+    <string name="unit_info_contact">Contact</string>
+    <string name="unit_info_speed">Speed</string>
+    <string name="unit_info_address">Address</string>
+    <string name="unit_info_latitude">Latitude</string>
+    <string name="unit_info_longitude">Longitude</string>
+    <string name="unit_info_datetime">Datetime</string>
+    <string name="unit_info_protocol">Protocol</string>
+    <string name="unit_info_map_button">Open location in browser</string>
+
+    <!-- Commands -->
     <string name="send_command">Send Command</string>
 
     <!-- Reports -->
-- 
cgit v1.2.3