diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1d9b70c..c13ab96 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..ae78c11 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,113 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <codeStyleSettings language="XML">
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d35a3ac..6c668ea 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..6a23c90 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -2,25 +2,39 @@
 <project version="4">
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="5">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
         </list>
       </value>
     </option>
diff --git a/README.md b/README.md
index 8f12cc7..89d4cab 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,12 @@
 # SwipeMenuRecyclerView
+
 ![](http://upload-images.jianshu.io/upload_images/2202079-68f9a97838a05c53.gif?imageMogr2/auto-orient/strip)
 
-### Usage
+## Usage
+
 <b>Step 1. Add the JitPack repository to your build file</b>
-Add it in your root build.gradle at the end of repositories:
+Add it in your root `build.gradle` at the end of repositories:
+
 ```
 	allprojects {
 		repositories {
@@ -12,9 +15,19 @@ Add it in your root build.gradle at the end of repositories:
 		}
 	}
 ```
+
 <b>Step 2. Add the dependency</b>
+
 ```
 dependencies {
-	        compile 'com.github.AItsuki:SwipeMenuRecyclerView:1.1.3'
+	        compile 'com.github.AItsuki:SwipeMenuRecyclerView:1.1.4'
 	}
 ```
+
+# 存在问题
+
+## 点击事件bug
+
+`SwipeItemLayout`默认设置了`clickable`为true，会拦截掉parent的点击事件。所以如果SwipeItemLayout不是RecyclerView的Item的根布局，那么通过`ViewHolder.itemView.setOnClickListener`设置的点击时间将不起作用。需要将点击事件设置到`SwipeItemLayout`上。
+
+
diff --git a/build.gradle b/build.gradle
index 1bae3a6..5d670ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/demo/build.gradle b/demo/build.gradle
index c909021..70bd7bf 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.aitsuki.swipedemo"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -16,8 +16,6 @@ android {
         }
     }
 
