From 6e57a76f7b5c990a6cbb2a2ef65fb5aafa63ac0f Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Sun, 29 Nov 2015 11:28:21 +0100
Subject: [PATCH] Harmonize collor dialog orders (rainbow)

---
 OsmAnd/res/values/strings.xml                    |  8 +++++---
 .../net/osmand/plus/helpers/ColorDialogs.java    | 16 ++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a99cf4ba14..1c6810672d 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -638,13 +638,15 @@
     <string name="osmo_connect_to_my_nickname">My nickname</string>
     <string name="osmo_user_name">User</string>
 	<string name="color_red">red</string>
-	<string name="color_pink">pink</string>
 	<string name="color_orange">orange</string>
-	<string name="color_brown">brown</string>
 	<string name="color_yellow">yellow</string>
+	<string name="color_lightgreen">light green</string>
+	<string name="color_green">green</string>
 	<string name="color_lightblue">light blue</string>
 	<string name="color_blue">blue</string>
-	<string name="color_green">green</string>
+	<string name="color_purple">purple</string>
+	<string name="color_pink">pink</string>
+	<string name="color_brown">brown</string>
 
     <string name="osmo_edit_device">Change user properties</string>
     <string name="osmo_edit_color">Display color</string>
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
index a7c9986887..91ead6f3b7 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
@@ -29,24 +29,28 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP;
 public class ColorDialogs {
 	public static int[] paletteColors = new int[] {
 			R.string.color_red,
-			R.string.color_pink,
 			R.string.color_orange,
-			R.string.color_brown,
 			R.string.color_yellow,
+			R.string.color_lightgreen,
+			R.string.color_green,
 			R.string.color_lightblue,
 			R.string.color_blue,
-			R.string.color_green
+			R.string.color_purple,
+			R.string.color_pink,
+			R.string.color_brown
 	};
 	
 	public static int[] pallette = new int[] {
 			0xb4d00d0d,
-			0xb4e044bb,
 			0xb4ff5020,
-			0xb48e2512,
 			0xb4eeee10,
+			0xb46cb52b,
+			0xb488e030,
 			0xb410c0f0,
 			0xb41010a0,
-			0xb488e030
+			0xb4a71de1,
+			0xb4e044bb,
+			0xb48e2512
 	};