diff options
| author | Isidro Henoch <imhenoch@protonmail.com> | 2022-01-03 13:55:58 -0600 |
|---|---|---|
| committer | Isidro Henoch <imhenoch@protonmail.com> | 2022-01-03 13:55:58 -0600 |
| commit | 1c94fbca0faebea6d005a92a53e7885e3ddd7dc6 (patch) | |
| tree | 5567d2c823e0d28627f67738d07b810a65a2a0eb /androidApp/src/main/res/values | |
| parent | 4196352a52eba7e9148cbab6e12d7bafb0f07d88 (diff) | |
| parent | 84fd0a97d775b88ef03c3161bbe126032ace8238 (diff) | |
| download | etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.tar.gz etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.tar.bz2 etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.zip | |
Merge branch 'reports'
# Conflicts:
# androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
# androidApp/src/main/res/values/strings.xml
Diffstat (limited to 'androidApp/src/main/res/values')
| -rw-r--r-- | androidApp/src/main/res/values/dimen.xml | 1 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/strings.xml | 17 |
2 files changed, 17 insertions, 1 deletions
diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml index 6ce7887..18fd0eb 100644 --- a/androidApp/src/main/res/values/dimen.xml +++ b/androidApp/src/main/res/values/dimen.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <dimen name="padding">8dp</dimen> + <dimen name="margin">16dp</dimen> <!-- CardView --> <dimen name="card_border_radius">20dp</dimen> diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index d68c68c..453bc16 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -24,11 +24,26 @@ <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> -</resources>
\ No newline at end of file + <string name="send_command">Send Command</string> + + <!-- Reports --> + <string name="positions">Positions</string> + <string name="events">Events</string> + <string name="stops">Stops</string> + <string name="day_period">Day</string> + <string name="week_period">Week</string> + <string name="month_period">Month</string> + <string name="period">Period</string> + <string name="select_period">Select</string> + <string name="table_event">Event</string> + <string name="table_datetime">Datetime</string> +</resources> |