Preferred rate settings adapted to new code changes.

This commit is contained in:
Román
2020-04-27 12:44:03 +02:00
parent 83b5ebb02c
commit 65bda35001
4 changed files with 13 additions and 4 deletions
@@ -199,6 +199,11 @@ public class ChartFragment extends Fragment implements TrackDataListener {
} }
category = track.getCategory(); category = track.getCategory();
boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
if (reportSpeed != chartView.getReportSpeed()) {
chartView.setReportSpeed(reportSpeed);
chartView.applyReportSpeed();
}
startTime = track.getTrackStatistics().getStartTime_ms(); startTime = track.getTrackStatistics().getStartTime_ms();
} }
} }
@@ -643,7 +643,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
private void setSpeed(double speed) { private void setSpeed(double speed) {
boolean metricUnits = PreferencesUtils.isMetricUnits(getContext()); boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext()); boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
speedLabel.setText(reportSpeed ? R.string.stats_speed : R.string.stats_pace); speedLabel.setText(reportSpeed ? R.string.stats_speed : R.string.stats_pace);
@@ -26,10 +26,12 @@ import android.util.Log;
import java.util.Locale; import java.util.Locale;
import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.data.Track;
import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingService;
import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.stats.TrackStatistics;
import de.dennisguse.opentracks.util.AnnouncementUtils; import de.dennisguse.opentracks.util.AnnouncementUtils;
import de.dennisguse.opentracks.util.PreferencesUtils;
/** /**
* This class will periodically announce the user's {@link TrackStatistics}. * This class will periodically announce the user's {@link TrackStatistics}.
@@ -162,7 +164,9 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
Log.i(TAG, "Speech is not allowed at this time."); Log.i(TAG, "Speech is not allowed at this time.");
return; return;
} }
String announcement = AnnouncementUtils.getAnnouncement(context, trackStatistics); Track track = contentProviderUtils.getTrack(PreferencesUtils.getRecordingTrackId(context));
String category = track != null ? track.getCategory() : "";
String announcement = AnnouncementUtils.getAnnouncement(context, trackStatistics, category);
speakAnnouncement(announcement); speakAnnouncement(announcement);
} }
@@ -9,9 +9,9 @@ public class AnnouncementUtils {
private AnnouncementUtils() {} private AnnouncementUtils() {}
public static String getAnnouncement(Context context, TrackStatistics trackStatistics) { public static String getAnnouncement(Context context, TrackStatistics trackStatistics, String category) {
boolean metricUnits = PreferencesUtils.isMetricUnits(context); boolean metricUnits = PreferencesUtils.isMetricUnits(context);
boolean reportSpeed = PreferencesUtils.isReportSpeed(context); boolean reportSpeed = PreferencesUtils.isReportSpeed(context, category);
double distance = trackStatistics.getTotalDistance() * UnitConversions.M_TO_KM; double distance = trackStatistics.getTotalDistance() * UnitConversions.M_TO_KM;
double distancePerTime = trackStatistics.getAverageMovingSpeed() * UnitConversions.MS_TO_KMH; double distancePerTime = trackStatistics.getAverageMovingSpeed() * UnitConversions.MS_TO_KMH;