build.gradle

@@ -8,8 +8,8 @@ buildscript {
         }
     }
     dependencies {
-//        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.0'
-//        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java

@@ -5,8 +5,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.recyclerview.widget.LinearLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java

@@ -1,7 +1,7 @@
 package com.daimajia.swipedemo.adapter;
 
 import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java

@@ -5,8 +5,8 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import androidx.recyclerview.widget.LinearLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 
@@ -122,4 +122,4 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
                     "DividerItemDecoration can only be used with a LinearLayoutManager.");
         }
     }
-}
+}

demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java

@@ -1,7 +1,7 @@
 package com.daimajia.swipedemo.adapter.util;
 
 import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;

demo/src/main/res/layout/recyclerview.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- A RecyclerView with some commonly used attributes -->
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scrollbars="vertical" />
+    android:scrollbars="vertical" />

library/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion 9
@@ -10,8 +11,8 @@ android {
 }
 
 dependencies {
-    compile "androidx.recyclerview:recyclerview:$androidx"
+    compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'androidx.legacy:legacy-support-v4:1.0.0'
+    compile 'com.android.support:support-v4:25.2.0'
 }
 apply from: './gradle-mvn-push.gradle'
 

library/src/main/java/com/daimajia/swipe/SwipeLayout.java

