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

partial backout due to some errors

Browse source
This commit is contained in:
sonora 2012-02-16 15:47:22 +01:00
parent e232ff3fc4
commit 9cfb775d9d
8 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -844,7 +844,9 @@ public class SearchPOIActivity extends OsmandListActivity implements SensorEvent
public DirectionDrawable(){
paintRouteDirection = new Paint();
paintRouteDirection.setStyle(Style.FILL_AND_STROKE);
paintRouteDirection.setColor(getResources().getColor(R.color.poi_direction));
// colors.xml-Issue
//paintRouteDirection.setColor(getResources().getColor(R.color.poi_direction));
paintRouteDirection.setColor(Color.rgb(100, 0, 255)));
paintRouteDirection.setAntiAlias(true);
int h = 15;
@ -865,11 +867,17 @@ public class SearchPOIActivity extends OsmandListActivity implements SensorEvent
public void setOpenedColor(int opened){
if(opened == 0){
paintRouteDirection.setColor(getResources().getColor(R.color.poi_open));
// colors.xml-Issue
//paintRouteDirection.setColor(getResources().getColor(R.color.poi_open));
paintRouteDirection.setColor(Color.rgb(50, 205, 50));
} else if(opened == -1){
paintRouteDirection.setColor(getResources().getColor(R.color.poi_unknown_arrow));
// colors.xml-Issue
//paintRouteDirection.setColor(getResources().getColor(R.color.poi_unknown_arrow));
paintRouteDirection.setColor(Color.rgb(200, 200, 200)));
} else {
paintRouteDirection.setColor(getResources().getColor(R.color.poi_closed));
// colors.xml-Issue
//paintRouteDirection.setColor(getResources().getColor(R.color.poi_closed));
paintRouteDirection.setColor(Color.rgb(238, 50, 50)));
}
}

4
OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java
View file

@ -100,11 +100,11 @@ public class OsmBugsLayer extends OsmandMapLayer implements ContextMenuLayer.ICo
}
pointOpenedUI = new Paint();
pointOpenedUI.setColor(getResources().getColor(R.color.osmbug_opened));
pointOpenedUI.setColor(activity.getResources().getColor(R.color.osmbug_opened));
pointOpenedUI.setAlpha(200);
pointOpenedUI.setAntiAlias(true);
pointClosedUI = new Paint();
pointClosedUI.setColor(getResources().getColor(R.color.osmbug_closed));
pointClosedUI.setColor(activity.getResources().getColor(R.color.osmbug_closed));
pointClosedUI.setAlpha(200);
pointClosedUI.setAntiAlias(true);
}

2
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -135,7 +135,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
wmgr.getDefaultDisplay().getMetrics(dm);
pointAltUI = new Paint();
pointAltUI.setColor(getResources().getColor(R.color.poi_background));
pointAltUI.setColor(view.getApplication().getResources().getColor(R.color.poi_background));
pointAltUI.setAlpha(160);
pointAltUI.setStyle(Style.FILL);

6
OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
View file

@ -42,17 +42,17 @@ public class PointLocationLayer extends OsmandMapLayer {
locationPaint.setDither(true);
area = new Paint();
area.setColor(getResources().getColor(R.color.pos_area));
area.setColor(view.getResources().getColor(R.color.pos_area));
area.setAlpha(40);
aroundArea = new Paint();
aroundArea.setColor(getResources().getColor(R.color.pos_around));
aroundArea.setColor(view.getResources().getColor(R.color.pos_around));
aroundArea.setStyle(Style.STROKE);
aroundArea.setStrokeWidth(1);
aroundArea.setAntiAlias(true);
headingPaint = new Paint();
headingPaint.setColor(getResources().getColor(R.color.pos_heading));
headingPaint.setColor(view.getResources().getColor(R.color.pos_heading));
headingPaint.setAlpha(50);
headingPaint.setAntiAlias(true);
headingPaint.setStyle(Style.FILL);

2
OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
View file

@ -35,7 +35,7 @@ public class PointNavigationLayer extends OsmandMapLayer {
private void initUI() {
point = new Paint();
point.setColor(getResources().getColor(R.color.nav_point));
point.setColor(view.getResources().getColor(R.color.nav_point));
point.setAntiAlias(true);
point.setStyle(Style.FILL);

8
OsmAnd/src/net/osmand/plus/views/TransportInfoLayer.java
View file

@ -40,11 +40,15 @@ public class TransportInfoLayer extends OsmandMapLayer {
wmgr.getDefaultDisplay().getMetrics(dm);
paintInt = new Paint();
paintInt.setColor(getResources().getColor(R.color.transport_int));
// colors.xml-Issue
//paintInt.setColor(getResources().getColor(R.color.transport_int));
paintInt.setColor(Color.rgb(50, 200, 50));
paintInt.setAlpha(150);
paintInt.setAntiAlias(true);
paintEnd = new Paint();
paintEnd.setColor(getResources().getColor(R.color.transport_end));
// colors.xml-Issue
//paintEnd.setColor(getResources().getColor(R.color.transport_end));
paintEnd.setColor(Color.rgb(255, 0, 0));
paintEnd.setAlpha(150);
paintEnd.setAntiAlias(true);
}

4
OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
View file

@ -36,7 +36,9 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
wmgr.getDefaultDisplay().getMetrics(dm);
pointAltUI = new Paint();
pointAltUI.setColor(getResources().getColor(R.color.transport_stop));
// colors.xml-Issue
//pointAltUI.setColor(getResources().getColor(R.color.transport_stop));
pointAltUI.setColor(Color.rgb(0, 0, 255));
pointAltUI.setAlpha(150);
pointAltUI.setAntiAlias(true);
}

4
OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
View file

@ -194,7 +194,9 @@ public class TurnPathHelper {
public RouteDrawable(){
paintRouteDirection = new Paint();
paintRouteDirection.setStyle(Style.FILL_AND_STROKE);
paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow));
// colors.xml-Issue
//paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow));
paintRouteDirection.setColor(Color.rgb(250, 222, 35));
paintRouteDirection.setAntiAlias(true);
}