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

Add us specific sign

Browse source
This commit is contained in:
Victor Shcherb 2013-08-05 01:01:01 +02:00
parent be3d150b48
commit 4e30966dac
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

11
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -10,6 +10,7 @@ import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.DrivingRegion;
import net.osmand.plus.OsmandSettings.OsmandPreference; import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper;
@ -648,16 +649,16 @@ public class RouteInfoWidgetsFactory {
String text = null; String text = null;
if(alarm.getType() == AlarmInfo.SPEED_LIMIT) { if(alarm.getType() == AlarmInfo.SPEED_LIMIT) {
text = alarm.getIntValue() +""; text = alarm.getIntValue() +"";
if(settings.DRIVING_REGION.get() == DrivingRegion.US_CANADA){
locimgId = R.drawable.warnings_speed_limit_us;
}
} else if(alarm.getType() == AlarmInfo.SPEED_CAMERA) { } else if(alarm.getType() == AlarmInfo.SPEED_CAMERA) {
text = "CAM";
locimgId = R.drawable.warnings_speed_camera; locimgId = R.drawable.warnings_speed_camera;
} else if(alarm.getType() == AlarmInfo.BORDER_CONTROL) { } else if(alarm.getType() == AlarmInfo.BORDER_CONTROL) {
text = "CLO"; text = "CLO";
} else if(alarm.getType() == AlarmInfo.TOLL_BOOTH) { } else if(alarm.getType() == AlarmInfo.TOLL_BOOTH) {
text = "$"; text = "$";
} else if(alarm.getType() == AlarmInfo.TRAFFIC_CALMING) { } else if(alarm.getType() == AlarmInfo.TRAFFIC_CALMING) {
// temporary omega
text = "~^~";
locimgId = R.drawable.warnings_speed_bump; locimgId = R.drawable.warnings_speed_bump;
} else if(alarm.getType() == AlarmInfo.STOP) { } else if(alarm.getType() == AlarmInfo.STOP) {
// text = "STOP"; // text = "STOP";
@ -697,10 +698,12 @@ public class RouteInfoWidgetsFactory {
RectF f = new RectF(th / 2, th / 2, getWidth() - th / 2, getHeight() - th / 2); RectF f = new RectF(th / 2, th / 2, getWidth() - th / 2, getHeight() - th / 2);
canvas.drawOval(f, content); canvas.drawOval(f, content);
canvas.drawOval(f, paintCircle); canvas.drawOval(f, paintCircle);
canvas.drawText(text, getWidth() / 2, getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient, ptext);
} else { } else {
canvas.drawBitmap(img, 0, 0, paintCircle); canvas.drawBitmap(img, 0, 0, paintCircle);
} }
if(text.length() > 0) {
canvas.drawText(text, getWidth() / 2, getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient, ptext);
}
} }
}; };