@@ -3,6 +3,9 @@ package com.daimajia.swipe;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.widget.ViewDragHelper;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.Gravity;
@@ -24,10 +27,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import androidx.core.view.GravityCompat;
-import androidx.core.view.ViewCompat;
-import androidx.customview.widget.ViewDragHelper;
-
 public class SwipeLayout extends FrameLayout {
     @Deprecated
     public static final int EMPTY_LAYOUT = -1;
@@ -144,7 +143,7 @@ public class SwipeLayout extends FrameLayout {
          * Called in onInterceptTouchEvent Determines if this swipe event should
          * be denied Implement this interface if you are using views with swipe
          * gestures As a child of SwipeLayout
-         *
+         * 
          * @return true deny false allow
          */
         boolean shouldDenySwipe(MotionEvent ev);
@@ -183,9 +182,8 @@ public class SwipeLayout extends FrameLayout {
         if (!mShowEntirely.containsKey(child)) {
             mShowEntirely.put(child, false);
         }
-        if (mRevealListeners.get(child) == null) {
+        if (mRevealListeners.get(child) == null)
             mRevealListeners.put(child, new ArrayList<OnRevealListener>());
-        }
 
         mRevealListeners.get(child).add(l);
     }
@@ -198,22 +196,17 @@ public class SwipeLayout extends FrameLayout {
      * @param l        the {@link com.daimajia.swipe.SwipeLayout.OnRevealListener}
      */
     public void addRevealListener(int[] childIds, OnRevealListener l) {
-        for (int i : childIds) {
+        for (int i : childIds)
             addRevealListener(i, l);
-        }
     }
 
     public void removeRevealListener(int childId, OnRevealListener l) {
         View child = findViewById(childId);
 
-        if (child == null) {
+        if (child == null) return;
-            return;
-        }
 
         mShowEntirely.remove(child);
-        if (mRevealListeners.containsKey(child)) {
+        if (mRevealListeners.containsKey(child)) mRevealListeners.get(child).remove(l);
-            mRevealListeners.get(child).remove(l);
-        }
     }
 
     public void removeAllRevealListeners(int childId) {
@@ -234,20 +227,14 @@ public class SwipeLayout extends FrameLayout {
                     case Bottom:
                         return getPaddingLeft();
                     case Left:
-                        if (left < getPaddingLeft()) {
+                        if (left < getPaddingLeft()) return getPaddingLeft();
-                            return getPaddingLeft();
+                        if (left > getPaddingLeft() + mDragDistance)
-                        }
-                        if (left > getPaddingLeft() + mDragDistance) {
                             return getPaddingLeft() + mDragDistance;
-                        }
                         break;
                     case Right:
-                        if (left > getPaddingLeft()) {
+                        if (left > getPaddingLeft()) return getPaddingLeft();
-                            return getPaddingLeft();
+                        if (left < getPaddingLeft() - mDragDistance)
-                        }
-                        if (left < getPaddingLeft() - mDragDistance) {
                             return getPaddingLeft() - mDragDistance;
-                        }
                         break;
                 }
             } else if (getCurrentBottomView() == child) {
@@ -258,9 +245,7 @@ public class SwipeLayout extends FrameLayout {
                         return getPaddingLeft();
                     case Left:
                         if (mShowMode == ShowMode.PullOut) {
-                            if (left > getPaddingLeft()) {
+                            if (left > getPaddingLeft()) return getPaddingLeft();
-                                return getPaddingLeft();
-                            }
                         }
                         break;
                     case Right:
@@ -283,12 +268,9 @@ public class SwipeLayout extends FrameLayout {
                     case Right:
                         return getPaddingTop();
                     case Top:
-                        if (top < getPaddingTop()) {
+                        if (top < getPaddingTop()) return getPaddingTop();
-                            return getPaddingTop();
+                        if (top > getPaddingTop() + mDragDistance)
-                        }
-                        if (top > getPaddingTop() + mDragDistance) {
                             return getPaddingTop() + mDragDistance;
-                        }
                         break;
                     case Bottom:
                         if (top < getPaddingTop() - mDragDistance) {
@@ -307,30 +289,23 @@ public class SwipeLayout extends FrameLayout {
                         return getPaddingTop();
                     case Top:
                         if (mShowMode == ShowMode.PullOut) {
-                            if (top > getPaddingTop()) {
+                            if (top > getPaddingTop()) return getPaddingTop();
-                                return getPaddingTop();
-                            }
                         } else {
-                            if (surfaceViewTop + dy < getPaddingTop()) {
+                            if (surfaceViewTop + dy < getPaddingTop())
                                 return getPaddingTop();
-                            }
+                            if (surfaceViewTop + dy > getPaddingTop() + mDragDistance)
-                            if (surfaceViewTop + dy > getPaddingTop() + mDragDistance) {
                                 return getPaddingTop() + mDragDistance;
-                            }
                         }
                         break;
                     case Bottom:
                         if (mShowMode == ShowMode.PullOut) {
-                            if (top < getMeasuredHeight() - mDragDistance) {
+                            if (top < getMeasuredHeight() - mDragDistance)
                                 return getMeasuredHeight() - mDragDistance;
-                            }
                         } else {
-                            if (surfaceViewTop + dy >= getPaddingTop()) {
+                            if (surfaceViewTop + dy >= getPaddingTop())
                                 return getPaddingTop();
-                            }
+                            if (surfaceViewTop + dy <= getPaddingTop() - mDragDistance)
-                            if (surfaceViewTop + dy <= getPaddingTop() - mDragDistance) {
                                 return getPaddingTop() - mDragDistance;
-                            }
                         }
                 }
             }
@@ -372,9 +347,7 @@ public class SwipeLayout extends FrameLayout {
         @Override
         public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
             View surfaceView = getSurfaceView();
-            if (surfaceView == null) {
+            if (surfaceView == null) return;
-                return;
-            }
             View currentBottomView = getCurrentBottomView();
             int evLeft = surfaceView.getLeft(),
                     evRight = surfaceView.getRight(),
@@ -403,15 +376,14 @@ public class SwipeLayout extends FrameLayout {
 
                     int newLeft = surfaceView.getLeft() + dx, newTop = surfaceView.getTop() + dy;
 
-                    if (mCurrentDragEdge == DragEdge.Left && newLeft < getPaddingLeft()) {
+                    if (mCurrentDragEdge == DragEdge.Left && newLeft < getPaddingLeft())
                         newLeft = getPaddingLeft();
-                    } else if (mCurrentDragEdge == DragEdge.Right && newLeft > getPaddingLeft()) {
+                    else if (mCurrentDragEdge == DragEdge.Right && newLeft > getPaddingLeft())
                         newLeft = getPaddingLeft();
-                    } else if (mCurrentDragEdge == DragEdge.Top && newTop < getPaddingTop()) {
+                    else if (mCurrentDragEdge == DragEdge.Top && newTop < getPaddingTop())
                         newTop = getPaddingTop();
-                    } else if (mCurrentDragEdge == DragEdge.Bottom && newTop > getPaddingTop()) {
+                    else if (mCurrentDragEdge == DragEdge.Bottom && newTop > getPaddingTop())
                         newTop = getPaddingTop();
-                    }
 
                     surfaceView.layout(newLeft, newTop, newLeft + getMeasuredWidth(), newTop + getMeasuredHeight());
                 }
@@ -458,9 +430,7 @@ public class SwipeLayout extends FrameLayout {
      */
     protected boolean isViewTotallyFirstShowed(View child, Rect relativePosition, DragEdge edge, int surfaceLeft,
                                                int surfaceTop, int surfaceRight, int surfaceBottom) {
-        if (mShowEntirely.get(child)) {
+        if (mShowEntirely.get(child)) return false;
-            return false;
-        }
         int childLeft = relativePosition.left;
         int childRight = relativePosition.right;
         int childTop = relativePosition.top;
@@ -470,16 +440,12 @@ public class SwipeLayout extends FrameLayout {
             if ((edge == DragEdge.Right && surfaceRight <= childLeft)
                     || (edge == DragEdge.Left && surfaceLeft >= childRight)
                     || (edge == DragEdge.Top && surfaceTop >= childBottom)
-                    || (edge == DragEdge.Bottom && surfaceBottom <= childTop)) {
+                    || (edge == DragEdge.Bottom && surfaceBottom <= childTop)) r = true;
-                r = true;
-            }
         } else if (getShowMode() == ShowMode.PullOut) {
             if ((edge == DragEdge.Right && childRight <= getWidth())
                     || (edge == DragEdge.Left && childLeft >= getPaddingLeft())
                     || (edge == DragEdge.Top && childTop >= getPaddingTop())
-                    || (edge == DragEdge.Bottom && childBottom <= getHeight())) {
+                    || (edge == DragEdge.Bottom && childBottom <= getHeight())) r = true;
-                r = true;
-            }
         }
         return r;
     }
@@ -516,24 +482,16 @@ public class SwipeLayout extends FrameLayout {
         } else if (getShowMode() == ShowMode.PullOut) {
             switch (availableEdge) {
                 case Right:
-                    if (childLeft <= getWidth() && childRight > getWidth()) {
+                    if (childLeft <= getWidth() && childRight > getWidth()) return true;
-                        return true;
-                    }
                     break;
                 case Left:
-                    if (childRight >= getPaddingLeft() && childLeft < getPaddingLeft()) {
+                    if (childRight >= getPaddingLeft() && childLeft < getPaddingLeft()) return true;
-                        return true;
-                    }
                     break;
                 case Top:
-                    if (childTop < getPaddingTop() && childBottom >= getPaddingTop()) {
+                    if (childTop < getPaddingTop() && childBottom >= getPaddingTop()) return true;
-                        return true;
-                    }
                     break;
                 case Bottom:
-                    if (childTop < getHeight() && childTop >= getPaddingTop()) {
+                    if (childTop < getHeight() && childTop >= getPaddingTop()) return true;
-                        return true;
-                    }
                     break;
             }
         }
@@ -545,9 +503,7 @@ public class SwipeLayout extends FrameLayout {
         Rect r = new Rect(t.getLeft(), t.getTop(), 0, 0);
         while (t.getParent() != null && t != getRootView()) {
             t = (View) t.getParent();
-            if (t == this) {
+            if (t == this) break;
-                break;
-            }
             r.left += t.getLeft();
             r.top += t.getTop();
         }
@@ -562,21 +518,13 @@ public class SwipeLayout extends FrameLayout {
         DragEdge edge = getDragEdge();
         boolean open = true;
         if (edge == DragEdge.Left) {
-            if (dx < 0) {
+            if (dx < 0) open = false;
-                open = false;
-            }
         } else if (edge == DragEdge.Right) {
-            if (dx > 0) {
+            if (dx > 0) open = false;
-                open = false;
-            }
         } else if (edge == DragEdge.Top) {
-            if (dy < 0) {
+            if (dy < 0) open = false;
-                open = false;
-            }
         } else if (edge == DragEdge.Bottom) {
-            if (dy > 0) {
+            if (dy > 0) open = false;
-                open = false;
-            }
         }
 
         dispatchSwipeEvent(surfaceLeft, surfaceTop, open);
@@ -642,9 +590,7 @@ public class SwipeLayout extends FrameLayout {
 
     protected void dispatchRevealEvent(final int surfaceLeft, final int surfaceTop, final int surfaceRight,
                                        final int surfaceBottom) {
-        if (mRevealListeners.isEmpty()) {
+        if (mRevealListeners.isEmpty()) return;
-            return;
-        }
         for (Map.Entry<View, ArrayList<OnRevealListener>> entry : mRevealListeners.entrySet()) {
             View child = entry.getKey();
             Rect rect = getRelativePosition(child);
@@ -706,11 +652,10 @@ public class SwipeLayout extends FrameLayout {
                 mShowEntirely.put(child, true);
                 for (OnRevealListener l : entry.getValue()) {
                     if (mCurrentDragEdge == DragEdge.Left
-                            || mCurrentDragEdge == DragEdge.Right) {
+                            || mCurrentDragEdge == DragEdge.Right)
                         l.onReveal(child, mCurrentDragEdge, 1, child.getWidth());
-                    } else {
+                    else
                         l.onReveal(child, mCurrentDragEdge, 1, child.getHeight());
-                    }
                 }
             }
 
@@ -736,16 +681,12 @@ public class SwipeLayout extends FrameLayout {
     private List<OnLayout> mOnLayoutListeners;
 
     public void addOnLayoutListener(OnLayout l) {
-        if (mOnLayoutListeners == null) {
+        if (mOnLayoutListeners == null) mOnLayoutListeners = new ArrayList<OnLayout>();
-            mOnLayoutListeners = new ArrayList<OnLayout>();
-        }
         mOnLayoutListeners.add(l);
     }
 
     public void removeOnLayoutListener(OnLayout l) {
-        if (mOnLayoutListeners != null) {
+        if (mOnLayoutListeners != null) mOnLayoutListeners.remove(l);
-            mOnLayoutListeners.remove(l);
-        }
     }
 
     public void clearDragEdge() {
@@ -771,9 +712,7 @@ public class SwipeLayout extends FrameLayout {
     }
 
     public void addDrag(DragEdge dragEdge, View child, ViewGroup.LayoutParams params) {
-        if (child == null) {
+        if (child == null) return;
-            return;
-        }
 
         if (params == null) {
             params = generateDefaultLayoutParams();
@@ -804,9 +743,7 @@ public class SwipeLayout extends FrameLayout {
 
     @Override
     public void addView(View child, int index, ViewGroup.LayoutParams params) {
-        if (child == null) {
+        if (child == null) return;
-            return;
-        }
         int gravity = Gravity.NO_GRAVITY;
         try {
             gravity = (Integer) params.getClass().getField("gravity").get(params);
@@ -848,28 +785,23 @@ public class SwipeLayout extends FrameLayout {
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         updateBottomViews();
 
-        if (mOnLayoutListeners != null) {
+        if (mOnLayoutListeners != null) for (int i = 0; i < mOnLayoutListeners.size(); i++) {
-            for (int i = 0; i < mOnLayoutListeners.size(); i++) {
+            mOnLayoutListeners.get(i).onLayout(this);
-                mOnLayoutListeners.get(i).onLayout(this);
-            }
         }
     }
 
     void layoutPullOut() {
         View surfaceView = getSurfaceView();
         Rect surfaceRect = mViewBoundCache.get(surfaceView);
-        if (surfaceRect == null) {
+        if (surfaceRect == null) surfaceRect = computeSurfaceLayoutArea(false);
-            surfaceRect = computeSurfaceLayoutArea(false);
-        }
         if (surfaceView != null) {
             surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
             bringChildToFront(surfaceView);
         }
         View currentBottomView = getCurrentBottomView();
         Rect bottomViewRect = mViewBoundCache.get(currentBottomView);
-        if (bottomViewRect == null) {
+        if (bottomViewRect == null)
             bottomViewRect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, surfaceRect);
-        }
         if (currentBottomView != null) {
             currentBottomView.layout(bottomViewRect.left, bottomViewRect.top, bottomViewRect.right, bottomViewRect.bottom);
         }
@@ -878,18 +810,15 @@ public class SwipeLayout extends FrameLayout {
     void layoutLayDown() {
         View surfaceView = getSurfaceView();
         Rect surfaceRect = mViewBoundCache.get(surfaceView);
-        if (surfaceRect == null) {
+        if (surfaceRect == null) surfaceRect = computeSurfaceLayoutArea(false);
-            surfaceRect = computeSurfaceLayoutArea(false);
-        }
         if (surfaceView != null) {
             surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
             bringChildToFront(surfaceView);
         }
         View currentBottomView = getCurrentBottomView();
         Rect bottomViewRect = mViewBoundCache.get(currentBottomView);
-        if (bottomViewRect == null) {
+        if (bottomViewRect == null)
             bottomViewRect = computeBottomLayoutAreaViaSurface(ShowMode.LayDown, surfaceRect);
-        }
         if (currentBottomView != null) {
             currentBottomView.layout(bottomViewRect.left, bottomViewRect.top, bottomViewRect.right, bottomViewRect.bottom);
         }
@@ -898,9 +827,7 @@ public class SwipeLayout extends FrameLayout {
     private boolean mIsBeingDragged;
 
     private void checkCanDrag(MotionEvent ev) {
-        if (mIsBeingDragged) {
+        if (mIsBeingDragged) return;
-            return;
-        }
         if (getOpenStatus() == Status.Middle) {
             mIsBeingDragged = true;
             return;
@@ -917,18 +844,14 @@ public class SwipeLayout extends FrameLayout {
                     dragEdge = DragEdge.Left;
                 } else if (distanceX < 0 && isRightSwipeEnabled()) {
                     dragEdge = DragEdge.Right;
-                } else {
+                } else return;
-                    return;
-                }
 
             } else {
                 if (distanceY > 0 && isTopSwipeEnabled()) {
                     dragEdge = DragEdge.Top;
                 } else if (distanceY < 0 && isBottomSwipeEnabled()) {
                     dragEdge = DragEdge.Bottom;
-                } else {
+                } else return;
-                    return;
-                }
             }
             setCurrentDragEdge(dragEdge);
         }
@@ -1032,9 +955,7 @@ public class SwipeLayout extends FrameLayout {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        if (!isSwipeEnabled()) {
+        if (!isSwipeEnabled()) return super.onTouchEvent(event);
-            return super.onTouchEvent(event);
-        }
 
         int action = event.getActionMasked();
         gestureDetector.onTouchEvent(event);
@@ -1177,9 +1098,7 @@ public class SwipeLayout extends FrameLayout {
     }
 
     private void performAdapterViewItemClick() {
-        if (getOpenStatus() != Status.Close) {
+        if (getOpenStatus() != Status.Close) return;
-            return;
-        }
         ViewParent t = getParent();
         if (t instanceof AdapterView) {
             AdapterView view = (AdapterView) t;
@@ -1192,16 +1111,12 @@ public class SwipeLayout extends FrameLayout {
     }
 
     private boolean performAdapterViewItemLongClick() {
-        if (getOpenStatus() != Status.Close) {
+        if (getOpenStatus() != Status.Close) return false;
-            return false;
-        }
         ViewParent t = getParent();
         if (t instanceof AdapterView) {
             AdapterView view = (AdapterView) t;
             int p = view.getPositionForView(SwipeLayout.this);
-            if (p == AdapterView.INVALID_POSITION) {
+            if (p == AdapterView.INVALID_POSITION) return false;
-                return false;
-            }
             long vId = view.getItemIdAtPosition(p);
             boolean handled = false;
             try {
@@ -1314,9 +1229,7 @@ public class SwipeLayout extends FrameLayout {
      * @param max max distance in dp unit
      */
     public void setDragDistance(int max) {
-        if (max < 0) {
+        if (max < 0) max = 0;
-            max = 0;
-        }
         mDragDistance = dp2px(max);
         requestLayout();
     }
@@ -1349,9 +1262,7 @@ public class SwipeLayout extends FrameLayout {
      * return null if there is no surface view(no children)
      */
     public View getSurfaceView() {
-        if (getChildCount() == 0) {
+        if (getChildCount() == 0) return null;
-            return null;
-        }
         return getChildAt(getChildCount() - 1);
     }
 
@@ -1396,14 +1307,11 @@ public class SwipeLayout extends FrameLayout {
         }
         int surfaceLeft = surfaceView.getLeft();
         int surfaceTop = surfaceView.getTop();
-        if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop() && !mIsBeingDragged) {
+        if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop()) return Status.Close;
-            return Status.Close;
-        }
 
         if (surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance)
-                || surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance)) {
+                || surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance))
             return Status.Open;
-        }
 
         return Status.Middle;
     }
@@ -1425,56 +1333,36 @@ public class SwipeLayout extends FrameLayout {
         }
         float willOpenPercent = (isCloseBeforeDragged ? mWillOpenPercentAfterClose : mWillOpenPercentAfterOpen);
         if (currentDragEdge == DragEdge.Left) {
-            if (xvel > minVelocity) {
+            if (xvel > minVelocity) open();
-                open();
+            else if (xvel < -minVelocity) close();
-            } else if (xvel < -minVelocity) {
+            else {
-                close();
-            } else {
                 float openPercent = 1f * getSurfaceView().getLeft() / mDragDistance;
-                if (openPercent > willOpenPercent) {
+                if (openPercent > willOpenPercent) open();
-                    open();
+                else close();
-                } else {
-                    close();
-                }
             }
         } else if (currentDragEdge == DragEdge.Right) {
-            if (xvel > minVelocity) {
+            if (xvel > minVelocity) close();
-                close();
+            else if (xvel < -minVelocity) open();
-            } else if (xvel < -minVelocity) {
+            else {
-                open();
-            } else {
                 float openPercent = 1f * (-getSurfaceView().getLeft()) / mDragDistance;
-                if (openPercent > willOpenPercent) {
+                if (openPercent > willOpenPercent) open();
-                    open();
+                else close();
-                } else {
-                    close();
-                }
             }
         } else if (currentDragEdge == DragEdge.Top) {
-            if (yvel > minVelocity) {
+            if (yvel > minVelocity) open();
-                open();
+            else if (yvel < -minVelocity) close();
-            } else if (yvel < -minVelocity) {
+            else {
-                close();
-            } else {
                 float openPercent = 1f * getSurfaceView().getTop() / mDragDistance;
-                if (openPercent > willOpenPercent) {
+                if (openPercent > willOpenPercent) open();
-                    open();
+                else close();
-                } else {
-                    close();
-                }
             }
         } else if (currentDragEdge == DragEdge.Bottom) {
-            if (yvel > minVelocity) {
+            if (yvel > minVelocity) close();
-                close();
+            else if (yvel < -minVelocity) open();
-            } else if (yvel < -minVelocity) {
+            else {
-                open();
-            } else {
                 float openPercent = 1f * (-getSurfaceView().getTop()) / mDragDistance;
-                if (openPercent > willOpenPercent) {
+                if (openPercent > willOpenPercent) open();
-                    open();
+                else close();
-                } else {
-                    close();
-                }
             }
         }
     }
@@ -1557,9 +1445,9 @@ public class SwipeLayout extends FrameLayout {
             return;
         }
         int dx, dy;
-        if (smooth) {
+        if (smooth)
             mDragHelper.smoothSlideViewTo(getSurfaceView(), getPaddingLeft(), getPaddingTop());
-        } else {
+        else {
             Rect rect = computeSurfaceLayoutArea(false);
             dx = rect.left - surface.getLeft();
             dy = rect.top - surface.getTop();
@@ -1579,11 +1467,9 @@ public class SwipeLayout extends FrameLayout {
     }
 
     public void toggle(boolean smooth) {
-        if (getOpenStatus() == Status.Open) {
+        if (getOpenStatus() == Status.Open)
             close(smooth);
-        } else if (getOpenStatus() == Status.Close) {
+        else if (getOpenStatus() == Status.Close) open(smooth);
-            open(smooth);
-        }
     }
 
 
@@ -1595,15 +1481,13 @@ public class SwipeLayout extends FrameLayout {
     private Rect computeSurfaceLayoutArea(boolean open) {
         int l = getPaddingLeft(), t = getPaddingTop();
         if (open) {
-            if (mCurrentDragEdge == DragEdge.Left) {
+            if (mCurrentDragEdge == DragEdge.Left)
                 l = getPaddingLeft() + mDragDistance;
-            } else if (mCurrentDragEdge == DragEdge.Right) {
+            else if (mCurrentDragEdge == DragEdge.Right)
                 l = getPaddingLeft() - mDragDistance;
-            } else if (mCurrentDragEdge == DragEdge.Top) {
+            else if (mCurrentDragEdge == DragEdge.Top)
                 t = getPaddingTop() + mDragDistance;
-            } else {
+            else t = getPaddingTop() - mDragDistance;
-                t = getPaddingTop() - mDragDistance;
-            }
         }
         return new Rect(l, t, l + getMeasuredWidth(), t + getMeasuredHeight());
     }
@@ -1614,15 +1498,13 @@ public class SwipeLayout extends FrameLayout {
 
         int bl = rect.left, bt = rect.top, br = rect.right, bb = rect.bottom;
         if (mode == ShowMode.PullOut) {
-            if (mCurrentDragEdge == DragEdge.Left) {
+            if (mCurrentDragEdge == DragEdge.Left)
                 bl = rect.left - mDragDistance;
-            } else if (mCurrentDragEdge == DragEdge.Right) {
+            else if (mCurrentDragEdge == DragEdge.Right)
                 bl = rect.right;
-            } else if (mCurrentDragEdge == DragEdge.Top) {
+            else if (mCurrentDragEdge == DragEdge.Top)
                 bt = rect.top - mDragDistance;
-            } else {
+            else bt = rect.bottom;
-                bt = rect.bottom;
-            }
 
             if (mCurrentDragEdge == DragEdge.Left || mCurrentDragEdge == DragEdge.Right) {
                 bb = rect.bottom;
@@ -1632,15 +1514,13 @@ public class SwipeLayout extends FrameLayout {
                 br = rect.right;
             }
         } else if (mode == ShowMode.LayDown) {
-            if (mCurrentDragEdge == DragEdge.Left) {
+            if (mCurrentDragEdge == DragEdge.Left)
                 br = bl + mDragDistance;
-            } else if (mCurrentDragEdge == DragEdge.Right) {
+            else if (mCurrentDragEdge == DragEdge.Right)
                 bl = br - mDragDistance;
-            } else if (mCurrentDragEdge == DragEdge.Top) {
+            else if (mCurrentDragEdge == DragEdge.Top)
                 bb = bt + mDragDistance;
-            } else {
+            else bt = bb - mDragDistance;
-                bt = bb - mDragDistance;
-            }
 
         }
         return new Rect(bl, bt, br, bb);
@@ -1750,9 +1630,7 @@ public class SwipeLayout extends FrameLayout {
     }
 
     private float getCurrentOffset() {
-        if (mCurrentDragEdge == null) {
+        if (mCurrentDragEdge == null) return 0;
-            return 0;
-        }
         return mEdgeSwipesOffset[mCurrentDragEdge.ordinal()];
     }
 

library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java

@@ -2,6 +2,7 @@ package com.daimajia.swipe.adapters;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.support.v4.widget.CursorAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -13,8 +14,6 @@ import com.daimajia.swipe.util.Attributes;
 
 import java.util.List;
 
-import androidx.cursoradapter.widget.CursorAdapter;
-
 public abstract class CursorSwipeAdapter extends CursorAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
     private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);

library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java

@@ -1,6 +1,6 @@
 package com.daimajia.swipe.adapters;
 
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import com.daimajia.swipe.SwipeLayout;

library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java

@@ -2,6 +2,7 @@ package com.daimajia.swipe.adapters;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -13,8 +14,6 @@ import com.daimajia.swipe.util.Attributes;
 
 import java.util.List;
 
-import androidx.cursoradapter.widget.SimpleCursorAdapter;
-
 public abstract class SimpleCursorSwipeAdapter extends SimpleCursorAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
     private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);