xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-02-07 12:49:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: Changed maximum number of arrows to 8.

Browse Source
This commit is contained in:
Peter Osterlund 2016-11-05 13:50:49 +01:00
parent 596e839eec
commit 9e5073b4bd
4 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DroidFish/res/values/strings.xml
View File

@ -343,6 +343,8 @@ you are not actively using the program.\
<string name="prefs_color_arrow3_title">Arrow 4</string>
<string name="prefs_color_arrow4_title">Arrow 5</string>
<string name="prefs_color_arrow5_title">Arrow 6</string>
<string name="prefs_color_arrow6_title">Arrow 7</string>
<string name="prefs_color_arrow7_title">Arrow 8</string>
<string name="prefs_color_squareLabel_title">Square Labels</string>
<string name="prefs_color_decoration_title">Tablebase hints</string>
<string name="prefs_move_list">Move List</string>
@ -596,6 +598,8 @@ you are not actively using the program.\
<item>Max 4 Arrows</item>
<item>Max 5 Arrows</item>
<item>Max 6 Arrows</item>
<item>Max 7 Arrows</item>
<item>Max 8 Arrows</item>
</string-array>
<string-array name="thinking_arrows_values">
<item>0</item>
@ -605,6 +609,8 @@ you are not actively using the program.\
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string-array name="scroll_sensitivity_texts">
<item>Off</item>

18
DroidFish/res/xml/preferences.xml
View File

@ -254,15 +254,27 @@
android:key="color_arrow4"
android:title="@string/prefs_color_arrow4_title"
alphaSlider="true"
android:defaultValue="#1E1F1FFF">
android:defaultValue="#371F1FFF">
</net.margaritov.preference.colorpicker.ColorPickerPreference>
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="color_arrow5"
android:title="@string/prefs_color_arrow5_title"
alphaSlider="true"
android:defaultValue="#3C1FFF1F">
</net.margaritov.preference.colorpicker.ColorPickerPreference>
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="color_arrow6"
android:title="@string/prefs_color_arrow6_title"
alphaSlider="true"
android:defaultValue="#1E1F1FFF">
</net.margaritov.preference.colorpicker.ColorPickerPreference>
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="color_arrow7"
android:title="@string/prefs_color_arrow7_title"
alphaSlider="true"
android:defaultValue="#281FFF1F">
</net.margaritov.preference.colorpicker.ColorPickerPreference>
<net.margaritov.preference.colorpicker.ColorPickerPreference
</net.margaritov.preference.colorpicker.ColorPickerPreference>
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="color_squareLabel"
android:title="@string/prefs_color_squareLabel_title"
alphaSlider="true"

4
DroidFish/src/org/petero/droidfish/ChessBoard.java
View File

