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 #4309 from ankidroid/revert-4271-drawer-enable-reviewer

Browse Source 
Revert "Enable drawer swipe when whiteboard / gestures enabled"
This commit is contained in:
Tim Rae 2016-06-03 06:58:38 +09:00
commit 696d925767
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java
View File

@ -54,6 +54,7 @@ import java.util.List;
import timber.log.Timber;
public class Reviewer extends AbstractFlashcardViewer {
private boolean mHasDrawerSwipeConflicts = false;
private boolean mShowWhiteboard = true;
private boolean mBlackWhiteboard = true;
private boolean mPrefFullscreenReview = false;
@ -109,6 +110,7 @@ public class Reviewer extends AbstractFlashcardViewer {
DeckTask.launchDeckTask(DeckTask.TASK_TYPE_ANSWER_CARD, mAnswerCardHandler,
new DeckTask.TaskData(null, 0));
disableDrawerSwipeOnConflicts();
// Add a weak reference to current activity so that scheduler can talk to to Activity
mSched.setContext(new WeakReference<Activity>(this));
@ -473,7 +475,32 @@ public class Reviewer extends AbstractFlashcardViewer {
// Show or hide the whiteboard
private void setWhiteboardVisibility(boolean state) {
mShowWhiteboard = state;
mWhiteboard.setVisibility(state? View.VISIBLE: View.GONE);
if (state) {
mWhiteboard.setVisibility(View.VISIBLE);
disableDrawerSwipe();
} else {
mWhiteboard.setVisibility(View.GONE);
if (!mHasDrawerSwipeConflicts) {
enableDrawerSwipe();
}
}
}
private void disableDrawerSwipeOnConflicts() {
SharedPreferences preferences = AnkiDroidApp.getSharedPrefs(getBaseContext());
boolean gesturesEnabled = AnkiDroidApp.initiateGestures(preferences);
if (gesturesEnabled) {
int gestureSwipeUp = Integer.parseInt(preferences.getString("gestureSwipeUp", "9"));
int gestureSwipeDown = Integer.parseInt(preferences.getString("gestureSwipeDown", "0"));
int gestureSwipeRight = Integer.parseInt(preferences.getString("gestureSwipeRight", "17"));
if (gestureSwipeUp != GESTURE_NOTHING ||
gestureSwipeDown != GESTURE_NOTHING ||
gestureSwipeRight != GESTURE_NOTHING) {
mHasDrawerSwipeConflicts = true;
super.disableDrawerSwipe();
}
}
}