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 aac0d6b10..ab67d5b96 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -15,6 +15,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.time.Duration; +import java.time.Instant; import java.util.Locale; import java.util.Map; @@ -56,65 +57,81 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_metric_speed() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMaxSpeed(Speed.of(100)); stats.setTotalAltitudeGain(6000f); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement); + assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement); } @Test public void getAnnouncement_metric_speed_rounding_check() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1).plusSeconds(1)); stats.setMaxSpeed(Speed.of(100)); stats.setTotalAltitudeGain(6000f); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement); + assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement); } @Test public void getAnnouncement_metric_distance_rounding_check() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(19999)); stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1)); stats.setMaxSpeed(Speed.of(100)); stats.setTotalAltitudeGain(6000f); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement); + assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement); } @Test public void getAnnouncement_metric_distance_rounding_check_two() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(19900)); stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1)); stats.setMaxSpeed(Speed.of(100)); stats.setTotalAltitudeGain(6000f); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement); + assertEquals("12:00 AM. Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement); } @Test @@ -132,27 +149,34 @@ public class VoiceAnnouncementUtilsTest { lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, lastInterval, null).toString(); // then - assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement); + assertEquals("12:16 AM. Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement); } @Test public void getAnnouncement_metric_pace() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMaxSpeed(Speed.of(100)); stats.setTotalAltitudeGain(6000f); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, false, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, false, null, null).toString(); // then - assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement); + assertEquals("12:00 AM. Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement); } @Test @@ -170,69 +194,88 @@ public class VoiceAnnouncementUtilsTest { lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, false, lastInterval, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, false, lastInterval, null).toString(); // then - assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement); + assertEquals("12:16 AM. Total distance 14.2 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement); } @Test public void getAnnouncement_imperial_speed() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMaxSpeed(Speed.of(100)); stats.setTotalAltitudeGain(6000f); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.IMPERIAL_FEET, true, null, null).toString(); // then - assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement); + assertEquals("12:00 AM. Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement); } @Test public void getAnnouncement_imperial_speed_1() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.ofMile(1.1)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1)); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.IMPERIAL_FEET, true, null, null).toString(); // then - assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement); + assertEquals("12:00 AM. Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement); } @Test public void getAnnouncement_imperial_meter_speed_1() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.ofMile(1.1)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1)); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_METER, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.IMPERIAL_METER, true, null, null).toString(); // then - assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement); + assertEquals("12:00 AM. Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement); } @Test public void getAnnouncement_metric_speed_1() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.ofKilometer(1.1)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1)); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 1.1 kilometers. 1 hour. Average moving speed 1.1 kilometers per hour.", announcement); + assertEquals("12:00 AM. Total distance 1.1 kilometers. 1 hour. Average moving speed 1.1 kilometers per hour.", announcement); } @Test @@ -250,27 +293,34 @@ public class VoiceAnnouncementUtilsTest { lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, lastInterval, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.IMPERIAL_FEET, true, lastInterval, null).toString(); // then - assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement); + assertEquals("12:16 AM. Total distance 8.8 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement); } @Test public void getAnnouncement_imperial_pace() { TrackStatistics stats = new TrackStatistics(); + stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMaxSpeed(Speed.of(100)); stats.setTotalAltitudeGain(6000f); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, false, null, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.IMPERIAL_FEET, false, null, null).toString(); // then - assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement); + assertEquals("12:00 AM. Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement); } @Test @@ -288,11 +338,14 @@ public class VoiceAnnouncementUtilsTest { lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, false, lastInterval, null).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.IMPERIAL_FEET, false, lastInterval, null).toString(); // then - assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement); + assertEquals("12:16 AM. Total distance 8.8 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement); } @Test @@ -314,11 +367,14 @@ public class VoiceAnnouncementUtilsTest { SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString(); // then - assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement); + assertEquals("12:16 AM. Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement); } @Test @@ -344,11 +400,14 @@ public class VoiceAnnouncementUtilsTest { SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null); + Track track = new Track(); + track.setTrackStatistics(stats); + // when - String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString(); + String announcement = VoiceAnnouncementUtils.createStatistics(context, track, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString(); // then - assertEquals(" Current heart rate 133 bpm.", announcement); + assertEquals("12:16 AM. Current heart rate 133 bpm.", announcement); } @Test diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java index 38affb24c..625f276cd 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java @@ -118,7 +118,13 @@ public class Track { } public OffsetDateTime getStartTime() { - return trackStatistics.getStartTime().atOffset(zoneOffset); + return trackStatistics + .getStartTime().atOffset(zoneOffset); + } + + public OffsetDateTime getStopTime() { + return trackStatistics + .getStopTime().atOffset(zoneOffset); } @NonNull diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/TTSManager.java b/src/main/java/de/dennisguse/opentracks/services/announcement/TTSManager.java index 2b3dc406d..a87330e9b 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/TTSManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/TTSManager.java @@ -22,7 +22,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.speech.tts.TextToSpeech; import android.speech.tts.UtteranceProgressListener; -import android.text.Spannable; import android.util.Log; import androidx.annotation.NonNull; @@ -118,7 +117,7 @@ public class TTSManager { } } - public void announce(@NonNull Spannable announcement) { + public void speak(@NonNull CharSequence announcement) { synchronized (this) { if (!ttsReady) { ttsReady = ttsInitStatus == TextToSpeech.SUCCESS; diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java index 7b5a4d5b0..fcbc5c368 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java @@ -115,7 +115,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe return; } - voiceAnnouncement.announce(VoiceAnnouncementUtils.createIdle(context)); + voiceAnnouncement.speak(VoiceAnnouncementUtils.createIdle(context)); } public void announceStatisticsIfNeeded(@NonNull Track track) { @@ -135,7 +135,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe } if (announce) { - voiceAnnouncement.announce(createAnnouncement(track)); + voiceAnnouncement.speak(createAnnouncement(track)); } } @@ -155,7 +155,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe sensorStatistics = contentProviderUtils.getSensorStats(track.getId()); } - return VoiceAnnouncementUtils.createStatistics(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics); + return VoiceAnnouncementUtils.createStatistics(context, track, PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics); } public void stop() { 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 f902b8618..8f6372d4b 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -7,12 +7,14 @@ import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnno import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapPower; import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapSpeedPace; import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceMovingTime; +import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTime; import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance; import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceUnit; import android.content.Context; import android.icu.text.MessageFormat; import android.text.Spannable; +import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.style.TtsSpan; @@ -20,12 +22,15 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import java.time.Duration; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; import java.util.Map; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.Distance; -import de.dennisguse.opentracks.data.models.Power; import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.settings.UnitSystem; import de.dennisguse.opentracks.stats.SensorStatistics; import de.dennisguse.opentracks.stats.TrackStatistics; @@ -42,8 +47,15 @@ class VoiceAnnouncementUtils { .append(context.getString(R.string.voiceIdle)); } - static Spannable createStatistics(Context context, TrackStatistics trackStatistics, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) { + static Spannable createStatistics(Context context, Track track, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) { + TrackStatistics trackStatistics = track.getTrackStatistics(); + SpannableStringBuilder builder = new SpannableStringBuilder(); + + if (shouldVoiceAnnounceTime()) { + appendTime(builder, track.getStopTime()); + } + Distance totalDistance = trackStatistics.getTotalDistance(); Speed averageMovingSpeed = trackStatistics.getAverageMovingSpeed(); Speed currentDistancePerTime = currentInterval != null ? currentInterval.getSpeed() : null; @@ -177,6 +189,7 @@ class VoiceAnnouncementUtils { return builder; } + //TODO TtsSpan.TimeBuilder? private static void appendDuration(@NonNull Context context, @NonNull SpannableStringBuilder builder, @NonNull Duration duration) { int hours = (int) (duration.toHours()); int minutes = (int) (duration.toMinutes() % 60); @@ -196,6 +209,20 @@ class VoiceAnnouncementUtils { } } + private static void appendTime(@NonNull SpannableStringBuilder builder, OffsetDateTime now) { + TtsSpan.TimeBuilder ttsSpan = new TtsSpan.TimeBuilder(); + ttsSpan.setHours(now.getHour()); + ttsSpan.setMinutes(now.getMinute()); + + String formattedTime = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT) + .format(now); + + Spannable spannable = new SpannableString(formattedTime + "."); + spannable.setSpan(ttsSpan.build(), 0, spannable.length(), SPAN_INCLUSIVE_EXCLUSIVE); + builder.append(spannable); + builder.append(" "); + } + /** * Speaks as: 98.14 [UNIT] - ninety eight point one four [UNIT with correct plural form] * diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index 7cab605c6..7449050de 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -332,6 +332,10 @@ public class PreferencesUtils { return getBoolean(R.string.voice_announce_idle_key, true); } + public static boolean shouldVoiceAnnounceTime() { + return getBoolean(R.string.voice_announce_unit_key, true); + } + public static boolean shouldVoiceAnnounceUnit() { return getBoolean(R.string.voice_announce_unit_key, true); } diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java index 015ee5db5..bdc5b3035 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java @@ -46,9 +46,9 @@ public class TrackStatistics { private final ExtremityMonitor altitudeExtremities = new ExtremityMonitor(); // The track start time. - private Instant startTime; + private Instant startTime; //TODO Should never be null! // The track stop time. - private Instant stopTime; + private Instant stopTime; //TODO Should never be null! private Distance totalDistance; // Updated when new points are received, may be stale. diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index 1272fb9b0..be8d1fa28 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -250,6 +250,8 @@ true voiceAnnounceLapSpeedPace true + voiceAnnounceTime + true voiceAnnounceUnit true diff --git a/src/main/res/xml/settings_announcements.xml b/src/main/res/xml/settings_announcements.xml index b4eca9a80..eee1cf8ab 100644 --- a/src/main/res/xml/settings_announcements.xml +++ b/src/main/res/xml/settings_announcements.xml @@ -39,6 +39,11 @@ android:title="@string/settings_announcements_totaltime_frequency" app:useSimpleSummaryProvider="true" /> + +