From 3a5ebadd3f219acc5c09d35d19237b298a1f74ce Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Tue, 28 Feb 2012 13:08:20 +0100
Subject: [PATCH] correctly export alphas to color.xml as well

---
 OsmAnd/res/values/colors.xml                  | 20 +++++++++----------
 .../net/osmand/plus/views/OsmBugsLayer.java   |  4 ++--
 .../net/osmand/plus/views/POIMapLayer.java    |  2 +-
 .../osmand/plus/views/PointLocationLayer.java |  4 ++--
 .../src/net/osmand/plus/views/RouteLayer.java |  2 +-
 .../osmand/plus/views/TransportInfoLayer.java |  4 ++--
 .../plus/views/TransportStopsLayer.java       |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 4ae91acde2..8324827b27 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -17,12 +17,12 @@
 
 	<color name="gpx_track">#B4A00AD7</color>
 	<color name="gpx_track_fluorescent">#B400FFFF</color>
-	<color name="pos_heading">#0000FF</color>
-	<color name="pos_area">#0000FF</color>
+	<color name="pos_heading">#320000FF</color>
+	<color name="pos_area">#280000FF</color>
 	<color name="pos_around">#707CDC</color>  <!-- family blue similar to above -->
 
-	<color name="nav_track">#0000FF</color>  <!-- needs to be brighter, hardly visible in night mode -->
-	<color name="nav_track_fluorescent">#F2FF6600</color>
+	<color name="nav_track">#960000FF</color>  <!-- needs to be brighter, hardly visible in night mode -->
+	<color name="nav_track_fluorescent">#B4FF6600</color>
 	<color name="nav_arrow">#FADE23</color>
 	<color name="nav_arrow_imminent">#FF2300</color>
 	<color name="nav_arrow_distant">#C0C0C0</color>
@@ -39,21 +39,21 @@
 	<color name="localindex_isloaded">#00FF00</color> <!-- standard GREEN -->
 	<color name="localindex_unknown">#C0C0C0</color> <!-- standard LTGRAY -->
 
-	<color name="poi_background">#FF8000</color>
+	<color name="poi_background">#A0FF8000</color>
 	<color name="poi_open">#32CD32</color> <!-- GREEN/RED is intuitive for open/closed -->
 	<color name="poi_closed">#EE3232</color>
 	<color name="poi_direction">#6400FF</color>
 	<color name="poi_unknown_arrow">#C8C8C8</color>
 
-	<color name="transport_stop">#0000FF</color>
-	<color name="transport_int">#32C832</color>
-	<color name="transport_end">#FF0000</color>
+	<color name="transport_stop">#960000FF</color>
+	<color name="transport_int">#9632C832</color>
+	<color name="transport_end">#96FF0000</color>
 
 	<color name="osm_create">#00FF00</color> <!-- standard GREEN -->
 	<color name="osm_modify">#FF00FF</color> <!-- standard MAGENTA -->
 	<color name="osm_delete">#FF0000</color> <!-- standard RED -->
 
-	<color name="osmbug_opened">#FF0000</color> <!-- standard RED -->
-	<color name="osmbug_closed">#00FF00</color> <!-- standard GREEN -->
+	<color name="osmbug_opened">#C8FF0000</color> <!-- standard RED -->
+	<color name="osmbug_closed">#C800FF00</color> <!-- standard GREEN -->
 	
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java
index 150ce4e6d5..f9644e2172 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java
@@ -99,11 +99,11 @@ public class OsmBugsLayer extends OsmandMapLayer implements ContextMenuLayer.ICo
 		}
 		pointOpenedUI = new Paint();
 		pointOpenedUI.setColor(activity.getResources().getColor(R.color.osmbug_opened));
-		pointOpenedUI.setAlpha(200);
+		//pointOpenedUI.setAlpha(200);
 		pointOpenedUI.setAntiAlias(true);
 		pointClosedUI = new Paint();
 		pointClosedUI.setColor(activity.getResources().getColor(R.color.osmbug_closed));
-		pointClosedUI.setAlpha(200);
+		//pointClosedUI.setAlpha(200);
 		pointClosedUI.setAntiAlias(true);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
index 1ec15648ed..575e8dc32b 100644
--- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
@@ -136,7 +136,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 
 		pointAltUI = new Paint();
 		pointAltUI.setColor(view.getApplication().getResources().getColor(R.color.poi_background));
-		pointAltUI.setAlpha(160);
+		//pointAltUI.setAlpha(160);
 		pointAltUI.setStyle(Style.FILL);
 		
 		paintIcon = new Paint();
diff --git a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
index ecd5872b1f..1c5628c59c 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
@@ -41,7 +41,7 @@ public class PointLocationLayer extends OsmandMapLayer {
 		
 		area = new Paint();
 		area.setColor(view.getResources().getColor(R.color.pos_area));
-		area.setAlpha(40);
+		//area.setAlpha(40);
 		
 		aroundArea = new Paint();
 		aroundArea.setColor(view.getResources().getColor(R.color.pos_around));
@@ -51,7 +51,7 @@ public class PointLocationLayer extends OsmandMapLayer {
 		
 		headingPaint = new Paint();
 		headingPaint.setColor(view.getResources().getColor(R.color.pos_heading));
-		headingPaint.setAlpha(50);
+		//headingPaint.setAlpha(50);
 		headingPaint.setAntiAlias(true);
 		headingPaint.setStyle(Style.FILL);
 		
diff --git a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
index 85d9fec658..1275f8c70b 100644
--- a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
@@ -48,7 +48,7 @@ public class RouteLayer extends OsmandMapLayer {
 		}
 		paint.setStyle(Style.STROKE);
 		paint.setStrokeWidth(14);
-		paint.setAlpha(150);
+		//paint.setAlpha(150);
 		paint.setAntiAlias(true);
 		paint.setStrokeCap(Cap.ROUND);
 		paint.setStrokeJoin(Join.ROUND);
diff --git a/OsmAnd/src/net/osmand/plus/views/TransportInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/TransportInfoLayer.java
index 7a5fe758fb..7c488f46e6 100644
--- a/OsmAnd/src/net/osmand/plus/views/TransportInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/TransportInfoLayer.java
@@ -39,11 +39,11 @@ public class TransportInfoLayer extends OsmandMapLayer {
 
 		paintInt = new Paint();
 		paintInt.setColor(view.getResources().getColor(R.color.transport_int));
-		paintInt.setAlpha(150);
+		//paintInt.setAlpha(150);
 		paintInt.setAntiAlias(true);
 		paintEnd = new Paint();
 		paintEnd.setColor(view.getResources().getColor(R.color.transport_end));
-		paintEnd.setAlpha(150);
+		//paintEnd.setAlpha(150);
 		paintEnd.setAntiAlias(true);
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
index 61a1d44eb5..a9e8ab8fe9 100644
--- a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
@@ -35,7 +35,7 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
 
 		pointAltUI = new Paint();
 		pointAltUI.setColor(view.getResources().getColor(R.color.transport_stop));
-		pointAltUI.setAlpha(150);
+		//pointAltUI.setAlpha(150);
 		pointAltUI.setAntiAlias(true);
 	}