Fix Drawer can be over-offset (#3)

* Bump to 1.0.1
PureWriter · Jan 5, 2021 · 83e2979 · 83e2979
1 parent cf66a94
commit 83e2979
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 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.0'
+  implementation 'com.drakeet.drawer:drawer:1.0.1'
   // Optional: No need if you just use the FullDraggableHelper
   implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
 }
@@ -62,7 +62,7 @@ See `com.drakeet.drawer.FullDraggableHelper`
 ## TODO
 
 - [x] Add support for the right drawer / RTL
-- [x] Add support for other kinds of drawer
+- [x] Add support for other kinds of drawers
 
 License
 -------

diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,8 @@
 buildscript {
 
   ext.kotlinVersion = '1.4.21'
-  ext.buildConfig = ['versionCode'      : 3,
-                     'versionName'      : "1.0.0",
+  ext.buildConfig = ['versionCode'      : 4,
+                     'versionName'      : "1.0.1",
                      '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
@@ -25,6 +25,7 @@
 import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.math.MathUtils;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -141,7 +142,7 @@ protected List<DrawerLayout.DrawerListener> getDrawerListeners() {
 
   protected void setDrawerToOffset(int gravity, float offset) {
     View drawerView = findDrawerWithGravity(gravity);
-    float slideOffsetPercent = offset / requireNonNull(drawerView).getWidth();
+    float slideOffsetPercent = MathUtils.clamp(offset / requireNonNull(drawerView).getWidth(), 0f, 1f);
     try {
       Method method = DrawerLayout.class.getDeclaredMethod("moveDrawerToOffset", View.class, float.class);
       method.setAccessible(true);