karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Voice announcements: time is moving time (settings).

Browse Source
This commit is contained in:
Dennis Guse
2022-06-06 17:01:50 +02:00
parent 8bbde4aacd
commit 9cf88c00b0
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java
+2 -2
View File
@@ -46,7 +46,7 @@ public class VoiceAnnouncementUtilsTest {
PreferencesUtils.setVoiceAnnounceLapHeartRate(false); PreferencesUtils.setVoiceAnnounceLapHeartRate(false);
PreferencesUtils.setVoiceAnnounceAverageHeartRate(false); PreferencesUtils.setVoiceAnnounceAverageHeartRate(false);
PreferencesUtils.setVoiceAnnounceTotalDistance(true); PreferencesUtils.setVoiceAnnounceTotalDistance(true);
PreferencesUtils.setVoiceAnnounceTotalTime(true); PreferencesUtils.setVoiceAnnounceMovingTime(true);
PreferencesUtils.setVoiceAnnounceAverageSpeedPace(true); PreferencesUtils.setVoiceAnnounceAverageSpeedPace(true);
PreferencesUtils.setVoiceAnnounceLapSpeedPace(true); PreferencesUtils.setVoiceAnnounceLapSpeedPace(true);
} }
@@ -234,7 +234,7 @@ public class VoiceAnnouncementUtilsTest {
PreferencesUtils.setVoiceAnnounceLapHeartRate(true); PreferencesUtils.setVoiceAnnounceLapHeartRate(true);
PreferencesUtils.setVoiceAnnounceAverageHeartRate(false); PreferencesUtils.setVoiceAnnounceAverageHeartRate(false);
PreferencesUtils.setVoiceAnnounceTotalDistance(false); PreferencesUtils.setVoiceAnnounceTotalDistance(false);
PreferencesUtils.setVoiceAnnounceTotalTime(false); PreferencesUtils.setVoiceAnnounceMovingTime(false);
PreferencesUtils.setVoiceAnnounceAverageSpeedPace(false); PreferencesUtils.setVoiceAnnounceAverageSpeedPace(false);
PreferencesUtils.setVoiceAnnounceLapSpeedPace(false); PreferencesUtils.setVoiceAnnounceLapSpeedPace(false);
src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java
+2 -2
View File
@@ -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.shouldVoiceAnnounceLapHeartRate;
import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapSpeedPace; import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapSpeedPace;
import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance; 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.content.Context;
import android.text.Spannable; import android.text.Spannable;
@@ -80,7 +80,7 @@ class VoiceAnnouncementUtils {
// Announce time // Announce time
Duration movingTime = trackStatistics.getMovingTime(); Duration movingTime = trackStatistics.getMovingTime();
if (shouldVoiceAnnounceTotalTime() && !movingTime.isZero()) { if (shouldVoiceAnnounceMovingTime() && !movingTime.isZero()) {
appendDuration(context, builder, movingTime); appendDuration(context, builder, movingTime);
builder.append("."); builder.append(".");
} }
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+4 -4
View File
@@ -352,13 +352,13 @@ public class PreferencesUtils {
setBoolean(R.string.voice_announce_total_distance_key, value); setBoolean(R.string.voice_announce_total_distance_key, value);
} }
public static boolean shouldVoiceAnnounceTotalTime() { public static boolean shouldVoiceAnnounceMovingTime() {
return getBoolean(R.string.voice_announce_total_time_key, true); return getBoolean(R.string.voice_announce_moving_time_key, true);
} }
@VisibleForTesting @VisibleForTesting
public static void setVoiceAnnounceTotalTime(boolean value) { public static void setVoiceAnnounceMovingTime(boolean value) {
setBoolean(R.string.voice_announce_total_time_key, value); setBoolean(R.string.voice_announce_moving_time_key, value);
} }
public static boolean shouldVoiceAnnounceAverageSpeedPace() { public static boolean shouldVoiceAnnounceAverageSpeedPace() {
src/main/res/values/settings.xml
+1 -1
View File
@@ -292,7 +292,7 @@
<item>1.3</item> <item>1.3</item>
</string-array> </string-array>
<string name="voice_announce_total_distance_key" translatable="false">voiceAnnounceTotalDistance</string> <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_average_speed_pace_key" translatable="false">voiceAnnounceAverageSpeedPace</string>
<string name="voice_announce_lap_speed_pace_key" translatable="false">voiceAnnounceLapSpeedPace</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> <string name="voice_announce_average_heart_rate_key" translatable="false">voiceAnnounceAverageHeartRate</string>
src/main/res/xml/settings_announcements.xml
+2 -2
View File
@@ -35,8 +35,8 @@
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/voice_announce_total_time_key" android:key="@string/voice_announce_moving_time_key"
android:title="@string/stats_total_time" /> android:title="@string/stats_moving_time" />
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"