mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

Merge pull request #610 from agrueneberg/fix-answer-on-space-in-type-mode

Browse Source 
Fix show answer on whitespace in type mode
This commit is contained in:
Nicolas Raoul 2014-11-05 14:44:54 +09:00
commit 7059967dfd
2 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/ichi2/anki/AbstractFlashcardViewer.java
View File

@ -254,7 +254,7 @@ public abstract class AbstractFlashcardViewer extends NavigationDrawerActivity {
private TextView mNext3;
private TextView mNext4;
private Button mFlipCard;
private EditText mAnswerField;
protected EditText mAnswerField;
private Button mEase1;
private Button mEase2;
private Button mEase3;
@ -1068,11 +1068,13 @@ public abstract class AbstractFlashcardViewer extends NavigationDrawerActivity {
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (!sDisplayAnswer) {
if (keyCode == KeyEvent.KEYCODE_SPACE || keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER) {
displayCardAnswer();
return true;
}
if (!mAnswerField.isFocused()) {
if (!sDisplayAnswer) {
if (keyCode == KeyEvent.KEYCODE_SPACE || keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER) {
displayCardAnswer();
return true;
}
}
}
return super.onKeyUp(keyCode, event);
}

110
src/com/ichi2/anki/Reviewer.java
View File

@ -266,60 +266,62 @@ public class Reviewer extends AbstractFlashcardViewer {
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
char keyPressed = (char) event.getUnicodeChar();
if (sDisplayAnswer) {
if (keyPressed == '1') {
answerCard(EASE_FAILED);
return true;
}
if (keyPressed == '2') {
answerCard(EASE_HARD);
return true;
}
if (keyPressed == '3') {
answerCard(EASE_MID);
return true;
}
if (keyPressed == '4') {
answerCard(EASE_EASY);
return true;
}
if (keyCode == KeyEvent.KEYCODE_SPACE || keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER) {
answerCard(getDefaultEase());
return true;
}
}
if (keyPressed == 'e') {
editCard();
return true;
}
if (keyPressed == '*') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_MARK_CARD, mMarkCardHandler, new DeckTask.TaskData(mSched,
mCurrentCard, 0));
return true;
}
if (keyPressed == '-') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 4));
return true;
}
if (keyPressed == '=') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 0));
return true;
}
if (keyPressed == '@') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 1));
return true;
}
if (keyPressed == '!') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 2));
return true;
}
if (keyPressed == 'r' || keyCode == KeyEvent.KEYCODE_F5) {
playSounds(true);
return true;
if (!mAnswerField.isFocused()) {
if (sDisplayAnswer) {
if (keyPressed == '1') {
answerCard(EASE_FAILED);
return true;
}
if (keyPressed == '2') {
answerCard(EASE_HARD);
return true;
}
if (keyPressed == '3') {
answerCard(EASE_MID);
return true;
}
if (keyPressed == '4') {
answerCard(EASE_EASY);
return true;
}
if (keyCode == KeyEvent.KEYCODE_SPACE || keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER) {
answerCard(getDefaultEase());
return true;
}
}
if (keyPressed == 'e') {
editCard();
return true;
}
if (keyPressed == '*') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_MARK_CARD, mMarkCardHandler, new DeckTask.TaskData(mSched,
mCurrentCard, 0));
return true;
}
if (keyPressed == '-') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 4));
return true;
}
if (keyPressed == '=') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 0));
return true;
}
if (keyPressed == '@') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 1));
return true;
}
if (keyPressed == '!') {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_DISMISS_NOTE, mDismissCardHandler, new DeckTask.TaskData(
mSched, mCurrentCard, 2));
return true;
}
if (keyPressed == 'r' || keyCode == KeyEvent.KEYCODE_F5) {
playSounds(true);
return true;
}
}
return super.onKeyUp(keyCode, event);
}