From 9cf88c00b050b6a29a9d367a5abfa7329795f031 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 6 Jun 2022 17:01:50 +0200
Subject: [PATCH] Voice announcements: time is moving time (settings).

---
 .../services/announcement/VoiceAnnouncementUtilsTest.java | 4 ++--
 .../services/announcement/VoiceAnnouncementUtils.java     | 4 ++--
 .../dennisguse/opentracks/settings/PreferencesUtils.java  | 8 ++++----
 src/main/res/values/settings.xml                          | 2 +-
 src/main/res/xml/settings_announcements.xml               | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java
index 38c34bda9..a237900cb 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java
@@ -46,7 +46,7 @@ public class VoiceAnnouncementUtilsTest {
         PreferencesUtils.setVoiceAnnounceLapHeartRate(false);
         PreferencesUtils.setVoiceAnnounceAverageHeartRate(false);
         PreferencesUtils.setVoiceAnnounceTotalDistance(true);
-        PreferencesUtils.setVoiceAnnounceTotalTime(true);
+        PreferencesUtils.setVoiceAnnounceMovingTime(true);
         PreferencesUtils.setVoiceAnnounceAverageSpeedPace(true);
         PreferencesUtils.setVoiceAnnounceLapSpeedPace(true);
     }
@@ -234,7 +234,7 @@ public class VoiceAnnouncementUtilsTest {
         PreferencesUtils.setVoiceAnnounceLapHeartRate(true);
         PreferencesUtils.setVoiceAnnounceAverageHeartRate(false);
         PreferencesUtils.setVoiceAnnounceTotalDistance(false);
-        PreferencesUtils.setVoiceAnnounceTotalTime(false);
+        PreferencesUtils.setVoiceAnnounceMovingTime(false);
         PreferencesUtils.setVoiceAnnounceAverageSpeedPace(false);
         PreferencesUtils.setVoiceAnnounceLapSpeedPace(false);
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java
index 64aa88583..861190804 100644
--- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java
@@ -6,7 +6,7 @@ import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnno
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapHeartRate;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapSpeedPace;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance;
-import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalTime;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceMovingTime;
 
 import android.content.Context;
 import android.text.Spannable;
@@ -80,7 +80,7 @@ class VoiceAnnouncementUtils {
 
         // Announce time
         Duration movingTime = trackStatistics.getMovingTime();
-        if (shouldVoiceAnnounceTotalTime() && !movingTime.isZero()) {
+        if (shouldVoiceAnnounceMovingTime() && !movingTime.isZero()) {
             appendDuration(context, builder, movingTime);
             builder.append(".");
         }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 5e9bd270e..0615259d0 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -352,13 +352,13 @@ public class PreferencesUtils {
         setBoolean(R.string.voice_announce_total_distance_key, value);
     }
 
-    public static boolean shouldVoiceAnnounceTotalTime() {
-        return getBoolean(R.string.voice_announce_total_time_key, true);
+    public static boolean shouldVoiceAnnounceMovingTime() {
+        return getBoolean(R.string.voice_announce_moving_time_key, true);
     }
 
     @VisibleForTesting
-    public static void setVoiceAnnounceTotalTime(boolean value) {
-        setBoolean(R.string.voice_announce_total_time_key, value);
+    public static void setVoiceAnnounceMovingTime(boolean value) {
+        setBoolean(R.string.voice_announce_moving_time_key, value);
     }
 
     public static boolean shouldVoiceAnnounceAverageSpeedPace() {
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 937ac30cc..2dd63380d 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -292,7 +292,7 @@
         <item>1.3</item>
     </string-array>
     <string name="voice_announce_total_distance_key" translatable="false">voiceAnnounceTotalDistance</string>
-    <string name="voice_announce_total_time_key" translatable="false">voiceAnnounceTotalTime</string>
+    <string name="voice_announce_moving_time_key" translatable="false">voiceAnnounceMovingTime</string>
     <string name="voice_announce_average_speed_pace_key" translatable="false">voiceAnnounceAverageSpeedPace</string>
     <string name="voice_announce_lap_speed_pace_key" translatable="false">voiceAnnounceLapSpeedPace</string>
     <string name="voice_announce_average_heart_rate_key" translatable="false">voiceAnnounceAverageHeartRate</string>
diff --git a/src/main/res/xml/settings_announcements.xml b/src/main/res/xml/settings_announcements.xml
index 848bff32f..d4f193459 100644
--- a/src/main/res/xml/settings_announcements.xml
+++ b/src/main/res/xml/settings_announcements.xml
@@ -35,8 +35,8 @@
 
         <SwitchPreference
             android:defaultValue="true"
-            android:key="@string/voice_announce_total_time_key"
-            android:title="@string/stats_total_time" />
+            android:key="@string/voice_announce_moving_time_key"
+            android:title="@string/stats_moving_time" />
 
         <SwitchPreference
             android:defaultValue="true"