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

small refactoring

Browse source
This commit is contained in:
nazar-kutz 2021-04-06 10:53:54 +03:00
parent 294040aaf9
commit 8d9ae28ddf
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayStyle.java
View file

@ -8,7 +8,6 @@ public abstract class GeometryWayStyle<T extends GeometryWayContext> {
private T context; private T context;
protected Integer color; protected Integer color;
protected Float width; protected Float width;
protected Integer pointColor;
public GeometryWayStyle(T context) { public GeometryWayStyle(T context) {
this.context = context; this.context = context;
@ -19,11 +18,10 @@ public abstract class GeometryWayStyle<T extends GeometryWayContext> {
this.color = color; this.color = color;
} }
public GeometryWayStyle(T context, Integer color, Float width, Integer pointColor) { public GeometryWayStyle(T context, Integer color, Float width) {
this.context = context; this.context = context;
this.color = color; this.color = color;
this.width = width; this.width = width;
this.pointColor = pointColor;
} }
public T getContext() { public T getContext() {
@ -47,7 +45,7 @@ public abstract class GeometryWayStyle<T extends GeometryWayContext> {
} }
public Integer getPointColor() { public Integer getPointColor() {
return pointColor; return null;
} }
public boolean isNightMode() { public boolean isNightMode() {

10
OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java
View file

@ -68,9 +68,12 @@ public class RouteGeometryWay extends GeometryWay<RouteGeometryWayContext, Geome
private static class GeometrySolidWayStyle extends GeometryWayStyle<RouteGeometryWayContext> { private static class GeometrySolidWayStyle extends GeometryWayStyle<RouteGeometryWayContext> {
private Integer pointColor;
GeometrySolidWayStyle(RouteGeometryWayContext context, Integer color, Float width, GeometrySolidWayStyle(RouteGeometryWayContext context, Integer color, Float width,
Integer pointColor) { Integer pointColor) {
super(context, color, width, pointColor); super(context, color, width);
this.pointColor = pointColor;
} }
@Override @Override
@ -78,6 +81,11 @@ public class RouteGeometryWay extends GeometryWay<RouteGeometryWayContext, Geome
return getContext().getArrowBitmap(); return getContext().getArrowBitmap();
} }
@Override
public Integer getPointColor() {
return pointColor;
}
@Override @Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (this == other) { if (this == other) {