Implemented formatSpeed, redesigned UnitInformationFragment, added button to open device location in map, minor UI tweaks and added translations.

1 files changed, 18 insertions, 5 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
index b38b20b..d715e8d 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
@@ -9,6 +9,7 @@ import mx.trackermap.TrackerMap.android.R
 import mx.trackermap.TrackerMap.android.databinding.UnitItemBinding
 import mx.trackermap.TrackerMap.utils.Formatter
 import mx.trackermap.TrackerMap.client.models.UnitInformation
+import mx.trackermap.TrackerMap.utils.SpeedUnit
 
 enum class Action {
     CLICK, DETAILS, REPORTS, COMMANDS
@@ -67,16 +68,28 @@ class DevicesAdapter(
 
             unitName.text = unit.device.name
             driverName.text = unit.device.contact
-            unitSpeed.text = context.getString(R.string.unit_speed_format, unit.position?.speed?.toInt() ?: 0)
+            unitSpeed.text = Formatter.formatSpeed(unit.position?.speed ?: 0.0, SpeedUnit.KMH)
             lastAddress.text = unit.position?.address
             unit.position?.fixTime?.let {
                 lastDate.text = Formatter.formatDate(it)
             }
             actionCallback?.let { callback ->
-                unitCard.setOnClickListener { callback(unit, Action.CLICK) }
-                detailsButton.setOnClickListener { callback(unit, Action.DETAILS) }
-                reportsButton.setOnClickListener { callback(unit, Action.REPORTS) }
-                commandsButton.setOnClickListener { callback(unit, Action.COMMANDS) }
+                unitCard.setOnClickListener {
+                    swipeLayout.close()
+                    callback(unit, Action.CLICK)
+                }
+                detailsButton.setOnClickListener {
+                    swipeLayout.close()
+                    callback(unit, Action.DETAILS)
+                }
+                reportsButton.setOnClickListener {
+                    swipeLayout.close()
+                    callback(unit, Action.REPORTS)
+                }
+                commandsButton.setOnClickListener {
+                    swipeLayout.close()
+                    callback(unit, Action.COMMANDS)
+                }
             }
         }
     }