From 0527e4ab141418e1961fa47dd021f3946385b762 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 29 Sep 2021 22:21:58 +0200
Subject: [PATCH] Cleanup: move AnnouncementUtils to VoiceAnnouncement.

Part of #963
---
 .../{util => services/tasks}/AnnouncementUtilsTest.java    | 7 +++++--
 .../{util => services/tasks}/AnnouncementUtils.java        | 6 +++---
 .../opentracks/services/tasks/VoiceAnnouncement.java       | 1 -
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename src/androidTest/java/de/dennisguse/opentracks/{util => services/tasks}/AnnouncementUtilsTest.java (98%)
 rename src/main/java/de/dennisguse/opentracks/{util => services/tasks}/AnnouncementUtils.java (93%)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtilsTest.java
similarity index 98%
rename from src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtilsTest.java
index 17a6dd8f7..b490cc83d 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtilsTest.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.content.Context;
 import android.util.Pair;
@@ -6,6 +6,7 @@ import android.util.Pair;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,7 +19,9 @@ import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+import de.dennisguse.opentracks.services.tasks.AnnouncementUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
 
 import static org.junit.Assert.assertEquals;
@@ -68,7 +71,7 @@ public class AnnouncementUtilsTest {
         String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, true, lastInterval);
 
         // then
-        assertEquals(
+        Assert.assertEquals(
                 "total distance " +
                         StringUtils.getDistanceParts(context, stats.getTotalDistance(), true).first +
                         " kilometers in " + buildAndGetTimeText(stats.getTotalTime(), false) + " at " +
diff --git a/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtils.java
similarity index 93%
rename from src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtils.java
index 7b107658a..14204418d 100644
--- a/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtils.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.content.Context;
 
@@ -12,12 +12,12 @@ import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
 
-public class AnnouncementUtils {
+class AnnouncementUtils {
 
     private AnnouncementUtils() {
     }
 
-    public static String getAnnouncement(Context context, TrackStatistics trackStatistics, boolean isMetricUnits, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval) {
+    static String getAnnouncement(Context context, TrackStatistics trackStatistics, boolean isMetricUnits, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval) {
         Distance distance = trackStatistics.getTotalDistance();
         Speed distancePerTime = trackStatistics.getAverageMovingSpeed();
         Speed currentDistancePerTime = currentInterval != null ? currentInterval.getSpeed() : null;
diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncement.java
index 4bb052a57..2a655b194 100644
--- a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncement.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncement.java
@@ -34,7 +34,6 @@ import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.content.provider.TrackPointIterator;
 import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.util.AnnouncementUtils;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.viewmodels.IntervalStatistics;