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

Move getting arrow width to widgets factory

Browse source
This commit is contained in:
PavelRatushny 2017-11-08 15:58:50 +02:00
parent 1cdd5f5346
commit 0e76730e88
2 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
OsmAnd-java/src/net/osmand/router/TurnType.java
View file

@ -413,41 +413,6 @@ public class TurnType {
}
}
public static int getArrowWidthInDp(int tt) {
int result;
switch (tt){
case TurnType.C:
result = 12;
break;
case TurnType.TR:
case TurnType.TL:
result = 20;
break;
case TurnType.KR:
case TurnType.KL:
result = 13;
break;
case TurnType.TSLR:
case TurnType.TSLL:
result = 13;
break;
case TurnType.TSHR:
case TurnType.TSHL:
result = 19;
break;
case TurnType.TRU:
case TurnType.TU:
result = 24;
break;
default:
result = 12;
break;
}
return result;
}
public static int convertType(String lane) {
int turn;
if (lane.equals("none") || lane.equals("through")) {

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

@ -915,7 +915,7 @@ public class RouteInfoWidgetsFactory {
secondTurnType, thirdTurnType, TurnPathHelper.FIRST_TURN, coef, leftSide);
if (b != null) {
if (secondTurnType == 0 && thirdTurnType == 0) {
int arrowWidth = AndroidUtils.dpToPx(ctx, TurnType.getArrowWidthInDp(turnType));
int arrowWidth = AndroidUtils.dpToPx(ctx, getArrowWidthInDp(turnType));
int emptyWidth = b.getWidth() - arrowWidth;
w += emptyWidth / 2 + arrowWidth;
} else {
@ -1022,12 +1022,47 @@ public class RouteInfoWidgetsFactory {
}
private Bitmap applyCrop(Bitmap bitmap, int turnType) {
int arrowWidth = AndroidUtils.dpToPx(ctx, TurnType.getArrowWidthInDp(turnType));
int arrowWidth = AndroidUtils.dpToPx(ctx, getArrowWidthInDp(turnType));
int emptyWidth = bitmap.getWidth() - arrowWidth;
int widthToCrop = emptyWidth / 4;
return Bitmap.createBitmap(bitmap, widthToCrop, 0, bitmap.getWidth() - 2 * widthToCrop, bitmap.getHeight());
}
private int getArrowWidthInDp(int tt) {
int result;
switch (tt){
case TurnType.C:
result = 12;
break;
case TurnType.TR:
case TurnType.TL:
result = 20;
break;
case TurnType.KR:
case TurnType.KL:
result = 13;
break;
case TurnType.TSLR:
case TurnType.TSLL:
result = 13;
break;
case TurnType.TSHR:
case TurnType.TSHL:
result = 19;
break;
case TurnType.TRU:
case TurnType.TU:
result = 24;
break;
default:
result = 12;
break;
}
return result;
}
//@Override
public void drawOld(Canvas canvas) {
float w = 72 * scaleCoefficient / miniCoeff;