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

Fix NPE

Browse source
This commit is contained in:
cepprice 2021-04-07 13:12:37 +05:00
parent 077f57c830
commit 482acc95f1
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
OsmAnd/src/net/osmand/plus/views/layers/geometry/MultiProfileGeometryWayContext.java
View file

@ -31,7 +31,7 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext {
private RenderingLineAttributes multiProfileAttrs; private RenderingLineAttributes multiProfileAttrs;
private Bitmap pointIcon; private final Bitmap pointIcon;
private final Map<String, Bitmap> profileIconsBitmapCache; private final Map<String, Bitmap> profileIconsBitmapCache;
public MultiProfileGeometryWayContext(Context ctx, UiUtilities iconsCache, float density) { public MultiProfileGeometryWayContext(Context ctx, UiUtilities iconsCache, float density) {
@ -41,6 +41,7 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext {
minIconMargin = density * 30; minIconMargin = density * 30;
circleSize = density * 70; circleSize = density * 70;
pointIconSize = density * 22f; pointIconSize = density * 22f;
pointIcon = createPointIcon();
} }
public void updatePaints(boolean nightMode, @NonNull RenderingLineAttributes multiProfileAttrs) { public void updatePaints(boolean nightMode, @NonNull RenderingLineAttributes multiProfileAttrs) {
@ -48,29 +49,6 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext {
super.updatePaints(nightMode, multiProfileAttrs); super.updatePaints(nightMode, multiProfileAttrs);
} }
@Override
protected void recreateBitmaps() {
float density = getDensity();
float outerRadius = density * 11f;
float centerRadius = density * 10.5f;
float innerRadius = density * 6.5f;
float centerXY = pointIconSize / 2;
pointIcon = Bitmap.createBitmap((int) pointIconSize, (int) pointIconSize, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(pointIcon);
Paint paint = new Paint();
paint.setStyle(Paint.Style.FILL);
paint.setColor(Color.BLACK);
canvas.drawCircle(centerXY, centerXY, outerRadius, paint);
paint.setColor(Color.WHITE);
canvas.drawCircle(centerXY, centerXY, centerRadius, paint);
paint.setColor(Algorithms.parseColor(pointColorHex));
canvas.drawCircle(centerXY, centerXY, innerRadius, paint);
}
@NonNull @NonNull
public Bitmap getProfileIconBitmap(@DrawableRes int iconRes, @ColorInt int color) { public Bitmap getProfileIconBitmap(@DrawableRes int iconRes, @ColorInt int color) {
String key = iconRes + "_" + color; String key = iconRes + "_" + color;
@ -94,6 +72,30 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext {
return bitmap; return bitmap;
} }
private Bitmap createPointIcon() {
float density = getDensity();
float outerRadius = density * 11f;
float centerRadius = density * 10.5f;
float innerRadius = density * 6.5f;
float centerXY = pointIconSize / 2;
Bitmap bitmap = Bitmap.createBitmap((int) pointIconSize, (int) pointIconSize, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
Paint paint = new Paint();
paint.setStyle(Paint.Style.FILL);
paint.setColor(Color.BLACK);
canvas.drawCircle(centerXY, centerXY, outerRadius, paint);
paint.setColor(Color.WHITE);
canvas.drawCircle(centerXY, centerXY, centerRadius, paint);
paint.setColor(Algorithms.parseColor(pointColorHex));
canvas.drawCircle(centerXY, centerXY, innerRadius, paint);
return bitmap;
}
@NonNull @NonNull
public Bitmap getPointIcon() { public Bitmap getPointIcon() {
return pointIcon; return pointIcon;