-
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -26,10 +24,8 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-
     implementation project(':library')
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
-    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.40'
-    implementation 'com.android.support:recyclerview-v7:28.0.0-rc02'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
 }
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 3b43c1d..00667a5 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -15,8 +15,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".NativeRecyclerViewAdapterActivity" />
-        <activity android:name=".CymChadActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/demo/src/main/java/com/aitsuki/swipedemo/CymChadActivity.java b/demo/src/main/java/com/aitsuki/swipedemo/CymChadActivity.java
deleted file mode 100644
index 73cb786..0000000
--- a/demo/src/main/java/com/aitsuki/swipedemo/CymChadActivity.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.aitsuki.swipedemo;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import com.aitsuki.swipe.SwipeItemLayout;
-import com.aitsuki.swipedemo.data.Repository;
-import com.aitsuki.swipedemo.entity.Data;
-import com.aitsuki.swipedemo.entity.Type;
-import com.aitsuki.swipedemo.util.ToastUtil;
-import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
-import com.chad.library.adapter.base.BaseViewHolder;
-
-import java.util.List;
-
-/**
- * Created by AItsuki on 2017/7/11.
- * 使用CymChad的adapter库
- * <a href = "https://github.com/CymChad/BaseRecyclerViewAdapterHelper">
- * BaseRecyclerViewAdapterHelper
- * <a/>
- */
-public class CymChadActivity extends AppCompatActivity {
-
-    public static Intent getCallingIntent(Context context) {
-        return new Intent(context, CymChadActivity.class);
-    }
-
-    ItemTouchListener mItemTouchListener = new ItemTouchListener() {
-        @Override
-        public void onItemClick(String str) {
-            ToastUtil.show(str);
-        }
-
-        @Override
-        public void onLeftMenuClick(String str) {
-            ToastUtil.show(str);
-        }
-
-        @Override
-        public void onRightMenuClick(String str) {
-            ToastUtil.show(str);
-        }
-    };
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_swipe_menu_recyclerview);
-
-        RecyclerView recyclerView = findViewById(R.id.recyclerView);
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
-        recyclerView.setLayoutManager(linearLayoutManager);
-        DividerItemDecoration dividerItemDecoration =
-                new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
-        recyclerView.addItemDecoration(dividerItemDecoration);
-
-        DemoAdapter demoAdapter = new DemoAdapter(new Repository().fakeDate(), mItemTouchListener);
-        recyclerView.setAdapter(demoAdapter);
-    }
-
-    private class DemoAdapter extends BaseMultiItemQuickAdapter<Data, BaseViewHolder> {
-
-        private ItemTouchListener mItemTouchListener;
-
-        DemoAdapter(List<Data> data, ItemTouchListener touchListener) {
-            super(data);
-            mItemTouchListener = touchListener;
-            addItemType(Type.LEFT_MENU, R.layout.item_left_menu);
-            addItemType(Type.RIGHT_MENU, R.layout.item_right_menu);
-            addItemType(Type.LEFT_AND_RIGHT_MENU, R.layout.item_left_and_right_menu);
-            addItemType(Type.LEFT_LONG_MENU, R.layout.item_left_long_menu);
-            addItemType(Type.RIGHT_LONG_MENU, R.layout.item_right_long_menu);
-            addItemType(Type.LEFT_AND_RIGHT_LONG_MENU, R.layout.item_left_and_right_long_menu);
-            addItemType(Type.DISABLE_SWIPE_MENU, R.layout.item_disable_swipe_menu);
-        }
-
-        @Override
-        protected void convert(BaseViewHolder helper, Data data) {
-            helper.setText(R.id.tv_content, data.content + " " + helper.getAdapterPosition());
-            final SwipeItemLayout swipeLayout = (SwipeItemLayout) helper.itemView;
-            swipeLayout.setSwipeEnable(helper.getItemViewType() != Type.DISABLE_SWIPE_MENU);
-
-            // 不使用helper设置点击事件是因为这个库是使用RecyclerView.addOnItemTouchListener模拟的点击事件
-            // 实际上点击事件不是发生在View上。
-            // 这引发了非常多的隐性问题，比如它无法响应到item的cancel事件。
-            // 而SwipeMenuLayout中滑动菜单和点击已打开的Content时都会发送一个cancel事件。
-
-            // 另外一个问题就是通过addOnItemTouchListener模拟的点击事件对于长按的处理不够完善。
-            // 例如你并不想设置长按事件，但是默认情况下它都会响应长按，并且强行给你一个震动效果。
-            // 而且如果你的itemView设置了selector背景，当你长按child时，itemView的背景也会变化。
-
-            // 综合来说，简单的Item使用addOnItemTouchListener模拟点击设置点击事件是非常便利的，这个库已经做得
-            // 非常好了。但是因为View的复杂性，不可能做的完美。这种情况下就需要禁用addOnItemTouchListener。使
-            // 用原生的方式设置点击事件。
-
-            helper.itemView.setOnClickListener(v -> mItemTouchListener.onItemClick(data.content));
-            final View leftMenu = helper.getView(R.id.left_menu);
-            if (leftMenu != null) {
-                leftMenu.setOnClickListener(v -> {
-                    mItemTouchListener.onLeftMenuClick("left " + helper.getAdapterPosition());
-                    swipeLayout.close();
-                });
-            }
-
-            final View rightMenu = helper.getView(R.id.right_menu);
-            if (rightMenu != null) {
-                rightMenu.setOnClickListener(v -> {
-                    mItemTouchListener.onLeftMenuClick("right " + helper.getAdapterPosition());
-                    swipeLayout.close();
-                });
-            }
-        }
-    }
-}
diff --git a/demo/src/main/java/com/aitsuki/swipedemo/MainActivity.java b/demo/src/main/java/com/aitsuki/swipedemo/MainActivity.java
index d6efc48..0a5c3d1 100644
--- a/demo/src/main/java/com/aitsuki/swipedemo/MainActivity.java
+++ b/demo/src/main/java/com/aitsuki/swipedemo/MainActivity.java
@@ -1,29 +1,179 @@
 package com.aitsuki.swipedemo;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
 
-import com.aitsuki.swipedemo.util.ToastUtil;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.aitsuki.swipe.SwipeItemLayout;
+import com.aitsuki.swipe.SwipeMenuRecyclerView;
+import com.aitsuki.swipedemo.data.Repository;
+import com.aitsuki.swipedemo.entity.Data;
+import com.aitsuki.swipedemo.entity.Type;
+
+import java.util.List;
 
 public class MainActivity extends AppCompatActivity {
 
+    private SwipeMenuRecyclerView recyclerView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ToastUtil.init(getApplication());
+        recyclerView = findViewById(R.id.recyclerView);
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+        recyclerView.setLayoutManager(linearLayoutManager);
+        DividerItemDecoration dividerItemDecoration =
+                new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
+        recyclerView.addItemDecoration(dividerItemDecoration);
+
+        DemoAdapter adapter = new DemoAdapter(new Repository().fakeDate(), mItemTouchListener);
+        recyclerView.setAdapter(adapter);
     }
 
