Fix Drawer may be opened in reverse (#4)

* Fix Drawer may be opened in reverse * Support quick dragging out with the original direction * Bump to 1.0.2 | Before | After | |---|---| | ![r-be](https://user-images.githubusercontent.com/5214214/104086078-8af44f80-528f-11eb-9b3b-4b3e34ad91ea.gif) | ![r-af](https://user-images.githubusercontent.com/5214214/104086061-71530800-528f-11eb-96e3-15655ac5870e.gif) |
PureWriter · Jan 9, 2021 · 9358853 · 9358853
1 parent 83e2979
commit 9358853
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ In your `build.gradle`:
 
 ```groovy
 dependencies {
-  implementation 'com.drakeet.drawer:drawer:1.0.1'
+  implementation 'com.drakeet.drawer:drawer:1.0.2'
   // Optional: No need if you just use the FullDraggableHelper
   implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
 }

diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,8 @@
 buildscript {
 
   ext.kotlinVersion = '1.4.21'
-  ext.buildConfig = ['versionCode'      : 4,
-                     'versionName'      : "1.0.1",
+  ext.buildConfig = ['versionCode'      : 5,
+                     'versionName'      : "1.0.2",
                      'compileSdkVersion': 30,
                      'minSdkVersion'    : 19,
                      'targetSdkVersion' : 30]

diff --git a/library/src/main/java/com/drakeet/drawer/FullDraggableContainer.java b/library/src/main/java/com/drakeet/drawer/FullDraggableContainer.java
@@ -122,7 +122,7 @@ public void onDrawerDragging() {
     if (drawerListeners != null) {
       int listenerCount = drawerListeners.size();
       for (int i = listenerCount - 1; i >= 0; --i) {
-        ((DrawerLayout.DrawerListener) drawerListeners.get(i)).onDrawerStateChanged(DrawerLayout.STATE_DRAGGING);
+        drawerListeners.get(i).onDrawerStateChanged(DrawerLayout.STATE_DRAGGING);
       }
     }
   }

diff --git a/library/src/main/java/com/drakeet/drawer/FullDraggableHelper.java b/library/src/main/java/com/drakeet/drawer/FullDraggableHelper.java
@@ -107,7 +107,17 @@ public boolean onTouchEvent(MotionEvent event) {
           // Not allowed to change direction in a process
           if (gravity == Gravity.NO_GRAVITY) {
             gravity = diffX > 0 ? Gravity.LEFT : Gravity.RIGHT;
+          } else if ((gravity == Gravity.LEFT && diffX < 0) || (gravity == Gravity.RIGHT && diffX > 0)) {
+            // Means that the motion first moves in one direction,
+            // and then completely close the drawer in the reverse direction.
+            // At this time, absDiffX should not be distributed anymore.
+            // So for this case, we are returning false,
+            // and set the initialMotionX to the direction changed point
+            // to support quick dragging out with the original direction.
+            initialMotionX = x;
+            return false;
           }
+
           callback.offsetDrawer(gravity, absDiffX - swipeSlop);
 
           if (!lastDraggingDrawer) {