1.3.0 release

rengwuxian · Nov 13, 2014 · 80f5108 · 80f5108
1 parent 44447bf
commit 80f5108
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 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.2.1" 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.0" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=1.2.1
-VERSION_CODE=10
+VERSION_NAME=1.3.0
+VERSION_CODE=12
 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.2.1" 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.0" 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
@@ -1,6 +1,7 @@
 package com.rengwuxian.materialedittext;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -143,7 +144,8 @@ public MaterialEditText(Context context, AttributeSet attrs, int style) {
 
 		TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MaterialEditText);
 		baseColor = typedArray.getColor(R.styleable.MaterialEditText_baseColor, Color.BLACK);
-		setTextColor(baseColor & 0x00ffffff | 0xdf000000);
+		ColorStateList colorStateList = new ColorStateList(new int[][] {new int[] {android.R.attr.state_enabled}, EMPTY_STATE_SET}, new int[] {baseColor & 0x00ffffff | 0xdf000000, baseColor & 0x00ffffff | 0x44000000});
+		setTextColor(colorStateList);
 
 		primaryColor = typedArray.getColor(R.styleable.MaterialEditText_primaryColor, baseColor);
 		setFloatingLabelInternal(typedArray.getInt(R.styleable.MaterialEditText_floatingLabel, 0));
@@ -380,7 +382,13 @@ protected void onDraw(@NonNull Canvas canvas) {
 
 		// draw the background
 		float lineStartY = getHeight() - getPaddingBottom() + innerComponentsSpacing;
-		if (hasFocus()) {
+		if (!isEnabled()) { // disabled
+			paint.setColor(baseColor & 0x00ffffff | 0x44000000);
+			float interval = getPixel(1);
+			for (float startX = 0; startX < getWidth(); startX += interval * 3) {
+				canvas.drawRect(getScrollX() + startX, lineStartY, getScrollX() + startX + interval, lineStartY + getPixel(1), paint);
+			}
+		} else if (hasFocus()) { // focused
 			if (isExceedingMaxCharacters()) {
 				paint.setColor(errorColor);
 			} else {
@@ -398,7 +406,7 @@ protected void onDraw(@NonNull Canvas canvas) {
 				String text = getText().length() + " / " + maxCharacters;
 				canvas.drawText(text, getWidth() + getScrollX() - paint.measureText(text), lineStartY + innerComponentsSpacing + relativeHeight, paint);
 			}
-		} else {
+		} else { // normal
 			paint.setColor(baseColor);
 			canvas.drawRect(getScrollX(), lineStartY, getWidth() + getScrollX(), lineStartY + getPixel(1), paint);
 		}

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.2.1'
+    compile 'com.rengwuxian.materialedittext:library:1.3.0'
 //    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.2.1" 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.0" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -85,7 +85,7 @@
     <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.2.1" 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="appcompat-v7-21.0.0" level="project" />
   </component>