From 796313b495c9a75c599d370b3424874b81b5d921 Mon Sep 17 00:00:00 2001 From: w446108264 <446108264@qq.com> Date: Mon, 11 Apr 2016 12:59:49 +0800 Subject: [PATCH] update readme --- README.md | 2 +- ScrollableLayout/build.gradle | 2 +- ScrollableLayout/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../src/main/java/com/scrollablelayout/ScrollableLayout.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c445b0a..74db60c 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ and: ```xml dependencies { - compile 'com.github.w446108264:ScrollableLayout:1.0.1' + compile 'com.github.w446108264:ScrollableLayout:1.0.2' } ``` -- diff --git a/ScrollableLayout/build.gradle b/ScrollableLayout/build.gradle index 2f6e034..fa971f2 100644 --- a/ScrollableLayout/build.gradle +++ b/ScrollableLayout/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0-alpha3' + classpath 'com.android.tools.build:gradle:2.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/ScrollableLayout/gradle/wrapper/gradle-wrapper.properties b/ScrollableLayout/gradle/wrapper/gradle-wrapper.properties index f23df6e..563cc97 100644 --- a/ScrollableLayout/gradle/wrapper/gradle-wrapper.properties +++ b/ScrollableLayout/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Mon Apr 11 12:52:13 CST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/ScrollableLayout/library/src/main/java/com/scrollablelayout/ScrollableLayout.java b/ScrollableLayout/library/src/main/java/com/scrollablelayout/ScrollableLayout.java index cce128f..eae8f3c 100644 --- a/ScrollableLayout/library/src/main/java/com/scrollablelayout/ScrollableLayout.java +++ b/ScrollableLayout/library/src/main/java/com/scrollablelayout/ScrollableLayout.java @@ -98,7 +98,7 @@ public ScrollableLayout(Context context, AttributeSet attrs, int defStyleAttr) { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { mHeadView = getChildAt(0); - if(mHeadView != null){ + if(mHeadView != null){ measureChildWithMargins(mHeadView, widthMeasureSpec, 0, MeasureSpec.UNSPECIFIED, 0); maxY = mHeadView.getMeasuredHeight(); mHeadHeight = mHeadView.getMeasuredHeight();