1.2.1 release

rengwuxian · Nov 11, 2014 · d87d247 · d87d247
1 parent e66b655
commit d87d247
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 17 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
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.1.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.2.1" 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.1.0
-VERSION_CODE=7
+VERSION_NAME=1.2.1
+VERSION_CODE=10
 GROUP=com.rengwuxian.materialedittext
 
 POM_DESCRIPTION=Android EditText in Material Design
@@ -14,5 +14,5 @@ POM_DEVELOPER_ID=rengwuxian
 POM_DEVELOPER_NAME=Zhu Kai
 
 ANDROID_BUILD_TARGET_SDK_VERSION=21
-ANDROID_BUILD_TOOLS_VERSION=21.1.0
+ANDROID_BUILD_TOOLS_VERSION=21.1.1
 ANDROID_BUILD_SDK_VERSION=21
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.1.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.2.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/MaterialAutoCompleteTextView.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java
@@ -209,8 +209,19 @@ private void initPadding() {
 		setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), getPaddingBottom());
 	}
 
+	/**
+	 * use {@link #setPaddings(int, int, int, int)} instead, or the paddingTop and the paddingBottom may be set incorrectly.
+	 */
+	@Deprecated
 	@Override
-	public void setPadding(int left, int top, int right, int bottom) {
+	public final void setPadding(int left, int top, int right, int bottom) {
+		super.setPadding(left, top, right, bottom);
+	}
+
+	/**
+	 * Use this method instead of {@link #setPadding(int, int, int, int)} to automatically set the paddingTop and the paddingBottom correctly.
+	 */
+	public void setPaddings(int left, int top, int right, int bottom) {
 		innerPaddingTop = top;
 		innerPaddingBottom = bottom;
 		super.setPadding(left, top + extraPaddingTop, right, bottom + extraPaddingBottom);

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -206,11 +206,22 @@ private void initPadding() {
 		extraPaddingTop = floatingLabelEnabled ? floatingLabelTextSize + innerComponentsSpacing : innerComponentsSpacing;
 		extraPaddingBottom = maxCharacters > 0 ? floatingLabelTextSize : singleLineEllipsis ? innerComponentsSpacing + bottomEllipsisSize : 0;
 		extraPaddingBottom += innerComponentsSpacing * 2;
-		setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), getPaddingBottom());
+		setPaddings(getPaddingLeft(), getPaddingTop(), getPaddingRight(), getPaddingBottom());
 	}
 
+	/**
+	 * use {@link #setPaddings(int, int, int, int)} instead, or the paddingTop and the paddingBottom may be set incorrectly.
+	 */
+	@Deprecated
 	@Override
-	public void setPadding(int left, int top, int right, int bottom) {
+	public final void setPadding(int left, int top, int right, int bottom) {
+		super.setPadding(left, top, right, bottom);
+	}
+
+	/**
+	 * Use this method instead of {@link #setPadding(int, int, int, int)} to automatically set the paddingTop and the paddingBottom correctly.
+	 */
+	public void setPaddings(int left, int top, int right, int bottom) {
 		innerPaddingTop = top;
 		innerPaddingBottom = bottom;
 		super.setPadding(left, top + extraPaddingTop, right, bottom + extraPaddingBottom);

diff --git a/library/src/main/res/drawable-hdpi/ic_launcher.png b/library/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/library/src/main/res/drawable-mdpi/ic_launcher.png b/library/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/library/src/main/res/drawable-xhdpi/ic_launcher.png b/library/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/library/src/main/res/drawable-xxhdpi/ic_launcher.png b/library/src/main/res/drawable-xxhdpi/ic_launcher.png
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.1.0'
+    compile 'com.rengwuxian.materialedittext:library:1.2.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.1.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.2.1" 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.1.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.2.1" 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>