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

Do not add round brackets

Browse source
This commit is contained in:
Alexander Sytnyk 2017-11-21 17:37:03 +02:00
parent 8b523ea9c2
commit 8b14f2e4ea
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -444,7 +444,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
return ctx.getString(R.string.recording_photo_description, "", time).trim(); return ctx.getString(R.string.recording_photo_description, "", time).trim();
} }
updateInternalDescription(); updateInternalDescription();
return ctx.getString(R.string.recording_description, "", getDuration(ctx), time) return ctx.getString(R.string.recording_description, "", getDuration(ctx, true), time)
.trim(); .trim();
} }
@ -454,7 +454,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
return time; return time;
} }
updateInternalDescription(); updateInternalDescription();
return time + " " + getDuration(ctx); return time + " " + getDuration(ctx, true);
} }
@ -478,7 +478,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
return date + " • " + sz; return date + " • " + sz;
} }
updateInternalDescription(); updateInternalDescription();
return date + " • " + sz + " • " + getDuration(ctx); return date + " • " + sz + " • " + getDuration(ctx, false);
} }
public String getPlainDuration(boolean accessibilityEnabled) { public String getPlainDuration(boolean accessibilityEnabled) {
@ -491,16 +491,18 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
} }
} }
private String getDuration(Context ctx) { private String getDuration(Context ctx, boolean addRoundBrackets) {
String additional = ""; StringBuilder additional = new StringBuilder("");
if (duration > 0) { if (duration > 0) {
int d = (int) (duration / 1000); int d = (int) (duration / 1000);
additional += "(" + Algorithms.formatDuration(d, ((OsmandApplication)ctx.getApplicationContext()).accessibilityEnabled()) + ")"; additional.append(addRoundBrackets ? "(" : "");
additional.append(Algorithms.formatDuration(d, ((OsmandApplication) ctx.getApplicationContext()).accessibilityEnabled()));
additional.append(addRoundBrackets ? ")" : "");
} }
if (!available) { if (!available) {
additional += "[" + ctx.getString(R.string.recording_unavailable) + "]"; additional.append("[").append(ctx.getString(R.string.recording_unavailable)).append("]");
} }
return additional; return additional.toString();
} }
} }