From 59389accc56df10d8af665c0fc1418c09f52cfa5 Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Sat, 1 Apr 2023 13:11:53 -0700
Subject: [PATCH] Subtract pause duration from moving duration, change strings.

---
 app/src/main/java/net/voussoir/trkpt/Track.kt |  2 +-
 app/src/main/res/values/strings.xml           | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/voussoir/trkpt/Track.kt b/app/src/main/java/net/voussoir/trkpt/Track.kt
index 037326e..de28aa8 100644
--- a/app/src/main/java/net/voussoir/trkpt/Track.kt
+++ b/app/src/main/java/net/voussoir/trkpt/Track.kt
@@ -190,7 +190,7 @@ data class TrackStatistics(
         }
         if (first != null && last != null)
         {
-            duration = last.time - first.time
+            duration = (last.time - first.time) - pause_duration
             if (duration > 1000)
             {
                 velocity = distance / (duration / 1000)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ffc59d4..c376cb7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,12 +54,12 @@
     <string name="statistics_sheet_p_steps">Steps taken:</string>
     <string name="statistics_sheet_p_steps_no_pedometer">pedometer not available</string>
     <string name="statistics_sheet_p_waypoints">Recorded trackpoints:</string>
-    <string name="statistics_sheet_p_duration">Total duration:</string>
-    <string name="statistics_sheet_p_recording_paused">Recording paused:</string>
-    <string name="statistics_sheet_p_recording_start">Recording started:</string>
-    <string name="statistics_sheet_p_recording_stop">Recording stopped:</string>
-    <string name="statistics_sheet_p_max_altitude">Highest trackpoint:</string>
-    <string name="statistics_sheet_p_min_altitude">Lowest trackpoint:</string>
+    <string name="statistics_sheet_p_duration">Moving duration:</string>
+    <string name="statistics_sheet_p_recording_paused">Rest duration:</string>
+    <string name="statistics_sheet_p_recording_start">First point:</string>
+    <string name="statistics_sheet_p_recording_stop">Last point:</string>
+    <string name="statistics_sheet_p_max_altitude">Highest elevation:</string>
+    <string name="statistics_sheet_p_min_altitude">Lowest elevation:</string>
     <string name="statistics_sheet_p_positive_elevation">Elevation (uphill):</string>
     <string name="statistics_sheet_p_negative_elevation">Elevation (downhill):</string>
     <string name="statistics_sheet_p_velocity">Average velocity:</string>