+    ItemTouchListener mItemTouchListener = new ItemTouchListener() {
+        @Override
+        public void onItemClick(String str) {
+            Toast.makeText(MainActivity.this, str, Toast.LENGTH_SHORT).show();
+        }
+
+        @Override
+        public void onLeftMenuClick(String str) {
+            Toast.makeText(MainActivity.this, str, Toast.LENGTH_SHORT).show();
+        }
+
+        @Override
+        public void onRightMenuClick(String str) {
+            Toast.makeText(MainActivity.this, str, Toast.LENGTH_SHORT).show();
+        }
+    };
+
+    private static class DemoAdapter extends RecyclerView.Adapter<SimpleViewHolder> {
+
+        private ItemTouchListener mItemTouchListener;
+        private List<Data> mData;
+
+        DemoAdapter(List<Data> data, ItemTouchListener itemTouchListener) {
+            this.mData = data;
+            this.mItemTouchListener = itemTouchListener;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return mData.get(position).type;
+        }
+
+        @Override
+        public int getItemCount() {
+            return mData.size();
+        }
+
+
+        @NonNull
+        @Override
+        public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+            @LayoutRes
+            int layout;
+
+            switch (viewType) {
+                case Type.LEFT_MENU:
+                    layout = R.layout.item_left_menu;
+                    break;
+                case Type.RIGHT_MENU:
+                    layout = R.layout.item_right_menu;
+                    break;
+                case Type.LEFT_AND_RIGHT_MENU:
+                    layout = R.layout.item_left_and_right_menu;
+                    break;
+                case Type.LEFT_LONG_MENU:
+                    layout = R.layout.item_left_long_menu;
+                    break;
+                case Type.RIGHT_LONG_MENU:
+                    layout = R.layout.item_right_long_menu;
+                    break;
+                case Type.LEFT_AND_RIGHT_LONG_MENU:
+                    layout = R.layout.item_left_and_right_long_menu;
+                    break;
+                default:
+                    layout = R.layout.item_disable_swipe_menu;
+                    break;
+            }
+            View rootView = LayoutInflater.from(parent.getContext()).inflate(layout, parent, false);
+            return new SimpleViewHolder(rootView);
+        }
+
+        @Override
+        public void onBindViewHolder(final SimpleViewHolder holder, int position) {
+            holder.mContent.setText(mData.get(position).content.concat(" " + position));
+            holder.mSwipeItemLayout.setSwipeEnable(getItemViewType(position) != Type.DISABLE_SWIPE_MENU);
+            if (mItemTouchListener != null) {
+                holder.mSwipeItemLayout.setOnClickListener(v -> mItemTouchListener.onItemClick(holder.mContent.getText().toString()));
+
+                if (holder.mCardView != null) {
+                    holder.mCardView.setOnClickListener(v -> mItemTouchListener.onItemClick(holder.mContent.getText().toString()));
+                }
+
+                if (holder.mLeftMenu != null) {
+                    holder.mLeftMenu.setOnClickListener(v -> {
+                        mItemTouchListener.onLeftMenuClick("left " + holder.getAdapterPosition());
+                        holder.mSwipeItemLayout.close();
+                    });
+                }
+
+                if (holder.mRightMenu != null) {
+                    holder.mRightMenu.setOnClickListener(v -> {
+                        mItemTouchListener.onRightMenuClick("right " + holder.getAdapterPosition());
+                        holder.mSwipeItemLayout.close();
+                    });
+                }
+            }
+        }
 
-    public void onNativeAdapterClick(View view) {
-        Intent callingIntent = NativeRecyclerViewAdapterActivity.getCallingIntent(this);
-        startActivity(callingIntent);
     }
 
