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

changed name of nameDrawable to resName

Browse source
This commit is contained in:
Chumva 2018-02-23 17:18:21 +02:00
parent 485ff1077e
commit a7b391a5c8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/transport/TransportStopType.java
View file

@ -18,13 +18,13 @@ public enum TransportStopType {
final int resId; final int resId;
final int topResId; final int topResId;
final String renderAttr; final String renderAttr;
final String nameDrawable; final String resName;
TransportStopType(int resId, int topResId, String renderAttr, String nameDrawable) { TransportStopType(int resId, int topResId, String renderAttr, String resName) {
this.resId = resId; this.resId = resId;
this.topResId = topResId; this.topResId = topResId;
this.renderAttr = renderAttr; this.renderAttr = renderAttr;
this.nameDrawable = nameDrawable; this.resName = resName;
} }
public int getResourceId() { public int getResourceId() {
@ -35,8 +35,8 @@ public enum TransportStopType {
return topResId; return topResId;
} }
public String getNameDrawable() { public String getResName() {
return nameDrawable; return resName;
} }
public String getRendeAttr() { public String getRendeAttr() {

2
OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
View file

@ -247,7 +247,7 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
if (stopRoute != null) { if (stopRoute != null) {
TransportStopType type = TransportStopType.findType(stopRoute.route.getType()); TransportStopType type = TransportStopType.findType(stopRoute.route.getType());
if (type != null) { if (type != null) {
Bitmap foregroundIcon = RenderingIcons.getIcon(mapActivity, type.getNameDrawable(), false); Bitmap foregroundIcon = RenderingIcons.getIcon(mapActivity, type.getResName(), false);
canvas.drawBitmap(backgroundIcon, x - backgroundIconHalfWidth, y - backgroundIconHalfHeight, paintIcon); canvas.drawBitmap(backgroundIcon, x - backgroundIconHalfWidth, y - backgroundIconHalfHeight, paintIcon);
canvas.drawBitmap(foregroundIcon, x - foregroundIcon.getWidth() / 2, y - foregroundIcon.getHeight() / 2, paintWhiteIcon); canvas.drawBitmap(foregroundIcon, x - foregroundIcon.getWidth() / 2, y - foregroundIcon.getHeight() / 2, paintWhiteIcon);
} }