xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-01-30 17:13:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: Better handling of gestures on the chess board.

Browse Source
This commit is contained in:
Peter Osterlund 2014-07-13 00:05:41 +00:00
parent 40c800f250
commit 4923b06e3c
6 changed files with 123 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DroidFish/.classpath
View File

@ -6,5 +6,6 @@
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/CuckooChessEngine"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

BIN
DroidFish/libs/android-support-v4.jar Normal file
View File

Binary file not shown.

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

@ -302,8 +302,6 @@ you are not actively using the program.\
<string name="prefs_discardVariations_summary">Discard non-mainline moves from move list</string>
<string name="prefs_leftHanded_title">Left-handed mode</string>
<string name="prefs_leftHanded_summary">Controls on left side in landscape mode</string>
<string name="prefs_boardGestures_title">Board Gestures</string>
<string name="prefs_boardGestures_summary">Long press board for tools menu. Swipe horizontally to undo/redo moves. Swipe vertically to go to previous/next variation.</string>
<string name="prefs_squareSelectType_title">Square selection</string>
<string name="prefs_squareSelectType_summary">Control how selecting squares on the chess board behaves</string>
<string name="prefs_fontSize_title">Text Size</string>

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

@ -495,15 +495,8 @@
android:entries="@array/squareSelectType_texts"
android:defaultValue="@string/squareSelectType_default">
</ListPreference>
<CheckBoxPreference
android:key="boardGestures"
android:title="@string/prefs_boardGestures_title"
android:summary="@string/prefs_boardGestures_summary"
android:defaultValue="true">
</CheckBoxPreference>
<ListPreference
android:key="scrollSensitivity"
android:dependency="boardGestures"
android:title="@string/prefs_scrollSensitivity_title"
android:summary="@string/prefs_scrollSensitivity_summary"
android:entryValues="@array/scroll_sensitivity_values"
@ -512,7 +505,6 @@
</ListPreference>
<CheckBoxPreference
android:key="invertScrollDirection"
android:dependency="boardGestures"
android:title="@string/prefs_invertScrollDirection_title"
android:summary="@string/prefs_invertScrollDirection_summary"
android:defaultValue="false">

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