-    public void onBaseRecyclerViewAdapterHelperClick(View view) {
-        Intent callingIntent = CymChadActivity.getCallingIntent(this);
-        startActivity(callingIntent);
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.action_menu, menu);
+        menu.findItem(R.id.enableTouchAlways).setChecked(recyclerView.isEnableTouchAlways());
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        item.setChecked(!item.isChecked());
+        recyclerView.setEnableTouchAlways(item.isChecked());
+        return false;
+    }
+
+    private static class SimpleViewHolder extends RecyclerView.ViewHolder {
+
+        private final View mLeftMenu;
+        private final View mRightMenu;
+        private final TextView mContent;
+        private final SwipeItemLayout mSwipeItemLayout;
+        private final CardView mCardView;
+
+        SimpleViewHolder(View itemView) {
+            super(itemView);
+            mSwipeItemLayout = itemView.findViewById(R.id.swipe_layout);
+            mCardView = itemView.findViewById(R.id.card_view);
+            mContent = itemView.findViewById(R.id.tv_content);
+            mLeftMenu = itemView.findViewById(R.id.left_menu);
+            mRightMenu = itemView.findViewById(R.id.right_menu);
+        }
     }
 }
diff --git a/demo/src/main/java/com/aitsuki/swipedemo/NativeRecyclerViewAdapterActivity.java b/demo/src/main/java/com/aitsuki/swipedemo/NativeRecyclerViewAdapterActivity.java
deleted file mode 100644
index 379a5be..0000000
--- a/demo/src/main/java/com/aitsuki/swipedemo/NativeRecyclerViewAdapterActivity.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.aitsuki.swipedemo;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.aitsuki.swipe.SwipeItemLayout;
-import com.aitsuki.swipedemo.data.Repository;
-import com.aitsuki.swipedemo.entity.Data;
-import com.aitsuki.swipedemo.entity.Type;
-import com.aitsuki.swipedemo.util.ToastUtil;
-
-import java.util.List;
-
-public class NativeRecyclerViewAdapterActivity extends AppCompatActivity {
-
-    public static Intent getCallingIntent(Context context) {
-        return new Intent(context, NativeRecyclerViewAdapterActivity.class);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_swipe_menu_recyclerview);
-
-        RecyclerView recyclerView = findViewById(R.id.recyclerView);
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
-        recyclerView.setLayoutManager(linearLayoutManager);
-        DividerItemDecoration dividerItemDecoration =
-                new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
-        recyclerView.addItemDecoration(dividerItemDecoration);
-
-        DemoAdapter adapter = new DemoAdapter(new Repository().fakeDate(), mItemTouchListener);
-        recyclerView.setAdapter(adapter);
-    }
-
-    ItemTouchListener mItemTouchListener = new ItemTouchListener() {
-        @Override
-        public void onItemClick(String str) {
-            ToastUtil.show(str);
-        }
-
-        @Override
-        public void onLeftMenuClick(String str) {
-            ToastUtil.show(str);
-        }
-
-        @Override
-        public void onRightMenuClick(String str) {
-            ToastUtil.show(str);
-        }
-    };
-
-    private static class DemoAdapter extends RecyclerView.Adapter<SimpleViewHolder> {
-
-        private ItemTouchListener mItemTouchListener;
-        private List<Data> mData;
-
-        DemoAdapter(List<Data> data, ItemTouchListener itemTouchListener) {
-            this.mData = data;
-            this.mItemTouchListener = itemTouchListener;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return mData.get(position).type;
-        }
-
-        @Override
-        public int getItemCount() {
-            return mData.size();
-        }
-
-        @Override
-        public SimpleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-            @LayoutRes
-            int layout;
-
-            switch (viewType) {
-                case Type.LEFT_MENU:
-                    layout = R.layout.item_left_menu;
-                    break;
-                case Type.RIGHT_MENU:
-                    layout = R.layout.item_right_menu;
-                    break;
-                case Type.LEFT_AND_RIGHT_MENU:
-                    layout = R.layout.item_left_and_right_menu;
-                    break;
-                case Type.LEFT_LONG_MENU:
-                    layout = R.layout.item_left_long_menu;
-                    break;
-                case Type.RIGHT_LONG_MENU:
-                    layout = R.layout.item_right_long_menu;
-                    break;
-                case Type.LEFT_AND_RIGHT_LONG_MENU:
-                    layout = R.layout.item_left_and_right_long_menu;
-                    break;
-                case Type.DISABLE_SWIPE_MENU:
-                    layout = R.layout.item_disable_swipe_menu;
-                    break;
-                default:
-                    layout = R.layout.item_left_menu;
-                    break;
-            }
-            View rootView = LayoutInflater.from(parent.getContext()).inflate(layout, parent, false);
-            return new SimpleViewHolder(rootView);
-        }
-
-        @Override
-        public void onBindViewHolder(final SimpleViewHolder holder, int position) {
-            holder.mContent.setText(mData.get(position).content.concat(" " + position));
-            holder.mSwipeItemLayout.setSwipeEnable(getItemViewType(position) != Type.DISABLE_SWIPE_MENU);
-            if (mItemTouchListener != null) {
-                holder.itemView.setOnClickListener(v -> mItemTouchListener.onItemClick(holder.mContent.getText().toString()));
-
-                if (holder.mLeftMenu != null) {
-                    holder.mLeftMenu.setOnClickListener(v -> {
-                        mItemTouchListener.onLeftMenuClick("left " + holder.getAdapterPosition());
-                        holder.mSwipeItemLayout.close();
-                    });
-                }
-
-                if (holder.mRightMenu != null) {
-                    holder.mRightMenu.setOnClickListener(v -> {
-                        mItemTouchListener.onRightMenuClick("right " + holder.getAdapterPosition());
-                        holder.mSwipeItemLayout.close();
-                    });
-                }
-            }
-        }
-
-    }
-
-    private static class SimpleViewHolder extends RecyclerView.ViewHolder {
-
-        private final View mLeftMenu;
-        private final View mRightMenu;
-        private final TextView mContent;
-        private final SwipeItemLayout mSwipeItemLayout;
-
-        SimpleViewHolder(View itemView) {
-            super(itemView);
-            mSwipeItemLayout = (SwipeItemLayout) itemView.findViewById(R.id.swipe_layout);
-            mContent = (TextView) itemView.findViewById(R.id.tv_content);
-            mLeftMenu = itemView.findViewById(R.id.left_menu);
-            mRightMenu = itemView.findViewById(R.id.right_menu);
-        }
-    }
-}
diff --git a/demo/src/main/java/com/aitsuki/swipedemo/entity/Data.java b/demo/src/main/java/com/aitsuki/swipedemo/entity/Data.java
index 0bd6218..d982d73 100644
--- a/demo/src/main/java/com/aitsuki/swipedemo/entity/Data.java
+++ b/demo/src/main/java/com/aitsuki/swipedemo/entity/Data.java
@@ -1,17 +1,10 @@
 package com.aitsuki.swipedemo.entity;
 
