Merge branch 'dev' into release

Author: Bvin

README.md

@@ -4,38 +4,11 @@
 
 Android gesture refresh layout.
 
-## Installation
-First, in your project's build.gradle add the jitpack.io repository like this:
-```
-allprojects {
- repositories {
-    ...
-    jcenter()
-    maven { url "https://jitpack.io" }
- }
-}
-```
-*Note: do not add the jitpack.io repository under buildscript.*
-
-
-Then, add the following dependency to your module's build.gradle file:
-```
-dependencies {
-    ...
-    compile 'com.github.bvin:gesture-refresh-layout:0.1.1'
-}
-```
-If you want to get the latest feature, you can find that release the end with letter "d"(the code on
- dev branch), example "com.github.bvin:gesture-refresh-layout:0.1.4d".The stable version is no end w
- ith letter "d".
- 
-If in your module already has support-v4 dependency, you should exclude the inner support module, li
-ke this:
-```
-compile ('com.github.bvin:gesture-refresh-layout:0.1.4d') {
-        exclude group: 'com.android.support', module: 'support-compat'
-    }
-```
+## Swipe Gesture
+1. Both Translate, content and refresh view both translate, refresh view is next to content view transition.
+2. Content Translate, just translate content view.
+3. Refresher Translate, just translate refresh view.
+4. Both Fixed, content and refresh view both are fixed.
 
 ## Usage
 ```xml
@@ -57,14 +30,14 @@ mGestureRefreshLayout.setOnRefreshListener(new GestureRefreshLayout.OnRefreshLis
         // after close refresh.
     }
 });
- mGestureRefreshLayout.setOnGestureChangeListener(new GestureRefreshLayout.OnGestureStateChangeListener() {
-     @Override
-     public void onStartDrag(float startY) {
-         mRefreshText.setText("pull to refresh");
-     }
+mGestureRefreshLayout.setOnGestureChangeListener(new GestureRefreshLayout.OnGestureStateChangeListener() {
+    @Override
+    public void onStartDrag(float startY) {
+        mRefreshText.setText("pull to refresh");
+    }
 
-     @Override
-     public void onDragging(float draggedDistance, float releaseDistance) {
+    @Override
+    public void onDragging(float draggedDistance, float releaseDistance) {
          //rotate angle: 360*draggedDistance/releaseDistance
          mProgressBar.setProgress((int) (draggedDistance/releaseDistance*100));
          Log.d(TAG, "onDragging: "+draggedDistance+","+releaseDistance);
@@ -74,13 +47,13 @@ mGestureRefreshLayout.setOnRefreshListener(new GestureRefreshLayout.OnRefreshLis
              mRefreshText.setText("refreshing...");
          }
 
-     }
+    }
 
-     @Override
-     public void onFinishDrag(float endY) {
-         mRefreshText.setText("update...");
-     }
- });   
+    @Override
+    public void onFinishDrag(float endY) {
+        mRefreshText.setText("update...");
+    }
+});   
 
 ```
 trigger refresh any where:
@@ -94,17 +67,50 @@ public boolean onOptionsItemSelected(MenuItem item) {
 }
 ```
 
-## Swipe Gesture
-1. Both Translate, content and refresh view both translate, refresh view is next to content view transition.
-2. Content Translate, just translate content view.
-3. Refresher Translate, just translate refresh view.
-4. Both Fixed, content and refresh view both are fixed.
+## Installation
+First, in your project's build.gradle add the jitpack.io repository like this:
+```
+allprojects {
+ repositories {
+    ...
+    jcenter()
+    maven { url "https://jitpack.io" }
+ }
+}
+```
+*Note: do not add the jitpack.io repository under buildscript.*
+
+
+Then, add the following dependency to your module's build.gradle file:
+```
+dependencies {
+    ...
+    compile 'com.github.bvin:gesture-refresh-layout:0.1.7'
+}
+```
+If you want to get the latest feature, you can find that release the end with letter "d"(the code on
+ dev branch), example "com.github.bvin:gesture-refresh-layout:0.1.4d".The stable version is no end w
+ ith letter "d".
+ 
+If in your module already has support-v4 dependency, you should exclude the inner support module, li
+ke this:
+```
+compile ('com.github.bvin:gesture-refresh-layout:0.1.4d') {
+        exclude group: 'com.android.support', module: 'support-compat'
+    }
+```
 
 ---
 中文版
 
 Android手势刷新布局
 
+## 滑动手势
+1. 同步位移，即刷新视图跟随内容纵向位移，适合宽屏刷新视图。
+2. 悬浮位移，即内容视图固定，刷新视图跟着手势纵向位移，适合沉浸式刷新。
+3. 内容下潜位移，刷新视图固定，内容视图跟着手势纵向位移，这种情况一般是刷新视图会有吸引人的动画。
+4. 不位移，内容和刷新视图都不随手势位移，虽然纵向固定，但是可以通过其他形式来表现刷新行为。
+
 ## 安装
 首先，在项目根目录的build.gradle中添加JitPack远程仓库如下：
 ```
