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

DroidFish: Added option to not highlight the last played move.

Browse Source
This commit is contained in:
Peter Osterlund
2012-12-29 21:09:16 +00:00
parent 55a328134c
commit 5a0b918bc6
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,8 +204,10 @@ you are not actively using the program.\
<string name="start_new_game">Start New Game?</string> <string name="start_new_game">Start New Game?</string>
<string name="strength_cuckoo_hint">Use the CuckooChess engine for even lower strength.</string> <string name="strength_cuckoo_hint">Use the CuckooChess engine for even lower strength.</string>
<string name="piece_names">P N B R Q K</string> <string name="piece_names">P N B R Q K</string>
<string name="material_diff_summary">Displays an additional subtitle for captured pieces</string> <string name="highlight_last_move_title">Highlight last move</string>
<string name="highlight_last_move_summary">Draw rectangle around last moved piece</string>
<string name="material_diff_title">Show Material Difference</string> <string name="material_diff_title">Show Material Difference</string>
<string name="material_diff_summary">Displays an additional subtitle for captured pieces</string>
<string name="err_too_few_spaces">Too few spaces</string> <string name="err_too_few_spaces">Too few spaces</string>
<string name="err_invalid_piece">Invalid piece</string> <string name="err_invalid_piece">Invalid piece</string>
<string name="err_invalid_side">Invalid side</string> <string name="err_invalid_side">Invalid side</string>

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

@@ -88,9 +88,16 @@
android:defaultValue="@string/thinking_arrows_default"> android:defaultValue="@string/thinking_arrows_default">
</ListPreference> </ListPreference>
<CheckBoxPreference <CheckBoxPreference
android:key="highlightLastMove"
android:title="@string/highlight_last_move_title"
android:summary="@string/highlight_last_move_summary"
android:defaultValue="true">
</CheckBoxPreference>
<CheckBoxPreference
android:key="materialDiff" android:key="materialDiff"
android:summary="@string/material_diff_summary" android:title="@string/material_diff_title"
android:title="@string/material_diff_title"> android:summary="@string/material_diff_summary"
android:defaultValue="false">
</CheckBoxPreference> </CheckBoxPreference>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory

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

@@ -52,6 +52,7 @@ public abstract class ChessBoard extends View {
public boolean flipped; public boolean flipped;
public boolean drawSquareLabels; public boolean drawSquareLabels;
boolean toggleSelection; boolean toggleSelection;
boolean highlightLastMove; // If true, last move is marked with a rectangle
List<Move> moveHints; List<Move> moveHints;
@@ -97,6 +98,7 @@ public abstract class ChessBoard extends View {
flipped = false; flipped = false;
drawSquareLabels = false; drawSquareLabels = false;
toggleSelection = false; toggleSelection = false;
highlightLastMove = true;
darkPaint = new Paint(); darkPaint = new Paint();
brightPaint = new Paint(); brightPaint = new Paint();

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

@@ -113,7 +113,7 @@ public class ChessBoardPlay extends ChessBoard {
} }
if (!myColor(p)) { if (!myColor(p)) {
Move m = new Move(selectedSquare, sq, Piece.EMPTY); Move m = new Move(selectedSquare, sq, Piece.EMPTY);
setSelection(sq); setSelection(highlightLastMove ? sq : -1);
userSelectedSquare = false; userSelectedSquare = false;
return m; return m;
} else } else
@@ -140,7 +140,7 @@ public class ChessBoardPlay extends ChessBoard {
anyMatch = match.second; anyMatch = match.second;
} }
if (matchingMove != null) { if (matchingMove != null) {
setSelection(matchingMove.to); setSelection(highlightLastMove ? matchingMove.to : -1);
userSelectedSquare = false; userSelectedSquare = false;
return matchingMove; return matchingMove;
} }

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

@@ -515,6 +515,7 @@ public class DroidFish extends Activity implements GUIInterface {
cb.setDrawSquareLabels(oldCB.drawSquareLabels); cb.setDrawSquareLabels(oldCB.drawSquareLabels);
cb.oneTouchMoves = oldCB.oneTouchMoves; cb.oneTouchMoves = oldCB.oneTouchMoves;
cb.toggleSelection = oldCB.toggleSelection; cb.toggleSelection = oldCB.toggleSelection;
cb.highlightLastMove = oldCB.highlightLastMove;
setSelection(oldCB.selectedSquare); setSelection(oldCB.selectedSquare);
cb.userSelectedSquare = oldCB.userSelectedSquare; cb.userSelectedSquare = oldCB.userSelectedSquare;
setStatusString(statusStr); setStatusString(statusStr);
@@ -822,6 +823,7 @@ public class DroidFish extends Activity implements GUIInterface {
cb.setDrawSquareLabels(drawSquareLabels); cb.setDrawSquareLabels(drawSquareLabels);
cb.oneTouchMoves = settings.getBoolean("oneTouchMoves", false); cb.oneTouchMoves = settings.getBoolean("oneTouchMoves", false);
cb.toggleSelection = getIntSetting("squareSelectType", 0) == 1; cb.toggleSelection = getIntSetting("squareSelectType", 0) == 1;
cb.highlightLastMove = settings.getBoolean("highlightLastMove", true);
mShowThinking = settings.getBoolean("showThinking", false); mShowThinking = settings.getBoolean("showThinking", false);
mShowStats = settings.getBoolean("showStats", true); mShowStats = settings.getBoolean("showStats", true);
@@ -1358,7 +1360,7 @@ public class DroidFish extends Activity implements GUIInterface {
@Override @Override
public void setSelection(int sq) { public void setSelection(int sq) {
cb.setSelection(sq); cb.setSelection(cb.highlightLastMove ? sq : -1);
cb.userSelectedSquare = false; cb.userSelectedSquare = false;
setEgtbHints(sq); setEgtbHints(sq);
} }