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

Harmonize collor dialog orders (rainbow)

Browse source
This commit is contained in:
sonora 2015-11-29 11:28:21 +01:00
parent 6dc74c36ff
commit 6e57a76f7b
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/values/strings.xml
View file

@ -638,13 +638,15 @@
<string name="osmo_connect_to_my_nickname">My nickname</string> <string name="osmo_connect_to_my_nickname">My nickname</string>
<string name="osmo_user_name">User</string> <string name="osmo_user_name">User</string>
<string name="color_red">red</string> <string name="color_red">red</string>
<string name="color_pink">pink</string>
<string name="color_orange">orange</string> <string name="color_orange">orange</string>
<string name="color_brown">brown</string>
<string name="color_yellow">yellow</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_lightblue">light blue</string>
<string name="color_blue">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_device">Change user properties</string>
<string name="osmo_edit_color">Display color</string> <string name="osmo_edit_color">Display color</string>

16
OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
View file

@ -29,24 +29,28 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP;
public class ColorDialogs { public class ColorDialogs {
public static int[] paletteColors = new int[] { public static int[] paletteColors = new int[] {
R.string.color_red, R.string.color_red,
R.string.color_pink,
R.string.color_orange, R.string.color_orange,
R.string.color_brown,
R.string.color_yellow, R.string.color_yellow,
R.string.color_lightgreen,
R.string.color_green,
R.string.color_lightblue, R.string.color_lightblue,
R.string.color_blue, 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[] { public static int[] pallette = new int[] {
0xb4d00d0d, 0xb4d00d0d,
0xb4e044bb,
0xb4ff5020, 0xb4ff5020,
0xb48e2512,
0xb4eeee10, 0xb4eeee10,
0xb46cb52b,
0xb488e030,
0xb410c0f0, 0xb410c0f0,
0xb41010a0, 0xb41010a0,
0xb488e030 0xb4a71de1,
0xb4e044bb,
0xb48e2512
}; };