-import com.chad.library.adapter.base.entity.MultiItemEntity;
-
 /**
  * Created by AItsuki on 2017/3/23.
  * Data
  */
-public class Data implements MultiItemEntity {
+public class Data {
     public int type;
     public String content;
-
-    @Override
-    public int getItemType() {
-        return type;
-    }
 }
diff --git a/demo/src/main/java/com/aitsuki/swipedemo/util/ToastUtil.java b/demo/src/main/java/com/aitsuki/swipedemo/util/ToastUtil.java
deleted file mode 100644
index d6fa812..0000000
--- a/demo/src/main/java/com/aitsuki/swipedemo/util/ToastUtil.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.aitsuki.swipedemo.util;
-
-import android.annotation.SuppressLint;
-import android.app.Application;
-import android.widget.Toast;
-
-/**
- * Created by AItsuki on 2017/3/17.
- */
-public class ToastUtil {
-
-    private static Toast sToast;
-
-    @SuppressLint("ShowToast")
-    public static void init(Application context) {
-        sToast = Toast.makeText(context, "", Toast.LENGTH_SHORT);
-    }
-
-    public static void show(String message) {
-        sToast.setText(message);
-        sToast.show();
-    }
-}
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index 1c6ad1d..a15e973 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -1,35 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="com.aitsuki.swipedemo.MainActivity">
 
-    <Button
-        android:id="@+id/native_btn"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="16dp"
-        android:onClick="onNativeAdapterClick"
-        android:text="Native RecyclerViewAdapter"
-        android:textAllCaps="false"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <com.aitsuki.swipe.SwipeMenuRecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:enableTouchAlways="false">
 
-    <Button
-        android:id="@+id/cymchad_btn"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="16dp"
-        android:onClick="onBaseRecyclerViewAdapterHelperClick"
-        android:text="BaseRecyclerViewAdapterHelper"
-        android:textAllCaps="false"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/native_btn" />
-</android.support.constraint.ConstraintLayout>
+    </com.aitsuki.swipe.SwipeMenuRecyclerView>
 
+</LinearLayout>
diff --git a/demo/src/main/res/layout/activity_swipe_menu_recyclerview.xml b/demo/src/main/res/layout/activity_swipe_menu_recyclerview.xml
deleted file mode 100644
index c8410b4..0000000
--- a/demo/src/main/res/layout/activity_swipe_menu_recyclerview.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.aitsuki.swipedemo.NativeRecyclerViewAdapterActivity">
-
-    <com.aitsuki.swipe.SwipeMenuRecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    </com.aitsuki.swipe.SwipeMenuRecyclerView>
-
-</LinearLayout>
diff --git a/demo/src/main/res/layout/item_left_and_right_long_menu.xml b/demo/src/main/res/layout/item_left_and_right_long_menu.xml
index c1c0a14..08c9132 100644
--- a/demo/src/main/res/layout/item_left_and_right_long_menu.xml
+++ b/demo/src/main/res/layout/item_left_and_right_long_menu.xml
@@ -1,30 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.aitsuki.swipe.SwipeItemLayout
+<androidx.cardview.widget.CardView
+    android:id="@+id/card_view"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/swipe_layout"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/swipe_item_height">
+    android:layout_height="@dimen/swipe_item_height"
+    android:layout_marginStart="16dp"
+    android:layout_marginTop="10dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="10dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp">
 
-    <TextView
-        android:id="@+id/left_menu"
+    <com.aitsuki.swipe.SwipeItemLayout
+        android:id="@+id/swipe_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="left"
-        android:background="@color/red500"
-        android:gravity="center"
-        android:text="left"
-        android:textColor="@color/white"/>
+        android:layout_height="@dimen/swipe_item_height">
 
-    <TextView
-        android:id="@+id/right_menu"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="right"
-        android:background="@color/blue500"
-        android:gravity="center"
-        android:text="right"
-        android:textColor="@color/white"/>
+        <TextView
+            android:id="@+id/left_menu"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:background="@color/red500"
+            android:gravity="center"
+            android:text="left"
+            android:textColor="@color/white" />
+
+        <TextView
+            android:id="@+id/right_menu"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:background="@color/blue500"
+            android:gravity="center"
+            android:text="right"
+            android:textColor="@color/white" />
+
+        <include layout="@layout/swipe_content" />
 
-    <include layout="@layout/swipe_content"/>
+    </com.aitsuki.swipe.SwipeItemLayout>
 
-</com.aitsuki.swipe.SwipeItemLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/demo/src/main/res/layout/item_left_and_right_menu.xml b/demo/src/main/res/layout/item_left_and_right_menu.xml
index d8ff3c9..43dcf09 100644
--- a/demo/src/main/res/layout/item_left_and_right_menu.xml
+++ b/demo/src/main/res/layout/item_left_and_right_menu.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.aitsuki.swipe.SwipeItemLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.aitsuki.swipe.SwipeItemLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/swipe_layout"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/swipe_item_height">
+    android:layout_height="@dimen/swipe_item_height"
+    app:preview="openRight">
 
     <TextView
         android:id="@+id/left_menu"
diff --git a/demo/src/main/res/menu/action_menu.xml b/demo/src/main/res/menu/action_menu.xml
new file mode 100644
index 0000000..d06b85f
--- /dev/null
+++ b/demo/src/main/res/menu/action_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/enableTouchAlways"
+        android:checkable="true"
+        android:title="enableTouchAlways"
+        tools:ignore="HardcodedText">
+    </item>
+</menu>
\ No newline at end of file
diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml
index 5885930..3388238 100644
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="overlapAnchor">false</item>
     </style>
 
 </resources>
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..30d2ba9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,8 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8ec4e57..5832f50 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Sep 08 20:09:27 CST 2018
+#Sat Apr 25 20:00:43 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index d41dc68..a656915 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,16 +1,14 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group='com.github.aitsuki'
+group = 'com.github.aitsuki'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 29
     }
     buildTypes {
         release {
@@ -21,6 +19,5 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:recyclerview-v7:28.0.0-rc02'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 }
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 534beea..edb3da6 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,11 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.aitsuki.swipe">
-
-    <application android:allowBackup="true"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-    >
-
-    </application>
+    package="com.aitsuki.swipe">
 
 </manifest>
diff --git a/library/src/main/java/com/aitsuki/swipe/SwipeItemLayout.java b/library/src/main/java/com/aitsuki/swipe/SwipeItemLayout.java
index 6dbe046..e1c5f43 100644
--- a/library/src/main/java/com/aitsuki/swipe/SwipeItemLayout.java
+++ b/library/src/main/java/com/aitsuki/swipe/SwipeItemLayout.java
@@ -2,11 +2,9 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ViewDragHelper;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
@@ -16,6 +14,11 @@
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+import androidx.customview.widget.ViewDragHelper;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -25,10 +28,15 @@
  * 1. 最多同时设置两个菜单
  * 2. 菜单必须设置layoutGravity属性. start left end right
  */
+@SuppressLint("RtlHardcoded")
 public class SwipeItemLayout extends FrameLayout {
 
     public static final String TAG = "SwipeItemLayout";
+    public static final int PREVIEW_UNSPECIFIED = -1;
+    public static final int PREVIEW_LEFT = 0;
+    public static final int PREVIEW_RIGHT = 1;
 
+    private int preview = PREVIEW_UNSPECIFIED;
     private ViewDragHelper mDragHelper;
     private int mTouchSlop;
     private int mVelocity;
@@ -69,15 +77,44 @@ public SwipeItemLayout(Context context, AttributeSet attrs) {
 
     public SwipeItemLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        // 因为当没有点击事件时，事件会给RecyclerView响应导致无法划开菜单。
+        setClickable(true);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
         mVelocity = ViewConfiguration.get(context).getScaledMinimumFlingVelocity();
         mDragHelper = ViewDragHelper.create(this, new DragCallBack());
+
+        if (attrs != null) {
+            TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwipeItemLayout);
+            preview = a.getInt(R.styleable.SwipeItemLayout_preview, PREVIEW_UNSPECIFIED);
+            a.recycle();
+        }
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         if (isInEditMode()) {
+            if (preview == PREVIEW_LEFT) {
+                View menu = mMenus.get(Gravity.LEFT);
+                View content = getContentView();
+                if (menu != null && menu != content) {
+                    content.layout(
+                            menu.getMeasuredWidth(),
+                            content.getTop(),
+                            content.getRight() + menu.getMeasuredWidth(),
+                            content.getBottom());
+                }
+            } else if (preview == PREVIEW_RIGHT) {
+                View menu = mMenus.get(Gravity.RIGHT);
+                View content = getContentView();
+                if (menu != null && menu != content) {
+                    content.layout(
+                            -menu.getMeasuredWidth(),
+                            content.getTop(),
+                            content.getRight() - menu.getMeasuredWidth(),
+                            content.getBottom());
+                }
+            }
             return;
         }
         updateMenu();
@@ -139,7 +176,7 @@ public boolean onTouchEvent(MotionEvent ev) {
             return super.onTouchEvent(ev);
         }
 
-        int action = ev.getAction();
+        int action = ev.getActionMasked();
         switch (action) {
             case MotionEvent.ACTION_DOWN:
                 mIsDragged = false;
@@ -175,15 +212,13 @@ public boolean onTouchEvent(MotionEvent ev) {
                 }
                 break;
         }
-        return mIsDragged || super.onTouchEvent(ev)
-                // 此判断是因为当没有点击事件时，事件会给RecyclerView响应导致无法划开菜单。
-                || (!isClickable() && mMenus.size() > 0);
+        return mIsDragged || super.onTouchEvent(ev);
+//                || (!isClickable() && mMenus.size() > 0);
     }
 
     /**
      * 判断是否可以拖拽View
      */
-    @SuppressLint("RtlHardcoded")
     private void checkCanDragged(MotionEvent ev) {
         if (mIsDragged) {
             return;
@@ -228,14 +263,9 @@ private void checkCanDragged(MotionEvent ev) {
     }
 
     // 最后一个是内容，倒数第1第2个设置了layout_gravity = right or left的是菜单，其余的忽略
-    @SuppressLint("RtlHardcoded")
     @Override
     public void addView(View child, int index, ViewGroup.LayoutParams params) {
         super.addView(child, index, params);
-        if (isInEditMode()) {
-            return;
-        }
-
         LayoutParams lp = (LayoutParams) child.getLayoutParams();
         int gravity = GravityCompat.getAbsoluteGravity(lp.gravity, ViewCompat.getLayoutDirection(child));
         switch (gravity) {
@@ -278,12 +308,10 @@ private boolean isTouchContent(int x, int y) {
         return rect.contains(x, y);
     }
 
-    @SuppressLint("RtlHardcoded")
     private boolean isLeftMenu() {
         return mCurrentMenu != null && mCurrentMenu == mMenus.get(Gravity.LEFT);
     }
 
-    @SuppressLint("RtlHardcoded")
     private boolean isRightMenu() {
         return mCurrentMenu != null && mCurrentMenu == mMenus.get(Gravity.RIGHT);
     }
@@ -383,7 +411,6 @@ private boolean isCloseAnimating() {
         return false;
     }
 
-    @SuppressLint("RtlHardcoded")
     private void updateMenu() {
         View contentView = getContentView();
         if (contentView != null) {
@@ -458,11 +485,9 @@ public int clampViewPositionHorizontal(@NonNull View child, int left, int dx) {
             // 如果child是内容， 那么可以左划或右划，开启或关闭菜单
             if (child == getContentView()) {
                 if (isRightMenu()) {
-                    return left > 0 ? 0 : left < -mCurrentMenu.getWidth() ?
-                            -mCurrentMenu.getWidth() : left;
+                    return left > 0 ? 0 : left < -mCurrentMenu.getWidth() ? -mCurrentMenu.getWidth() : left;
                 } else if (isLeftMenu()) {
-                    return left > mCurrentMenu.getWidth() ? mCurrentMenu.getWidth() : left < 0 ?
-                            0 : left;
+                    return left > mCurrentMenu.getWidth() ? mCurrentMenu.getWidth() : Math.max(left, 0);
                 }
             }
 
diff --git a/library/src/main/java/com/aitsuki/swipe/SwipeMenuRecyclerView.java b/library/src/main/java/com/aitsuki/swipe/SwipeMenuRecyclerView.java
index 29969f6..7196612 100644
--- a/library/src/main/java/com/aitsuki/swipe/SwipeMenuRecyclerView.java
+++ b/library/src/main/java/com/aitsuki/swipe/SwipeMenuRecyclerView.java
@@ -1,14 +1,16 @@
 package com.aitsuki.swipe;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by AItsuki on 2017/2/23.
  * 仿IOS message列表，QQ好友列表的交互体验
@@ -17,31 +19,48 @@
  */
 public class SwipeMenuRecyclerView extends RecyclerView {
 
+    private boolean enableTouchAlways = false;
+
     public SwipeMenuRecyclerView(Context context) {
-        super(context);
+        this(context, null);
     }
 
     public SwipeMenuRecyclerView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
+        this(context, attrs, 0);
     }
 
     public SwipeMenuRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        if (attrs != null) {
+            TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwipeMenuRecyclerView);
+            enableTouchAlways = a.getBoolean(R.styleable.SwipeMenuRecyclerView_enableTouchAlways, false);
+            a.recycle();
+        }
+    }
+
+    public void setEnableTouchAlways(boolean enableTouchAlways) {
+        this.enableTouchAlways = enableTouchAlways;
+    }
+
+    public boolean isEnableTouchAlways() {
+        return enableTouchAlways;
     }
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         int action = ev.getActionMasked();
-        // 手指按下的时候，如果有开启的菜单，只要手指不是落在该Item上，则关闭菜单, 并且不分发事件。
+        int x = (int) ev.getX();
+        int y = (int) ev.getY();
+        // 手指按下的时候，如果有开启的菜单，只要手指不是落在该Item上，则关闭菜单。
         if (action == MotionEvent.ACTION_DOWN) {
-            int x = (int) ev.getX();
-            int y = (int) ev.getY();
             View openItem = findOpenItem();
             if (openItem != null && openItem != getTouchItem(x, y)) {
                 SwipeItemLayout swipeItemLayout = findSwipeItemLayout(openItem);
                 if (swipeItemLayout != null) {
                     swipeItemLayout.close();
-                    return false;
+                    if (!enableTouchAlways) {
+                        return false;
+                    }
                 }
             }
         } else if (action == MotionEvent.ACTION_POINTER_DOWN) {
diff --git a/library/src/main/res/values/attr.xml b/library/src/main/res/values/attr.xml
index 11659e1..ebed5bb 100644
--- a/library/src/main/res/values/attr.xml
+++ b/library/src/main/res/values/attr.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="SwipeLayout">
+    <declare-styleable name="SwipeItemLayout">
         <attr name="preview" format="enum">
             <enum name="noPreview" value="-1"/>
             <enum name="openLeft" value="0"/>
@@ -9,4 +9,8 @@
         </attr>
     </declare-styleable>
 
+    <declare-styleable name="SwipeMenuRecyclerView">
+        <attr name="enableTouchAlways" format="boolean"/>
+    </declare-styleable>
+
 </resources>
\ No newline at end of file