Merge pull request #203 from rey5137/dev

Dev
rey5137 · Jul 25, 2015 · a5a76e2 · a5a76e2
2 parents 3f641c7 + e28c9b8
commit a5a76e2
Show file tree

Hide file tree

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

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

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.rey.material.demo"
         minSdkVersion 9
         targetSdkVersion 21
-        versionCode 3
-        versionName "0.0.3"
+        versionCode 5
+        versionName "0.0.5"
     }
 
     signingConfigs {

diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.2.0
-VERSION_CODE=6
+VERSION_NAME=1.2.1
+VERSION_CODE=7
 GROUP=com.github.rey5137
 
 POM_DESCRIPTION= An Android library to bring Material Design UI to pre-Lolipop Android.

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 21
-        versionCode 6
-        versionName "1.2.0"
+        versionCode 7
+        versionName "1.2.1"
     }
     buildTypes {
         release {

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

diff --git a/lib/src/main/java/com/rey/material/widget/EditText.java b/lib/src/main/java/com/rey/material/widget/EditText.java
@@ -514,7 +514,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		int supportWidth = 0;
 		int supportHeight = 0;
 
-		if(mLabelView != null){
+		if(mLabelView != null && mLabelView.getLayoutParams() != null){
 			mLabelView.measure(tempWidthSpec, tempHeightSpec);
 			labelWidth = mLabelView.getMeasuredWidth();
 			labelHeight = mLabelView.getMeasuredHeight();
@@ -524,7 +524,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		inputWidth = mInputView.getMeasuredWidth();
 		inputHeight = mInputView.getMeasuredHeight();
 
-		if(mSupportView != null){
+		if(mSupportView != null && mSupportView.getLayoutParams() != null){
 			mSupportView.measure(tempWidthSpec, tempHeightSpec);
 			supportWidth = mSupportView.getMeasuredWidth();
 			supportHeight = mSupportView.getMeasuredHeight();
@@ -560,12 +560,12 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		setMeasuredDimension(width, height);		
 
 		tempWidthSpec = MeasureSpec.makeMeasureSpec(width - getPaddingLeft() - getPaddingRight(),  MeasureSpec.EXACTLY);
-		if(mLabelView != null)
+		if(mLabelView != null && mLabelView.getLayoutParams() != null)
 			mLabelView.measure(tempWidthSpec, tempHeightSpec);
 
 		mInputView.measure(tempWidthSpec, tempHeightSpec);
 
-		if(mSupportView != null)
+		if(mSupportView != null && mSupportView.getLayoutParams() != null)
 			mSupportView.measure(tempWidthSpec, tempHeightSpec);				
 	}