1.3.1 release

rengwuxian · Nov 13, 2014 · fbf14bd · fbf14bd
1 parent 56e6196
commit fbf14bd
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/MaterialEditText.iml b/MaterialEditText.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.rengwuxian.materialedittext" external.system.module.version="1.3.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.rengwuxian.materialedittext" external.system.module.version="1.3.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

diff --git a/README.md b/README.md
@@ -46,25 +46,25 @@ AppCompat v21 makes it easy to use Material Design EditText in our apps, but it'
 
 ## Sample
 
-[MaterialEditText-1.3.0-sample.apk](https://github.com/rengwuxian/MaterialEditText/releases/download/1.3.0/MaterialEditText-1.3.0-sample.apk)
+[MaterialEditText-1.3.1-sample.apk](https://github.com/rengwuxian/MaterialEditText/releases/download/1.3.1/MaterialEditText-1.3.1-sample.apk)
 
 ## Download
 
 Eclipse:
-[MaterialEditText-1.3.0.aar](https://github.com/rengwuxian/MaterialEditText/releases/download/1.3.0/MaterialEditText-1.3.0.aar)
+[MaterialEditText-1.3.1.aar](https://github.com/rengwuxian/MaterialEditText/releases/download/1.3.1/MaterialEditText-1.3.1.aar)
 
 gradle:
 
 ```groovy
-compile 'com.rengwuxian.materialedittext:library:1.3.0'
+compile 'com.rengwuxian.materialedittext:library:1.3.1'
 ```
 
 Maven:
 ```xml
 <dependency>
   <groupId>com.rengwuxian.materialedittext</groupId>
   <artifactId>library</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
   <type>aar</type>
 </dependency>
 ```

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.0'
+        classpath 'com.android.tools.build:gradle:0.14.1'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=1.3.0
-VERSION_CODE=12
+VERSION_NAME=1.3.1
+VERSION_CODE=14
 GROUP=com.rengwuxian.materialedittext
 
 POM_DESCRIPTION=Android EditText in Material Design

diff --git a/library/library.iml b/library/library.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.rengwuxian.materialedittext" external.system.module.version="1.3.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.rengwuxian.materialedittext" external.system.module.version="1.3.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -381,7 +381,7 @@ protected void onDraw(@NonNull Canvas canvas) {
 		paint.setTextSize(floatingLabelTextSize);
 
 		// draw the background
-		float lineStartY = getHeight() - getPaddingBottom() + innerComponentsSpacing;
+		float lineStartY = getScrollY() + getHeight() - getPaddingBottom() + innerComponentsSpacing;
 		if (!isEnabled()) { // disabled
 			paint.setColor(baseColor & 0x00ffffff | 0x44000000);
 			float interval = getPixel(1);

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -20,6 +20,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:21.0.0'
-    compile 'com.rengwuxian.materialedittext:library:1.3.0'
+    compile 'com.rengwuxian.materialedittext:library:1.3.1'
 //    compile project(':library')
 }
diff --git a/sample/sample.iml b/sample/sample.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.rengwuxian.materialedittext" external.system.module.version="1.3.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.rengwuxian.materialedittext" external.system.module.version="1.3.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -85,8 +85,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
-    <orderEntry type="library" exported="" name="library-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.3.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
   </component>
 </module>

diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -213,6 +213,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="Max Characters"
+        android:lines="4"
         app:maxCharacters="10"/>
 
       <TextView