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

remove "towards" in top bar

Browse source
This commit is contained in:
sonora 2016-08-09 20:53:34 +02:00
parent 6748fa92c4
commit 91620a98ca
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -427,7 +427,7 @@ public class MapInfoWidgetsFactory {
showNextTurn = true;
RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
type[0] = next.getTurnType();
text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName(), map.getMyApplication().getString(R.string.towards));
text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName(), ">");
// if (next.distance > 0) {
// text += " " + OsmAndFormatter.getFormattedDistance(next.distance, map.getMyApplication());
// }
@ -442,10 +442,12 @@ public class MapInfoWidgetsFactory {
RouteDataObject rt = locationProvider.getLastKnownRouteSegment();
if (rt != null) {
text = RoutingHelper.formatStreetName(rt.getName(settings.MAP_PREFERRED_LOCALE.get()),
rt.getRef(), rt.getDestinationName(settings.MAP_PREFERRED_LOCALE.get()), map.getMyApplication().getString(R.string.towards));
rt.getRef(), rt.getDestinationName(settings.MAP_PREFERRED_LOCALE.get()), ">");
}
if (text == null) {
text = "";
} else {
text = "+ " + text;
}
}
if (map.isTopToolbarActive()) {
@ -478,7 +480,7 @@ public class MapInfoWidgetsFactory {
addressText.setCompoundDrawables(null, null, null, null);
}
}
if (!text.equals(addressText.getText().toString()) ) {
if (!text.equals(addressText.getText().toString()) && !text.equals("+ " + addressText.getText().toString())) {
if (!text.equals("")) {
topBar.setContentDescription(text);
} else {