1.4.2 release

rengwuxian · Nov 20, 2014 · aca71a2 · aca71a2
1 parent 038fc39
commit aca71a2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 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.4.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.4.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

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

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=1.4.0
-VERSION_CODE=18
+VERSION_NAME=1.4.2
+VERSION_CODE=22
 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.4.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.4.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -86,8 +86,8 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
   </component>
 </module>
 
diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java
@@ -496,15 +496,15 @@ protected void onDraw(@NonNull Canvas canvas) {
 				canvas.drawRect(getScrollX() + startX, lineStartY, getScrollX() + startX + interval, lineStartY + getPixel(1), paint);
 			}
 		} else if (hasFocus()) { // focused
-			paint.setColor(baseColor);
+			paint.setColor(primaryColor);
 			canvas.drawRect(getScrollX(), lineStartY, getWidth() + getScrollX(), lineStartY + getPixel(2), paint);
 		} else { // normal
 			paint.setColor(baseColor);
 			canvas.drawRect(getScrollX(), lineStartY, getWidth() + getScrollX(), lineStartY + getPixel(1), paint);
 		}
 
 		Paint.FontMetrics fontMetrics = paint.getFontMetrics();
-		float relativeHeight = -fontMetrics.ascent - fontMetrics.descent;
+        float relativeHeight = -fontMetrics.ascent - fontMetrics.descent;
 
 		// draw the characters counter
 		if (maxCharacters > 0) {

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -497,7 +497,7 @@ protected void onDraw(@NonNull Canvas canvas) {
 				canvas.drawRect(getScrollX() + startX, lineStartY, getScrollX() + startX + interval, lineStartY + getPixel(1), paint);
 			}
 		} else if (hasFocus()) { // focused
-			paint.setColor(baseColor);
+			paint.setColor(primaryColor);
 			canvas.drawRect(getScrollX(), lineStartY, getWidth() + getScrollX(), lineStartY + getPixel(2), paint);
 		} else { // normal
 			paint.setColor(baseColor);

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -19,7 +19,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.0.0'
-    compile 'com.rengwuxian.materialedittext:library:1.4.0'
+    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.rengwuxian.materialedittext:library:1.4.2'
 //    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.4.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.4.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -83,11 +83,11 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="library-1.4.0" level="project" />
-    <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-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.4.2" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
   </component>
 </module>