xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-04-02 18:30:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

DroidfFish: Add option to load game by sweeping on the chess board.

Browse Source 
Add a preference setting to make horizontal sweep on the chess board
load the next/previous game instead of moving forward/back in the
current game.
This commit is contained in:
Peter Osterlund 2018-10-14 10:09:40 +02:00
parent 9a6b374856
commit 79d0009e76
3 changed files with 91 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,6 +317,8 @@ you are not actively using the program.\
<string name="prefs_scrollSensitivity_summary">Scrolling speed for game navigation</string> <string name="prefs_scrollSensitivity_summary">Scrolling speed for game navigation</string>
<string name="prefs_invertScrollDirection_title">Invert Scroll Direction</string> <string name="prefs_invertScrollDirection_title">Invert Scroll Direction</string>
<string name="prefs_invertScrollDirection_summary">Enable this if you think scrolling moves in the wrong direction</string> <string name="prefs_invertScrollDirection_summary">Enable this if you think scrolling moves in the wrong direction</string>
<string name="prefs_scrollGames_title">Sweep horizontally loads game</string>
<string name="prefs_scrollGames_summary">If enabled, sweeping horizontally on the chess board moves to the next/previous game</string>
<string name="prefs_autoScrollMoveList_title">Auto scroll move list</string> <string name="prefs_autoScrollMoveList_title">Auto scroll move list</string>
<string name="prefs_autoScrollMoveList_summary">Automatically scroll the move list to the current board position</string> <string name="prefs_autoScrollMoveList_summary">Automatically scroll the move list to the current board position</string>
<string name="prefs_discardVariations_title">Discard variations</string> <string name="prefs_discardVariations_title">Discard variations</string>

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

@ -531,6 +531,12 @@
android:summary="@string/prefs_invertScrollDirection_summary" android:summary="@string/prefs_invertScrollDirection_summary"
android:defaultValue="false"> android:defaultValue="false">
</CheckBoxPreference> </CheckBoxPreference>
<CheckBoxPreference
android:key="scrollGames"
android:title="@string/prefs_scrollGames_title"
android:summary="@string/prefs_scrollGames_summary"
android:defaultValue="false">
</CheckBoxPreference>
<CheckBoxPreference <CheckBoxPreference
android:key="autoScrollMoveList" android:key="autoScrollMoveList"
android:title="@string/prefs_autoScrollMoveList_title" android:title="@string/prefs_autoScrollMoveList_title"

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

