Merge pull request rengwuxian#25 from hzsweers/master

Use IntDef for float label modes to have lint and better IDE autocomplete support
meanmee · Nov 26, 2014 · 007c346 · 007c346
2 parents 4c18f94 + 46e404d
commit 007c346
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java
@@ -7,6 +7,7 @@
 import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.os.Build;
+import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.Editable;
@@ -32,6 +33,9 @@
  * <p/>
  */
 public class MaterialAutoCompleteTextView extends AutoCompleteTextView {
+
+  @IntDef({FLOATING_LABEL_NONE, FLOATING_LABEL_NORMAL, FLOATING_LABEL_HIGHLIGHT})
+  public @interface FloatingLabelType {}
   public static final int FLOATING_LABEL_NONE = 0;
   public static final int FLOATING_LABEL_NORMAL = 1;
   public static final int FLOATING_LABEL_HIGHLIGHT = 2;
@@ -421,7 +425,7 @@ private void setFloatingLabelInternal(int mode) {
     }
   }
 
-  public void setFloatingLabel(int mode) {
+  public void setFloatingLabel(@FloatingLabelType int mode) {
     setFloatingLabelInternal(mode);
     postInvalidate();
   }

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -8,6 +8,7 @@
 import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.os.Build;
+import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.Editable;
@@ -32,6 +33,9 @@
  * <p/>
  */
 public class MaterialEditText extends EditText {
+
+  @IntDef({FLOATING_LABEL_NONE, FLOATING_LABEL_NORMAL, FLOATING_LABEL_HIGHLIGHT})
+  public @interface FloatingLabelType {}
   public static final int FLOATING_LABEL_NONE = 0;
   public static final int FLOATING_LABEL_NORMAL = 1;
   public static final int FLOATING_LABEL_HIGHLIGHT = 2;
@@ -420,7 +424,7 @@ private void setFloatingLabelInternal(int mode) {
     }
   }
 
-  public void setFloatingLabel(int mode) {
+  public void setFloatingLabel(@FloatingLabelType int mode) {
     setFloatingLabelInternal(mode);
     postInvalidate();
   }