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

Improved and simplified lap time/speed announcement message.

Browse Source
This commit is contained in:
Román
2020-09-13 19:30:17 +02:00
parent 060c4f1529
commit 906b9413d1
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class AnnouncementUtilsTest {
double kmPerHour = lastInterval.getSpeed_ms() * UnitConversions.MPS_TO_KMH;
String firstPartMsg = "OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour";
String rateMsg = " With a current kilometer speed of " + context.getResources().getQuantityString(speedId, getQuantityCount(kmPerHour), kmPerHour);
String rateMsg = " Lap speed of " + context.getResources().getQuantityString(speedId, getQuantityCount(kmPerHour), kmPerHour);
String msg = firstPartMsg + rateMsg;
// when
src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java
+2 -2
View File
@@ -37,7 +37,7 @@ public class AnnouncementUtils {
rate = context.getResources().getQuantityString(speedId, getQuantityCount(distancePerTime), distancePerTime);
currentRate = context.getResources().getQuantityString(speedId, getQuantityCount(currentDistancePerTime), currentDistancePerTime);
currentRateMsg = metricUnits ? context.getString(R.string.voice_speed_current_kilometer, currentRate) : context.getString(R.string.voice_speed_current_mile, currentRate);
currentRateMsg = context.getString(R.string.voice_speed_lap, currentRate);
} else {
double timePerDistance = distancePerTime == 0 ? 0.0 : 1 / distancePerTime;
int paceId = metricUnits ? R.string.voice_pace_per_kilometer : R.string.voice_pace_per_mile;
@@ -47,7 +47,7 @@ public class AnnouncementUtils {
double currentTimePerDistance = currentDistancePerTime == 0 ? 0.0 : 1 / currentDistancePerTime;
long currentTime = Math.round(currentTimePerDistance * UnitConversions.HR_TO_MIN * UnitConversions.MIN_TO_S * UnitConversions.S_TO_MS);
currentRate = context.getString(paceId, getAnnounceTime(context, currentTime));
currentRateMsg = metricUnits ? context.getString(R.string.voice_pace_current_kilometer, currentRate) : context.getString(R.string.voice_pace_current_mile, currentRate);
currentRateMsg = context.getString(R.string.voice_pace_lap, currentRate);
}
int totalDistanceId = metricUnits ? R.plurals.voiceTotalDistanceKilometers : R.plurals.voiceTotalDistanceMiles;
src/main/res/values-es/strings.xml
+2 -4
View File
@@ -497,10 +497,8 @@ g) haz lo que creas que ayude a OpenTracks.</string>
<string name="voice_speed_miles_per_hour_two">2 millas por hora</string>
<string name="voice_speed_miles_per_hour_zero">0 millas por hora</string>
<string name="voice_template">OpenTracks de %1$s en %2$s a %3$s</string>
<string name="voice_speed_current_kilometer">Con una velocidad del kilómetro actual de %1$s</string>
<string name="voice_speed_current_mile">Con una velocidad de la milla actual de %1$s</string>
<string name="voice_pace_current_kilometer">Con un ritmo del kilómetro actual de %1$s</string>
<string name="voice_pace_current_mile">Con un ritmo de la milla actual de %1$s</string>
<string name="voice_speed_lap">Velocidad de vuelta de %1$s</string>
<string name="voice_pace_lap">Tiempo de vuelta de %1$s</string>
<string name="voice_total_distance_kilometers_few">distancia total de %1$.2f kilómetros</string>
<string name="voice_total_distance_kilometers_many">distancia total de %1$.2f kilómetros</string>
<string name="voice_total_distance_kilometers_one">distancia total de 1 kilómetro</string>
src/main/res/values/strings.xml
+2 -4
View File
@@ -521,10 +521,8 @@ limitations under the License.
<string name="voice_speed_miles_per_hour_two">2 miles per hour</string>
<string name="voice_speed_miles_per_hour_zero">0 miles per hour</string>
<string name="voice_template">OpenTracks %1$s in %2$s at %3$s</string>
<string name="voice_speed_current_kilometer">With a current kilometer speed of %1$s</string>
<string name="voice_speed_current_mile">With a current mile speed of %1$s</string>
<string name="voice_pace_current_kilometer">With a current kilometer pace of %1$s</string>
<string name="voice_pace_current_mile">With a current mile pace of %1$s</string>
<string name="voice_speed_lap">Lap speed of %1$s</string>
<string name="voice_pace_lap">Lap time of %1$s</string>
<string name="voice_total_distance_kilometers_few">total distance %1$.2f kilometers</string>
<string name="voice_total_distance_kilometers_many">total distance %1$.2f kilometers</string>
<string name="voice_total_distance_kilometers_one">total distance 1 kilometer</string>