Merge pull request #2 from phantomVK/feature/remove_custom_viewdraghe…

…lper

Replace custom ViewDragHelper with androidx's.

app/src/main/java/com/phantomvk/slideback/demo/MainActivity.java

@@ -10,12 +10,14 @@
 import static androidx.customview.widget.ViewDragHelper.EDGE_RIGHT;
 import static androidx.customview.widget.ViewDragHelper.EDGE_TOP;
 
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.MenuItem;
+import android.view.ViewConfiguration;
 import android.view.Window;
 import android.widget.RadioGroup;
 import android.widget.Toast;
@@ -24,10 +26,12 @@
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.customview.widget.ViewDragHelper;
 
 import com.phantomvk.slideback.SlideLayout;
 import com.phantomvk.slideback.demo.union.BaseActivity;
 
+import java.lang.reflect.Field;
 import java.util.regex.Pattern;
 
 public class MainActivity extends BaseActivity {
@@ -88,6 +92,26 @@ protected void onDestroy() {
         Log.i(tag, "onDestroy()");
     }
 
+    public void setTouchSlop(Context context, float sensitivity) throws NoSuchFieldException, IllegalAccessException {
+        SlideLayout layout = (slideManager == null) ? null : slideManager.getSlideLayout();
+        if (layout == null) {
+            return;
+        }
+
+        ViewDragHelper helper = layout.getViewDragHelper();
+        if (helper == null) {
+            return;
+        }
+
+        float s = Math.max(0f, Math.min(1.0f, sensitivity));
+        ViewConfiguration conf = ViewConfiguration.get(context);
+        int touchSlop = (int) (conf.getScaledTouchSlop() * (1 / s));
+
+        Field field = ViewDragHelper.class.getDeclaredField("mTouchSlop");
+        field.setAccessible(true);
+        field.setInt(helper, touchSlop);
+    }
+
     private void setWindow() {
         Window window = getWindow();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

build.gradle

@@ -11,8 +11,8 @@ buildscript {
         // in the individual module build.gradle files
     }
     rootProject.ext {
-        versionCode = 901
-        versionName = "0.9.1"
+        versionCode = 902
+        versionName = "0.9.2"
     }
 }
 

slideback/build.gradle

@@ -29,6 +29,7 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.customview:customview:1.1.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

slideback/src/main/java/com/phantomvk/slideback/SlideLayout.java

@@ -20,10 +20,10 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.ViewCompat;
+import androidx.customview.widget.ViewDragHelper;
 
 import com.phantomvk.slideback.listener.SlideStateListener;
 import com.phantomvk.slideback.utility.TranslucentHelper;
-import com.phantomvk.slideback.utility.ViewDragHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -280,17 +280,6 @@ public void setThreshold(final float threshold) {
         mThreshold = threshold;
     }
 
-    /**
-     * Set the sensitivity.
-     *
-     * @param context     Context to get ViewConfiguration
-     * @param sensitivity value between 0 to 1, the final value for touchSlop =
-     *                    ViewConfiguration.getScaledTouchSlop * (1 / s);
-     */
-    public void setSensitivity(Context context, float sensitivity) {
-        mHelper.setSensitivity(context, sensitivity);
-    }
-
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
         if (!getFlag(FLAG_SLIDE_ENABLE)) {
@@ -584,6 +573,10 @@ public void convertFromTranslucent() {
         }
     }
 
+    public ViewDragHelper getViewDragHelper() {
+        return mHelper;
+    }
+
     /**
      * Activities cannot draw during the period that their windows are animating in. In order
      * to know when it is safe to begin drawing they can override this method which will be
@@ -743,11 +736,6 @@ public int clampViewPositionHorizontal(@NonNull View child, int left, int dx) {
             }
             return position;
         }
-
-        @Override
-        public boolean isValidMoveAction() {
-            return isFlagsEnabled();
-        }
     }
 
     private boolean getFlag(int flag) {