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

fix list icon assignment for traffic warnings

Browse source
This commit is contained in:
sonora 2014-12-20 16:27:56 +01:00
parent 71940b5743
commit 4060c772f7
9 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/list_warnings_pedestrian.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-hdpi/list_warnings_railways.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
OsmAnd/res/drawable-large/list_warnings_pedestrian.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
OsmAnd/res/drawable-large/list_warnings_pedestrian_us.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-large/list_warnings_railways.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
OsmAnd/res/drawable-large/list_warnings_railways_us.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

38
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -675,9 +675,22 @@ public class WaypointHelper {
//return FavoriteImageDrawable.getOrCreate(uiCtx, point.getColor());
return 0;
} else if(type == ALARMS) {
//TODO: Looks like this does not work yet, not sure why:
if(RenderingIcons.containsBigIcon("list_" + ((AlarmInfo) point).getType().toString().toLowerCase())) {
return RenderingIcons.getBigIconResourceId("list_" + ((AlarmInfo) point).getType().toString().toLowerCase());
//assign alarm list icons manually for now
//attention, some list icons are only temporary test icons, not pixel perfect yet.
if(((AlarmInfo) point).getType().toString()="SPEED_CAMERA") {
return uiCtx.getResources().getDrawable(R.drawable.mx_highway_speed_camera);
} else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") {
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control);
} else if(((AlarmInfo) point).getType().toString()="RAILWAY") {
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways);
} else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") {
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming);
} else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") {
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth);
} else if(((AlarmInfo) point).getType().toString()="STOP") {
return uiCtx.getResources().getDrawable(R.drawable.list_stop);
} else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") {
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian);
} else {
return 0;
}
@ -706,9 +719,22 @@ public class WaypointHelper {
} else if(type == FAVORITES || type == WAYPOINTS) {
return FavoriteImageDrawable.getOrCreate(uiCtx, point.getColor());
} else if(type == ALARMS) {
//TODO: Looks like this does not work yet, not sure why:
if(RenderingIcons.containsBigIcon("list_" + ((AlarmInfo) point).getType().toString().toLowerCase())) {
return uiCtx.getResources().getDrawable(RenderingIcons.getBigIconResourceId("list_" + ((AlarmInfo) point).getType().toString().toLowerCase()));
//assign alarm list icons manually for now
//attention, some list icons are only temporary test icons, not pixel perfect yet.
if(((AlarmInfo) point).getType().toString()="SPEED_CAMERA") {
return uiCtx.getResources().getDrawable(R.drawable.mx_highway_speed_camera);
} else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") {
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control);
} else if(((AlarmInfo) point).getType().toString()="RAILWAY") {
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways);
} else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") {
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming);
} else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") {
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth);
} else if(((AlarmInfo) point).getType().toString()="STOP") {
return uiCtx.getResources().getDrawable(R.drawable.list_stop);
} else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") {
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian);
} else {
return null;
}