Merge pull request #238 from rilling/Group_2_C2

Time of day announcement feature #178

src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java

@@ -7,6 +7,8 @@
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceLapSpeedPace;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceMovingTime;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTime;
+
 
 import android.content.Context;
 import android.icu.text.MessageFormat;
@@ -27,6 +29,8 @@
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.ui.intervals.IntervalStatistics;
+import de.dennisguse.opentracks.util.CTime;
+import de.dennisguse.opentracks.util.SpeechTxtForTime;
 
 class VoiceAnnouncementUtils {
 
@@ -39,6 +43,13 @@ static Spannable getAnnouncement(Context context, TrackStatistics trackStatistic
         Speed averageMovingSpeed = trackStatistics.getAverageMovingSpeed();
         Speed currentDistancePerTime = currentInterval != null ? currentInterval.getSpeed() : null;
 
+        // Announce current time
+        if(shouldVoiceAnnounceTime()){
+            SpeechTxtForTime t = new SpeechTxtForTime();
+            CTime c = new CTime();
+            String currentTime = c.getCurrentTime();
+            builder.append(t.speechText+currentTime+".");}
+
         int perUnitStringId;
         int distanceId;
         int speedId;
@@ -83,6 +94,7 @@ static Spannable getAnnouncement(Context context, TrackStatistics trackStatistic
         if (totalDistance.isZero()) {
             return builder;
         }
+
 
         // Announce time
         Duration movingTime = trackStatistics.getMovingTime();
@@ -91,6 +103,7 @@ static Spannable getAnnouncement(Context context, TrackStatistics trackStatistic
             builder.append(".");
         }
 
+
         if (isReportSpeed) {
             if (shouldVoiceAnnounceAverageSpeedPace()) {
                 double speedInUnit = averageMovingSpeed.to(unitSystem);

src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java

@@ -397,6 +397,17 @@ public static float getVoiceSpeedRate() {
         return getFloat(R.string.voice_speed_rate_key, DEFAULT);
     }
 
+    //adding time thing
+
+    public static boolean shouldVoiceAnnounceTime(){
+        return getBoolean(R.string.voice_announce_time_key, true);
+    }
+
+    @VisibleForTesting
+    public static void setVoiceAnnounceTime(boolean value) {
+        setBoolean(R.string.voice_announce_time_key, value);
+    }
+
     public static boolean shouldVoiceAnnounceTotalDistance() {
         return getBoolean(R.string.voice_announce_total_distance_key, true);
     }

src/main/java/de/dennisguse/opentracks/util/CTime.java

@@ -0,0 +1,19 @@
+package de.dennisguse.opentracks.util;
+
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+public class CTime {
+    public String getCurrentTime(){
+        LocalTime currentTime = LocalTime.now();
+
+        // Create a formatter for the desired time format
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("h:mm a");
+
+        // Format the current time using the formatter
+        String formattedTime = currentTime.format(formatter);
+        return formattedTime;
+    }
+
+
+}

src/main/java/de/dennisguse/opentracks/util/SpeechTxtForTime.java

@@ -0,0 +1,5 @@
+package de.dennisguse.opentracks.util;
+
+public class SpeechTxtForTime {
+    public String speechText = "Current time is ";
+}

src/main/res/values/settings.xml

@@ -244,6 +244,8 @@
     </string-array>
     <string name="voice_announcement_distance_key" translatable="false">voiceDistance</string>
     <string name="voice_announcement_distance_default" translatable="false">@string/announcement_off</string>
+    <!-- Added Current Time Voice Announcement Switch-->
+    <string name="voice_announce_time_key"  translatable="false">voiceAnnounceTime</string>
     <string-array name="voice_announcement_distance_values">
         <item>@string/voice_announcement_distance_default</item> <!-- km/miles -->
         <item>0.1</item>

src/main/res/values/strings.xml

@@ -605,6 +605,7 @@ limitations under the License.
     <string name="voice_per_kilometer">per kilometer</string>
     <string name="voice_per_mile">per mile</string>
     <string name="voice_per_nautical_mile">per nautical mile</string>
+    <string name="time_announce">Current time</string>
     <string name="lap_time">Lap time</string>
     <string name="pace">Pace</string>
     <string name="lap_speed">Lap speed</string>

src/main/res/xml/settings_announcements.xml

@@ -32,6 +32,13 @@
         android:title="@string/voice_on_device_speaker_title" />
     <PreferenceCategory android:title="@string/settings_announcements_title">
 
+        <!-- Added Current Time Voice Announcement Switch-->
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/voice_announce_time_key"
+            android:title="@string/time_announce" />
+
+
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/voice_announce_total_distance_key"