aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src
diff options
context:
space:
mode:
Diffstat (limited to 'androidApp/src')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt8
-rw-r--r--androidApp/src/main/res/layout/unit_map_fragment.xml6
2 files changed, 9 insertions, 5 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
index 7212a23..4a0fab2 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
@@ -55,12 +55,14 @@ class UnitMapFragment : Fragment() {
Log.d("UnitMapFragment", "Selected Unit: $selectedUnit")
binding.mapUnitCard.visibility = if (selectedUnit == null) View.GONE else View.VISIBLE
- selectedUnit?.position?.let { position ->
- if (position.latitude == null || position.longitude == null) {
+
+ selectedUnit?.let { unit ->
+ if (unit.position == null || unit.position!!.latitude == null || unit.position!!.longitude == null) {
return@let
}
- unitsMapFragment.focusOn(position.latitude!!, position.longitude!!)
+ binding.unitInfoTest.text = unit.device.contact
+ unitsMapFragment.focusOn(unit.position!!.latitude!!, unit.position!!.longitude!!)
}
}
}
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index 914558a..f2d54e6 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<fragment
android:id="@+id/unitsMap"
@@ -34,9 +35,10 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/unitInfoTest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="SELECTED UNIT"
+ tools:text="SELECTED UNIT"
android:gravity="center"/>
</LinearLayout>