From 896a7a8fe76ad09903f88041142a435f8b903f61 Mon Sep 17 00:00:00 2001 From: "liaoinstan@qq.com" Date: Sun, 22 Jan 2017 17:45:23 +0800 Subject: [PATCH 001/108] v 1.2.7 --- .idea/.name | 1 - .idea/gradle.xml | 8 +----- .idea/misc.xml | 2 +- demo/build.gradle | 5 +++- .../demospring/demo3/Demo3Activity.java | 1 + demo/src/main/res/layout/activity_demo3.xml | 27 ++++++++++++------- demo/src/main/res/layout/header_recycle.xml | 13 +++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 2 +- .../springview/widget/SpringView.java | 11 +++++--- 10 files changed, 47 insertions(+), 25 deletions(-) delete mode 100644 .idea/.name create mode 100644 demo/src/main/res/layout/header_recycle.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index bbafc24..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -SpringView \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 978e3cf..d35a3ac 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,13 +12,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 6a1e020..95f0f03 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/demo/build.gradle b/demo/build.gradle index 955c322..a4e5209 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -27,6 +27,9 @@ dependencies { compile 'com.android.support:appcompat-v7:23.2.0' compile 'com.android.support:design:23.2.0' -// compile 'com.liaoinstan.springview:library:1.2.5' +// compile 'com.liaoinstan.springview:library:1.2.6' compile project(':library') + + //recycleView header + compile 'com.bartoszlipinski:recyclerviewheader2:2.0.1' } diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java index 06939fd..b91d96b 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java @@ -15,6 +15,7 @@ import android.view.ViewGroup; import android.widget.TextView; +import com.bartoszlipinski.recyclerviewheader2.RecyclerViewHeader; import com.liaoinstan.demospring.R; import com.liaoinstan.springview.container.AliFooter; import com.liaoinstan.springview.container.AliHeader; diff --git a/demo/src/main/res/layout/activity_demo3.xml b/demo/src/main/res/layout/activity_demo3.xml index b6892f4..1f622c9 100644 --- a/demo/src/main/res/layout/activity_demo3.xml +++ b/demo/src/main/res/layout/activity_demo3.xml @@ -21,6 +21,7 @@ + + android:layout_weight="1" + android:background="#ffffff" + app:footer="@layout/header_recycle" + app:header="@layout/header_recycle" + app:type="follow"> + + android:layout_height="match_parent" + android:scrollbars="vertical" /> + android:layout_marginRight="20dp" + android:orientation="vertical"> +