@ -230,6 +230,7 @@ public class DroidFish extends Activity
private float scrollSensitivity; private float scrollSensitivity;
private boolean invertScrollDirection; private boolean invertScrollDirection;
private boolean scrollGames;
private boolean autoScrollMoveList; private boolean autoScrollMoveList;
private boolean leftHanded; private boolean leftHanded;
@ -449,6 +450,64 @@ public class DroidFish extends Activity
updateThinkingInfo(); updateThinkingInfo();
} }
}); });
addAction(new UIAction() {
public String getId() { return "prevGame"; }
public int getName() { return R.string.load_prev_game; }
public int getIcon() { return R.raw.custom; }
public boolean enabled() {
return (currFileType() != FT_NONE) && !gameMode.clocksActive();
}
public void run() {
final int currFT = currFileType();
final String currPathName = currPathName();
Intent i;
if (currFT == FT_PGN) {
i = new Intent(DroidFish.this, EditPGNLoad.class);
i.setAction("org.petero.droidfish.loadFilePrevGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_SCID) {
i = new Intent(DroidFish.this, LoadScid.class);
i.setAction("org.petero.droidfish.loadScidPrevGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_FEN) {
i = new Intent(DroidFish.this, LoadFEN.class);
i.setAction("org.petero.droidfish.loadPrevFen");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_FEN);
}
}
});
addAction(new UIAction() {
public String getId() { return "nextGame"; }
public int getName() { return R.string.load_next_game; }
public int getIcon() { return R.raw.custom; }
public boolean enabled() {
return (currFileType() != FT_NONE) && !gameMode.clocksActive();
}
public void run() {
final int currFT = currFileType();
final String currPathName = currPathName();
Intent i;
if (currFT == FT_PGN) {
i = new Intent(DroidFish.this, EditPGNLoad.class);
i.setAction("org.petero.droidfish.loadFileNextGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_SCID) {
i = new Intent(DroidFish.this, LoadScid.class);
i.setAction("org.petero.droidfish.loadScidNextGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_FEN) {
i = new Intent(DroidFish.this, LoadFEN.class);
i.setAction("org.petero.droidfish.loadNextFen");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_FEN);
}
}
});
} }
@Override @Override
@ -1018,8 +1077,23 @@ public class DroidFish extends Activity
if (analysis || !human) if (analysis || !human)
ctrl.setGameMode(new GameMode(GameMode.TWO_PLAYERS)); ctrl.setGameMode(new GameMode(GameMode.TWO_PLAYERS));
} }
for (int i = 0; i < nRedo; i++) ctrl.redoMove(); if (scrollGames) {
for (int i = 0; i < nUndo; i++) ctrl.undoMove(); if (nRedo > 0) {
UIAction nextGame = actionFactory.getAction("nextGame");
if (nextGame.enabled())
for (int i = 0; i < nRedo; i++)
nextGame.run();
}
if (nUndo > 0) {
UIAction prevGame = actionFactory.getAction("prevGame");
if (prevGame.enabled())
for (int i = 0; i < nUndo; i++)
prevGame.run();
}
} else {
for (int i = 0; i < nRedo; i++) ctrl.redoMove();
for (int i = 0; i < nUndo; i++) ctrl.undoMove();
}
ctrl.setGameMode(gameMode); ctrl.setGameMode(gameMode);
return nRedo + nUndo > 0; return nRedo + nUndo > 0;
} else { } else {
@ -1223,6 +1297,7 @@ public class DroidFish extends Activity
scrollSensitivity = Float.parseFloat(settings.getString("scrollSensitivity", "2")); scrollSensitivity = Float.parseFloat(settings.getString("scrollSensitivity", "2"));
invertScrollDirection = settings.getBoolean("invertScrollDirection", false); invertScrollDirection = settings.getBoolean("invertScrollDirection", false);
scrollGames = settings.getBoolean("scrollGames", false);
autoScrollMoveList = settings.getBoolean("autoScrollMoveList", true); autoScrollMoveList = settings.getBoolean("autoScrollMoveList", true);
discardVariations = settings.getBoolean("discardVariations", false); discardVariations = settings.getBoolean("discardVariations", false);
Util.setFullScreenMode(this, settings); Util.setFullScreenMode(this, settings);
@ -3222,9 +3297,8 @@ public class DroidFish extends Activity
if (ctrl.currVariation() > 0) { if (ctrl.currVariation() > 0) {
lst.add(getString(R.string.goto_prev_variation)); actions.add(GOTO_PREV_VAR); lst.add(getString(R.string.goto_prev_variation)); actions.add(GOTO_PREV_VAR);
} }
final int currFT = currFileType(); final UIAction prevGame = actionFactory.getAction("prevGame");
final String currPathName = currPathName(); if (prevGame.enabled()) {
if ((currFT != FT_NONE) && !gameMode.clocksActive()) {
lst.add(getString(R.string.load_prev_game)); actions.add(LOAD_PREV_GAME); lst.add(getString(R.string.load_prev_game)); actions.add(LOAD_PREV_GAME);
} }
if (!gameMode.clocksActive()) { if (!gameMode.clocksActive()) {
@ -3239,23 +3313,7 @@ public class DroidFish extends Activity
case GOTO_START_VAR: ctrl.gotoStartOfVariation(); break; case GOTO_START_VAR: ctrl.gotoStartOfVariation(); break;
case GOTO_PREV_VAR: ctrl.changeVariation(-1); break; case GOTO_PREV_VAR: ctrl.changeVariation(-1); break;
case LOAD_PREV_GAME: case LOAD_PREV_GAME:
Intent i; prevGame.run();
if (currFT == FT_PGN) {
i = new Intent(DroidFish.this, EditPGNLoad.class);
i.setAction("org.petero.droidfish.loadFilePrevGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_SCID) {
i = new Intent(DroidFish.this, LoadScid.class);
i.setAction("org.petero.droidfish.loadScidPrevGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_FEN) {
i = new Intent(DroidFish.this, LoadFEN.class);
i.setAction("org.petero.droidfish.loadPrevFen");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_FEN);
}
break; break;
case AUTO_BACKWARD: case AUTO_BACKWARD:
setAutoMode(AutoMode.BACKWARD); setAutoMode(AutoMode.BACKWARD);
@ -3280,9 +3338,8 @@ public class DroidFish extends Activity
if (ctrl.currVariation() < ctrl.numVariations() - 1) { if (ctrl.currVariation() < ctrl.numVariations() - 1) {
lst.add(getString(R.string.goto_next_variation)); actions.add(GOTO_NEXT_VAR); lst.add(getString(R.string.goto_next_variation)); actions.add(GOTO_NEXT_VAR);
} }
final int currFT = currFileType(); final UIAction nextGame = actionFactory.getAction("nextGame");
final String currPathName = currPathName(); if (nextGame.enabled()) {
if ((currFT != FT_NONE) && !gameMode.clocksActive()) {
lst.add(getString(R.string.load_next_game)); actions.add(LOAD_NEXT_GAME); lst.add(getString(R.string.load_next_game)); actions.add(LOAD_NEXT_GAME);
} }
if (!gameMode.clocksActive()) { if (!gameMode.clocksActive()) {
@ -3296,23 +3353,7 @@ public class DroidFish extends Activity
case GOTO_END_VAR: ctrl.gotoMove(Integer.MAX_VALUE); break; case GOTO_END_VAR: ctrl.gotoMove(Integer.MAX_VALUE); break;
case GOTO_NEXT_VAR: ctrl.changeVariation(1); break; case GOTO_NEXT_VAR: ctrl.changeVariation(1); break;
case LOAD_NEXT_GAME: case LOAD_NEXT_GAME:
Intent i; nextGame.run();
if (currFT == FT_PGN) {
i = new Intent(DroidFish.this, EditPGNLoad.class);
i.setAction("org.petero.droidfish.loadFileNextGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_SCID) {
i = new Intent(DroidFish.this, LoadScid.class);
i.setAction("org.petero.droidfish.loadScidNextGame");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_PGN);
} else if (currFT == FT_FEN) {
i = new Intent(DroidFish.this, LoadFEN.class);
i.setAction("org.petero.droidfish.loadNextFen");
i.putExtra("org.petero.droidfish.pathname", currPathName);
startActivityForResult(i, RESULT_LOAD_FEN);
}
break; break;
case AUTO_FORWARD: case AUTO_FORWARD:
setAutoMode(AutoMode.FORWARD); setAutoMode(AutoMode.FORWARD);