@@ -122,32 +128,22 @@ allprojects {
 ```
 dependencies {
     ...
-    compile 'com.github.bvin:gesture-refresh-layout:0.1.1'
+    compile 'com.github.bvin:gesture-refresh-layout:0.1.7'
 }
 ```
 如果需要最新的功能，可以依赖以d结尾的在dev分支上发布的Tag，如 "com.github.bvin:gesture-refresh-layout:0.
 1.4d"，稳定版是不以字母d结尾的。
 
 如果你的module中已经有support-v4依赖，应该去除内部的module，如下：
 ```
-compile ('com.github.bvin:gesture-refresh-layout:0.1.4d') {
+compile ('com.github.bvin:gesture-refresh-layout:0.1.7') {
         exclude group: 'com.android.support', module: 'support-compat'
     }
 ```
 
 ## 用法
 通常可以在GestureRefreshLayout布局里面添加子视图来实现刷新功能，第一个应为内容视图，第二个应为刷新视图。
 
-原生SwipeRefreshLayout的ChildView的宽高会强制match_parent，而我们的GestureRefreshLayout可以支持Child
-View为wrap_content。宽度不足match_parent的RefreshView将会处于水平居中位置，未来可提供gravity和margin
-的支持。
-
-至于为何SRL（即SwipeRefreshLayout，以下通称SRL）会这样做，我猜测是因为SRL把触摸事件
-从ChildView拦截到SRL自身去做事件处理，它原生是可以从ChildView的区域滑出到SRL自身的区域，Touche事件可
-以无缝衔接，虽然...但是SRL和ChildView是没有间隙的，是严丝合缝的。而GRL（即GestureRefreshLayout，以下通
-称GRL）的ContentView是可以支持wrap_content的，就算你的ChildView小到比TouchSlop还小，依然可以在
-ChildView外的GRL区域起作用。
-
 
 ```xml
 <GestureRefreshLayout>
@@ -186,6 +182,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
     mGestureRefreshLayout.setEnabled(false);
 ```
 
+GestureRefreshLayout默认是以RefreshView的高度作为释放刷新的距离（即当下拉出屏幕一个RefreshView的高度
+就会触发刷新动作），如果你的RefreshView的高度小于默认高度或者大于3倍默认高度，将会以默认下拉高度作为
+释放刷新距离，当然也可以完全自定义释放刷新的距离。
+```java
+    mGestureRefreshLayout.setDistanceToTriggerSync(120);
+```
+
 ####高级用法
 GestureRefreshLayout的强大之处是可以非常个性化得定制刷新效果。通过GestureChange手势状态改变监听器可以
 定制任何你想要的效果，OnGestureStateChangeListener接口有下列3个状态回掉。
@@ -221,17 +224,25 @@ mGestureRefreshLayout.setOnGestureChangeListener(new GestureRefreshLayout.OnGest
     }
 });
 ```
+自定义动画效果演示：  
+
+![自定义动画效果演示](https://raw.githubusercontent.com/bvin/gesture-refresh-layout/dev/screen/gesture-refresh-advance.gif)
 
 _为了保持结构简洁、用法简单，GestureRefreshLayout只提供基础手势滑动动画，其他任何表现刷新的动画和提示
 都需自己实现。_
 
-## 滑动手势
-1. 同步位移，即刷新视图跟随内容纵向位移，适合宽屏刷新视图。
-2. 悬浮位移，即内容视图固定，刷新视图跟着手势纵向位移，适合沉浸式刷新。
-3. 内容下潜位移，刷新视图固定，内容视图跟着手势纵向位移，这种情况一般是刷新视图会有吸引人的动画。
-4. 不位移，内容和刷新视图都不随手势位移，虽然纵向固定，但是可以通过其他形式来表现刷新行为。
 
 ## 实现原理
+
+原生SwipeRefreshLayout的ChildView的宽高会强制match_parent，而我们的GestureRefreshLayout可以支持Child
+View为wrap_content。宽度不足match_parent的RefreshView将会处于水平居中位置，未来可提供gravity和margin
+的支持。
+
+至于为何SRL（即SwipeRefreshLayout，以下通称SRL）会这样做，我猜测是因为SRL把触摸事件
+从ChildView拦截到SRL自身去做事件处理，它原生是可以从ChildView的区域滑出到SRL自身的区域，Touche事件可
+以无缝衔接，虽然...但是SRL和ChildView是没有间隙的，是严丝合缝的。而GRL（即GestureRefreshLayout，以下通
+称GRL）的ContentView是可以支持wrap_content的，就算你的ChildView小到比TouchSlop还小，依然可以在
+ChildView外的GRL区域起作用。
 
                +--------------------+   ------> OriginOffsetTop
                |   [Refresh View]   |

gesturerefresh/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 7
-        versionName "0.1.7d"
+        versionName "0.1.7"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"