Use existed suppressFlingGesture() method in RangeWidget (getodk#1371)

jovaee · Aug 23, 2017 · f546c2e · f546c2e
1 parent ceaefe8
commit f546c2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java
@@ -193,7 +193,6 @@ public class FormEntryActivity extends AppCompatActivity implements AnimationLis
     private static final int SAVING_IMAGE_DIALOG = 3;
 
     private boolean autoSaved;
-    private boolean doSwipe = true;
 
     // Random ID
     private static final int DELETE_REPEAT = 654321;
@@ -2818,7 +2817,7 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
                 PreferenceKeys.KEY_NAVIGATION,
                 PreferenceKeys.NAVIGATION_SWIPE);
 
-        if (navigation.contains(PreferenceKeys.NAVIGATION_SWIPE) && doSwipe) {
+        if (navigation.contains(PreferenceKeys.NAVIGATION_SWIPE)) {
             // Looks for user swipes. If the user has swiped, move to the
             // appropriate screen.
 
@@ -2954,8 +2953,4 @@ public EmptyView(Context context) {
             super(context);
         }
     }
-
-    public void allowSwiping(boolean doSwipe) {
-        this.doSwipe = doSwipe;
-    }
 }
diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/RangeWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/RangeWidget.java
@@ -60,6 +60,7 @@ public abstract class RangeWidget extends QuestionWidget {
     private View view;
 
     private boolean isPickerAppearance;
+    private boolean suppressFlingGesture;
 
     private Button pickerButton;
     private TextView answerTextView;
@@ -98,6 +99,11 @@ public void setOnLongClickListener(OnLongClickListener l) {
         }
     }
 
+    @Override
+    public boolean suppressFlingGesture(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+        return suppressFlingGesture;
+    }
+
     private void setUpLayoutElements() {
         if (!isPickerAppearance) {
             TextView minValue = (TextView) view.findViewById(R.id.min_value);
@@ -160,12 +166,12 @@ private void setUpSeekBar() {
         seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onStopTrackingTouch(SeekBar seekBar) {
-                ((FormEntryActivity) getContext()).allowSwiping(true);
+                suppressFlingGesture = false;
             }
 
             @Override
             public void onStartTrackingTouch(SeekBar seekBar) {
-                ((FormEntryActivity) getContext()).allowSwiping(false);
+                suppressFlingGesture = true;
             }
 
             @Override