From 53745ca9f58685ee0df92289013fec246d11d3e3 Mon Sep 17 00:00:00 2001 From: goga Date: Tue, 16 Mar 2021 00:05:28 +0500 Subject: [PATCH] display timeAgo properly and show coords in users screen --- app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt | 3 ++- app/src/main/proto | 2 +- design | 2 +- geeksville-androidlib | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt index e4d6bd771..67a1a8583 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt @@ -13,6 +13,7 @@ import com.geeksville.android.Logging import com.geeksville.mesh.NodeInfo import com.geeksville.mesh.R import com.geeksville.mesh.model.UIViewModel +import com.geeksville.util.formatAgo import com.mapbox.geojson.Feature import com.mapbox.geojson.FeatureCollection import com.mapbox.geojson.Point @@ -79,7 +80,7 @@ class MapFragment : ScreenFragment("Map"), Logging { ) ) node.user?.let { - f.addStringProperty("name", it.longName) + f.addStringProperty("name", it.longName + " " + formatAgo(node.lastSeen)) } f } diff --git a/app/src/main/proto b/app/src/main/proto index 7c025b9a4..ac26ffdc7 160000 --- a/app/src/main/proto +++ b/app/src/main/proto @@ -1 +1 @@ -Subproject commit 7c025b9a4d54bb410ec17ee653122861b413f177 +Subproject commit ac26ffdc71dad5765124186df5ec38771a0e5240 diff --git a/design b/design index a81074152..d0339f029 160000 --- a/design +++ b/design @@ -1 +1 @@ -Subproject commit a81074152157fa54b0d02ccbbd6a6357cc3cedcf +Subproject commit d0339f0297c629f1bd6873b4abccfecb98443538 diff --git a/geeksville-androidlib b/geeksville-androidlib index 99cf0da30..6da250358 160000 --- a/geeksville-androidlib +++ b/geeksville-androidlib @@ -1 +1 @@ -Subproject commit 99cf0da30fe41163a735ac291f3dd018a7d6295d +Subproject commit 6da250358ed13e3c58fd4fa2a123b01b3826d4bf