Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Show paused state more clearly on track recording notification

Browse source 
Previously, the track recording notification displayed "Pause" when
recording was paused. This was confusing because when recording, the
notification also shows "Pause" to allow recording to be paused.

With this change, "Paused" (rather than "Pause") is shown in the
notification when recording is paused.
This commit is contained in:
njohnston 2017-03-21 20:25:38 +00:00
parent e43b732a33
commit f35a51f141
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -129,6 +129,7 @@
<string name="shared_string_notifications">Notifications</string> <string name="shared_string_notifications">Notifications</string>
<string name="shared_string_continue">Continue</string> <string name="shared_string_continue">Continue</string>
<string name="shared_string_pause">Pause</string> <string name="shared_string_pause">Pause</string>
<string name="shared_string_paused">Paused</string>
<string name="shared_string_trip">Trip</string> <string name="shared_string_trip">Trip</string>
<string name="shared_string_recorded">Recorded</string> <string name="shared_string_recorded">Recorded</string>
<string name="shared_string_record">Record</string> <string name="shared_string_record">Record</string>

12
OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java
View file

@ -108,20 +108,20 @@ public class GpxNotification extends OsmandNotification {
color = 0; color = 0;
icon = R.drawable.ic_action_polygom_dark; icon = R.drawable.ic_action_polygom_dark;
boolean isGpxRecording = app.getSavingTrackHelper().getIsRecording(); boolean isGpxRecording = app.getSavingTrackHelper().getIsRecording();
float recordedDistane = app.getSavingTrackHelper().getDistance(); float recordedDistance = app.getSavingTrackHelper().getDistance();
ongoing = true; ongoing = true;
if (isGpxRecording) { if (isGpxRecording) {
color = app.getResources().getColor(R.color.osmand_orange); color = app.getResources().getColor(R.color.osmand_orange);
notificationTitle = app.getString(R.string.shared_string_trip) + " • " notificationTitle = app.getString(R.string.shared_string_trip) + " • "
+ Algorithms.formatDuration((int) (app.getSavingTrackHelper().getDuration() / 1000), true); + Algorithms.formatDuration((int) (app.getSavingTrackHelper().getDuration() / 1000), true);
notificationText = app.getString(R.string.shared_string_recorded) notificationText = app.getString(R.string.shared_string_recorded)
+ ": " + OsmAndFormatter.getFormattedDistance(recordedDistane, app); + ": " + OsmAndFormatter.getFormattedDistance(recordedDistance, app);
} else { } else {
if (recordedDistane > 0) { if (recordedDistance > 0) {
notificationTitle = app.getString(R.string.shared_string_pause) + " • " notificationTitle = app.getString(R.string.shared_string_paused) + " • "
+ Algorithms.formatDuration((int) (app.getSavingTrackHelper().getDuration() / 1000), true); + Algorithms.formatDuration((int) (app.getSavingTrackHelper().getDuration() / 1000), true);
notificationText = app.getString(R.string.shared_string_recorded) notificationText = app.getString(R.string.shared_string_recorded)
+ ": " + OsmAndFormatter.getFormattedDistance(recordedDistane, app); + ": " + OsmAndFormatter.getFormattedDistance(recordedDistance, app);
} else { } else {
ongoing = false; ongoing = false;
notificationTitle = app.getString(R.string.shared_string_trip_recording); notificationTitle = app.getString(R.string.shared_string_trip_recording);
@ -157,7 +157,7 @@ public class GpxNotification extends OsmandNotification {
Intent startIntent = new Intent(OSMAND_START_GPX_SERVICE_ACTION); Intent startIntent = new Intent(OSMAND_START_GPX_SERVICE_ACTION);
PendingIntent startPendingIntent = PendingIntent.getBroadcast(app, 0, startIntent, PendingIntent startPendingIntent = PendingIntent.getBroadcast(app, 0, startIntent,
PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
if (recordedDistane > 0) { if (recordedDistance > 0) {
notificationBuilder.addAction(R.drawable.ic_action_rec_start, notificationBuilder.addAction(R.drawable.ic_action_rec_start,
app.getString(R.string.shared_string_continue), startPendingIntent); app.getString(R.string.shared_string_continue), startPendingIntent);
notificationBuilder.addAction(R.drawable.ic_action_save, app.getString(R.string.shared_string_save), notificationBuilder.addAction(R.drawable.ic_action_save, app.getString(R.string.shared_string_save),