From 463ff614205f9e70c1aacaf888fc4bcbbfd648c5 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sun, 29 Jan 2023 18:18:06 +0100
Subject: [PATCH] display timeRetrieved in detail view if older than 1 hour

---
 app/src/main/res/layout/detail_view.xml | 28 ++++++++++++++++++++++---
 app/src/main/res/values-de/strings.xml  |  1 +
 app/src/main/res/values/strings.xml     |  1 +
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/detail_view.xml b/app/src/main/res/layout/detail_view.xml
index f5b7e78c..ab32797c 100644
--- a/app/src/main/res/layout/detail_view.xml
+++ b/app/src/main/res/layout/detail_view.xml
@@ -31,6 +31,12 @@
 
         <import type="net.vonforst.evmap.api.chargeprice.ChargepriceApi" />
 
+        <import type="android.text.format.DateUtils" />
+
+        <import type="java.time.Instant" />
+
+        <import type="java.time.Duration" />
+
         <variable
             name="charger"
             type="Resource&lt;ChargeLocation&gt;" />
@@ -99,7 +105,7 @@
             android:layout_height="wrap_content"
             android:background="?android:colorBackground"
             android:paddingTop="8dp"
-            android:paddingBottom="8dp">
+            android:paddingBottom="16dp">
 
             <TextView
                 android:id="@+id/txtName"
@@ -470,11 +476,27 @@
                 tools:targetApi="o" />
 
             <TextView
-                android:id="@+id/txtLicense"
+                android:id="@+id/txtTimeRetrieved"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:breakStrategy="balanced"
+                android:text="@{@string/data_retrieved_at(DateUtils.getRelativeTimeSpanString(charger.data.timeRetrieved.toEpochMilli(), Instant.now().toEpochMilli(), 0))}"
+                android:textAlignment="center"
+                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                android:textStyle="italic"
+                app:goneUnless="@{charger.data.timeRetrieved == null || Duration.between(charger.data.timeRetrieved, Instant.now()).compareTo(Duration.ofHours(1)) > 0}"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/sourceButton"
+                tools:text="Data retrieved 4 hours ago" />
+
+            <TextView
+                android:id="@+id/txtLicense"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:breakStrategy="balanced"
                 android:text="@{charger.data.license}"
                 android:textAlignment="center"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
@@ -482,7 +504,7 @@
                 app:goneUnless="@{charger.data.license != null}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/sourceButton"
+                app:layout_constraintTop_toBottomOf="@+id/txtTimeRetrieved"
                 tools:text="The data is provided under the National Oman Open Data LicensE (NOODLE), Version 3.14, and may be used for any purpose whatsoever." />
 
             <Button
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 78fa0158..4b7b5a47 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -319,4 +319,5 @@
     <string name="pref_map_scale_meters">Meter</string>
     <string name="pref_map_scale_miles">Meilen</string>
     <string name="pref_map_scale_off">aus</string>
+    <string name="data_retrieved_at">Daten abgerufen %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 21226e88..13cc7fa3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -319,4 +319,5 @@
     <string name="pref_map_scale_meters">meters</string>
     <string name="pref_map_scale_miles">miles</string>
     <string name="pref_map_scale_off">off</string>
+    <string name="data_retrieved_at">Data retrieved %s</string>
 </resources>
\ No newline at end of file