@ -92,6 +92,7 @@ import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.support.v4.view.MotionEventCompat;
import android.text.ClipboardManager;
import android.text.Html;
import android.text.Layout;
@ -107,7 +108,7 @@ import android.text.style.ForegroundColorSpan;
import android.text.style.LeadingMarginSpan;
import android.text.style.StyleSpan;
import android.util.TypedValue;
import android.view.GestureDetector;
import android.view.ViewConfiguration;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
@ -127,6 +128,7 @@ import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@SuppressLint("ClickableViewAccessibility")
public class DroidFish extends Activity implements GUIInterface {
// FIXME!!! book.txt (and test classes) should not be included in apk
@ -190,7 +192,6 @@ public class DroidFish extends Activity implements GUIInterface {
SharedPreferences settings;
private boolean boardGestures;
private float scrollSensitivity;
private boolean invertScrollDirection;
@ -654,24 +655,82 @@ public class DroidFish extends Activity implements GUIInterface {
cb.setClickable(true);
cb.setPgnOptions(pgnOptions);
final GestureDetector gd = new GestureDetector(new GestureDetector.SimpleOnGestureListener() {
cb.setOnTouchListener(new OnTouchListener() {
private boolean pending = false;
private boolean pendingClick = false;
private int sq0 = -1;
private float scrollX = 0;
private float scrollY = 0;
@Override
public boolean onDown(MotionEvent e) {
if (!boardGestures) {
handleClick(e);
return true;
private float prevX = 0;
private float prevY = 0;
private Handler handler = new Handler();
private Runnable runnable = new Runnable() {
public void run() {
pending = false;
handler.removeCallbacks(runnable);
((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(20);
removeDialog(BOARD_MENU_DIALOG);
showDialog(BOARD_MENU_DIALOG);
}
scrollX = 0;
scrollY = 0;
return false;
}
};
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
if (!boardGestures)
return false;
cb.cancelLongPress();
public boolean onTouch(View v, MotionEvent event) {
int action = MotionEventCompat.getActionMasked(event);
switch (action) {
case MotionEvent.ACTION_DOWN:
handler.postDelayed(runnable, ViewConfiguration.getLongPressTimeout());
pending = true;
pendingClick = true;
sq0 = cb.eventToSquare(event);
scrollX = 0;
scrollY = 0;
prevX = event.getX();
prevY = event.getY();
break;
case MotionEvent.ACTION_MOVE:
if (pending) {
int sq = cb.eventToSquare(event);
if (sq != sq0) {
handler.removeCallbacks(runnable);
pendingClick = false;
}
float currX = event.getX();
float currY = event.getY();
if (onScroll(currX - prevX, currY - prevY)) {
handler.removeCallbacks(runnable);
pendingClick = false;
}
prevX = currX;
prevY = currY;
}
break;
case MotionEvent.ACTION_UP:
if (pending) {
pending = false;
handler.removeCallbacks(runnable);
if (!pendingClick)
break;
int sq = cb.eventToSquare(event);
if (sq == sq0) {
if (ctrl.humansTurn()) {
Move m = cb.mousePressed(sq);
if (m != null)
ctrl.makeHumanMove(m);
setEgtbHints(cb.getSelectedSquare());
}
}
}
break;
case MotionEvent.ACTION_CANCEL:
pending = false;
handler.removeCallbacks(runnable);
break;
}
return true;
}
private boolean onScroll(float distanceX, float distanceY) {
if (invertScrollDirection) {
distanceX = -distanceX;
distanceY = -distanceY;
@ -702,6 +761,7 @@ public class DroidFish extends Activity implements GUIInterface {
for (int i = 0; i < nRedo; i++) ctrl.redoMove();
for (int i = 0; i < nUndo; i++) ctrl.undoMove();
ctrl.setGameMode(gameMode);
return nRedo + nUndo > 0;
} else {
// Next/previous variation
int varDelta = 0;
@ -716,47 +776,10 @@ public class DroidFish extends Activity implements GUIInterface {
if (varDelta != 0)
scrollX = 0;
ctrl.changeVariation(varDelta);
return varDelta > 0;
}
}
return true;
}
@Override
public boolean onSingleTapUp(MotionEvent e) {
if (!boardGestures)
return false;
cb.cancelLongPress();
handleClick(e);
return true;
}
@Override
public boolean onDoubleTapEvent(MotionEvent e) {
if (!boardGestures)
return false;
if (e.getAction() == MotionEvent.ACTION_UP)
handleClick(e);
return true;
}
private final void handleClick(MotionEvent e) {
if (ctrl.humansTurn()) {
int sq = cb.eventToSquare(e);
Move m = cb.mousePressed(sq);
if (m != null)
ctrl.makeHumanMove(m);
setEgtbHints(cb.getSelectedSquare());
}
}
@Override
public void onLongPress(MotionEvent e) {
if (!boardGestures)
return;
((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(20);
removeDialog(BOARD_MENU_DIALOG);
showDialog(BOARD_MENU_DIALOG);
}
});
cb.setOnTouchListener(new OnTouchListener() {
public boolean onTouch(View v, MotionEvent event) {
return gd.onTouchEvent(event);
return false;
}
});
cb.setOnTrackballListener(new ChessBoard.OnTrackballListener() {
@ -923,7 +946,6 @@ public class DroidFish extends Activity implements GUIInterface {
movesPerSession = getIntSetting("movesPerSession", 60);
timeIncrement = getIntSetting("timeIncrement", 0);
boardGestures = settings.getBoolean("boardGestures", true);
scrollSensitivity = Float.parseFloat(settings.getString("scrollSensitivity", "2"));
invertScrollDirection = settings.getBoolean("invertScrollDirection", false);
discardVariations = settings.getBoolean("discardVariations", false);
@ -1218,7 +1240,7 @@ public class DroidFish extends Activity implements GUIInterface {
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
MenuItem item = menu.findItem(R.id.item_file_menu);
item.setTitle(boardGestures ? R.string.option_file : R.string.tools_menu);
item.setTitle(R.string.option_file);
return true;
}
@ -1248,7 +1270,7 @@ public class DroidFish extends Activity implements GUIInterface {
return true;
}
case R.id.item_file_menu: {
int dialog = boardGestures ? FILE_MENU_DIALOG : BOARD_MENU_DIALOG;
int dialog = FILE_MENU_DIALOG;
removeDialog(dialog);
showDialog(dialog);
return true;

93
DroidFish/src/org/petero/droidfish/activities/EditBoard.java
View File

@ -36,6 +36,7 @@ import org.petero.droidfish.gamelogic.Position;
import org.petero.droidfish.gamelogic.TextIO;
import org.petero.droidfish.gtb.Probe;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@ -47,15 +48,17 @@ import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.graphics.Typeface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.support.v4.view.MotionEventCompat;
import android.text.ClipboardManager;
import android.text.TextUtils;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.view.View.OnTouchListener;
@ -65,6 +68,7 @@ import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
@SuppressLint("ClickableViewAccessibility")
public class EditBoard extends Activity {
private ChessBoardEdit cb;
private TextView status;
@ -73,7 +77,6 @@ public class EditBoard extends Activity {
private boolean egtbHints;
private boolean autoScrollTitle;
private boolean boardGestures;
private TextView whiteFigText;
private TextView blackFigText;
private Typeface figNotation;
@ -88,7 +91,6 @@ public class EditBoard extends Activity {
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
egtbHints = settings.getBoolean("tbHintsEdit", false);
autoScrollTitle = settings.getBoolean("autoScrollTitle", true);
boardGestures = settings.getBoolean("boardGestures", true);
initUI();
@ -170,56 +172,45 @@ public class EditBoard extends Activity {
cb.setFocusable(true);
cb.requestFocus();
cb.setClickable(true);
final GestureDetector gd = new GestureDetector(new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onDown(MotionEvent e) {
if (!boardGestures) {
handleClick(e);
return true;
}
return false;
}
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
if (!boardGestures)
return false;
cb.cancelLongPress();
return true;
}
@Override
public boolean onSingleTapUp(MotionEvent e) {
if (!boardGestures)
return false;
cb.cancelLongPress();
handleClick(e);
return true;
}
@Override
public boolean onDoubleTapEvent(MotionEvent e) {
if (!boardGestures)
return false;
if (e.getAction() == MotionEvent.ACTION_UP)
handleClick(e);
return true;
}
@Override
public void onLongPress(MotionEvent e) {
if (!boardGestures)
return;
((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(20);
showDialog(EDIT_DIALOG);
}
private final void handleClick(MotionEvent e) {
int sq = cb.eventToSquare(e);
Move m = cb.mousePressed(sq);
if (m != null)
doMove(m);
setEgtbHints(cb.getSelectedSquare());
}
});
cb.setOnTouchListener(new OnTouchListener() {
private boolean pending = false;
private int sq0 = -1;
private Handler handler = new Handler();
private Runnable runnable = new Runnable() {
public void run() {
pending = false;
handler.removeCallbacks(runnable);
((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(20);
showDialog(EDIT_DIALOG);
}
};
public boolean onTouch(View v, MotionEvent event) {
return gd.onTouchEvent(event);
int action = MotionEventCompat.getActionMasked(event);
switch (action) {
case MotionEvent.ACTION_DOWN:
handler.postDelayed(runnable, ViewConfiguration.getLongPressTimeout());
sq0 = cb.eventToSquare(event);
pending = true;
break;
case MotionEvent.ACTION_UP:
if (pending) {
pending = false;
handler.removeCallbacks(runnable);
int sq = cb.eventToSquare(event);
if (sq == sq0) {
Move m = cb.mousePressed(sq);
if (m != null)
doMove(m);
setEgtbHints(cb.getSelectedSquare());
}
}
break;
case MotionEvent.ACTION_CANCEL:
pending = false;
handler.removeCallbacks(runnable);
break;
}
return true;
}
});
cb.setOnTrackballListener(new ChessBoard.OnTrackballListener() {