@ -122,7 +122,7 @@ public abstract class ChessBoard extends View {
decorationPaint.setAntiAlias(true);
moveMarkPaint = new ArrayList<Paint>();
for (int i = 0; i < 6; i++) {
for (int i = 0; i < ColorTheme.MAX_ARROWS; i++) {
Paint p = new Paint();
p.setStyle(Paint.Style.FILL);
p.setAntiAlias(true);
@ -150,7 +150,7 @@ public abstract class ChessBoard extends View {
blackPiecePaint.setColor(ct.getColor(ColorTheme.DARK_PIECE));
labelPaint.setColor(ct.getColor(ColorTheme.SQUARE_LABEL));
decorationPaint.setColor(ct.getColor(ColorTheme.DECORATION));
for (int i = 0; i < 6; i++)
for (int i = 0; i < ColorTheme.MAX_ARROWS; i++)
moveMarkPaint.get(i).setColor(ct.getColor(ColorTheme.ARROW_0 + i));
invalidate();

47
DroidFish/src/org/petero/droidfish/ColorTheme.java
View File

@ -45,19 +45,22 @@ public class ColorTheme {
final static int ARROW_3 = 10;
final static int ARROW_4 = 11;
final static int ARROW_5 = 12;
final static int SQUARE_LABEL = 13;
final static int DECORATION = 14;
final static int PGN_COMMENT = 15;
public final static int FONT_FOREGROUND = 16;
public final static int GENERAL_BACKGROUND = 17;
private final static int numColors = 18;
final static int ARROW_6 = 13;
final static int ARROW_7 = 14;
final static int MAX_ARROWS = 8;
final static int SQUARE_LABEL = 15;
final static int DECORATION = 16;
final static int PGN_COMMENT = 17;
public final static int FONT_FOREGROUND = 18;
public final static int GENERAL_BACKGROUND = 19;
private final static int numColors = 20;
private int colorTable[] = new int[numColors];
private static final String[] prefNames = {
"darkSquare", "brightSquare", "selectedSquare", "cursorSquare", "darkPiece", "brightPiece", "currentMove",
"arrow0", "arrow1", "arrow2", "arrow3", "arrow4", "arrow5", "squareLabel", "decoration", "pgnComment",
"fontForeground", "generalBackground"
"arrow0", "arrow1", "arrow2", "arrow3", "arrow4", "arrow5", "arrow6", "arrow7",
"squareLabel", "decoration", "pgnComment", "fontForeground", "generalBackground"
};
private static final String prefPrefix = "color_";
@ -74,38 +77,38 @@ public class ColorTheme {
private final static String themeColors[][] = {
{ // Original
"#FF808080", "#FFBEBE5A", "#FFFF0000", "#FF00FF00", "#FF000000", "#FFFFFFFF", "#FF888888",
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
"#FF9F9F66", "#FFC0C000", "#FFF7FBC6", "#FF292C10"
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#371F1FFF", "#3CFF1F1F", "#1E1F1FFF", "#28FF1F1F",
"#FFFF0000", "#FF9F9F66", "#FFC0C000", "#FFF7FBC6", "#FF292C10"
},
{ // XBoard
"#FF77A26D", "#FFC8C365", "#FFFFFF00", "#FF00FF00", "#FF202020", "#FFFFFFCC", "#FF6B9262",
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
"#FF808080", "#FFC0C000", "#FFEFFBBC", "#FF28320C"
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#371F1FFF", "#3CFF1F1F", "#1E1F1FFF", "#28FF1F1F",
"#FFFF0000", "#FF808080", "#FFC0C000", "#FFEFFBBC", "#FF28320C"
},
{ // Blue
"#FF83A5D2", "#FFFFFFFA", "#FF3232D1", "#FF5F5FFD", "#FF282828", "#FFF0F0F0", "#FF3333FF",
"#A01F1FFF", "#A01FFF1F", "#501F1FFF", "#501FFF1F", "#1E1F1FFF", "#281FFF1F", "#FFFF0000",
"#FF808080", "#FFC0C000", "#FFFFFF00", "#FF2E2B53"
"#A01F1FFF", "#A01FFF1F", "#501F1FFF", "#501FFF1F", "#371F1FFF", "#3C1FFF1F", "#1E1F1FFF", "#281FFF1F",
"#FFFF0000", "#FF808080", "#FFC0C000", "#FFFFFF00", "#FF2E2B53"
},
{ // Grey
"#FF666666", "#FFDDDDDD", "#FFFF0000", "#FF0000FF", "#FF000000", "#FFFFFFFF", "#FF888888",
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
"#FF909090", "#FFC0C000", "#FFFFFFFF", "#FF202020"
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#371F1FFF", "#3CFF1F1F", "#1E1F1FFF", "#28FF1F1F",
"#FFFF0000", "#FF909090", "#FFC0C000", "#FFFFFFFF", "#FF202020"
},
{ // Scid Default
"#FF80A0A0", "#FFD0E0D0", "#FFFF0000", "#FF00FF00", "#FF000000", "#FFFFFFFF", "#FF666666",
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
"#FF808080", "#FFC0C000", "#FFDEFBDE", "#FF213429"
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#371F1FFF", "#3CFF1F1F", "#1E1F1FFF", "#28FF1F1F",
"#FFFF0000", "#FF808080", "#FFC0C000", "#FFDEFBDE", "#FF213429"
},
{ // Scid Brown
"#B58863", "#F0D9B5", "#FFFF0000", "#FF00FF00", "#FF000000", "#FFFFFFFF", "#FF666666",
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
"#FF808080", "#FFC0C000", "#FFF7FAE3", "#FF40260A"
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#371F1FFF", "#3CFF1F1F", "#1E1F1FFF", "#28FF1F1F",
"#FFFF0000", "#FF808080", "#FFC0C000", "#FFF7FAE3", "#FF40260A"
},
{ // Scid Green
"#FF769656", "#FFEEEED2", "#FFFF0000", "#FF0000FF", "#FF000000", "#FFFFFFFF", "#FF666666",
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
"#FF808080", "#FFC0C000", "#FFDEE3CE", "#FF183C21"
"#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#371F1FFF", "#3CFF1F1F", "#1E1F1FFF", "#28FF1F1F",
"#FFFF0000", "#FF808080", "#FFC0C000", "#FFDEE3CE", "#FF183C21"
}
};