Merge pull request rengwuxian#24 from rengwuxian/pr/23

some editing for 1.5.0
meanmee · Nov 26, 2014 · 4c18f94 · 4c18f94
2 parents 059fc93 + 6b9361b
commit 4c18f94
Show file tree

Hide file tree

Showing 12 changed files with 1,755 additions and 1,558 deletions.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/MaterialEditText.iml b/MaterialEditText.iml
@@ -14,7 +14,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.8 (1)" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

diff --git a/README.md b/README.md
@@ -29,6 +29,10 @@ AppCompat v21 makes it easy to use Material Design EditText in our apps, but it'
   highlight:
 
   ![HighlightFloatingLabel](./images/highlight.jpg)
+
+  custom floating label text:
+
+  ![CustomFloatingLabelText](./images/custom_floating_label_text.png)
 
 5. Single Line Ellipsis
 
@@ -54,12 +58,6 @@ AppCompat v21 makes it easy to use Material Design EditText in our apps, but it'
 
   ![CustomAccentTypeface](./images/custom_accent_typeface.png)
 
-9. Custom floating label text
-
-  defaults is the hint value, but can be customized:
-
-  ![DefaultHint](./images/custom_floating_label.png)
-
 ## Sample
 
 [MaterialEditText-1.4.3-sample.apk](https://github.com/rengwuxian/MaterialEditText/releases/download/1.4.3/MaterialEditText-1.4.3-sample.apk)

diff --git a/images/custom_accent_typeface.png b/images/custom_accent_typeface.png
diff --git a/images/custom_floating_label.png b/images/custom_floating_label.png
diff --git a/images/custom_floating_label_text.png b/images/custom_floating_label_text.png