From 5494400f3b7a1f636feb444447c220aa8dee48c9 Mon Sep 17 00:00:00 2001 From: Aaron Rietschlin Date: Wed, 25 May 2016 09:54:56 -0400 Subject: [PATCH] Fixed alpha based on this fix: https://github.com/rengwuxian/MaterialEditText/pull/275 --- .../com/rengwuxian/materialedittext/MaterialEditText.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java index 516722e6..09222d7e 100755 --- a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java +++ b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java @@ -1380,7 +1380,7 @@ protected void onDraw(@NonNull Canvas canvas) { int floatingLabelStartY = (int) (innerPaddingTop + floatingLabelTextSize + floatingLabelPadding - distance * (floatingLabelAlwaysShown ? 1 : floatingLabelFraction) + getScrollY()); // calculate the alpha - int alpha = ((int) ((floatingLabelAlwaysShown ? 1 : floatingLabelFraction) * 0xff * (0.74f * focusFraction * (isEnabled() ? 1 : 0) + 0.26f) * (floatingLabelTextColor != -1 ? 1 : Color.alpha(floatingLabelTextColor) / 256f))); + int alpha = ((int) ((floatingLabelAlwaysShown ? 1 : floatingLabelFraction) * (0.74f * floatingLabelFraction * (isEnabled() ? 1 : 0) + 0.26f) * (floatingLabelTextColor != -1 ? 0xff : Color.alpha(floatingLabelTextColor)))); textPaint.setAlpha(alpha); // draw the floating label @@ -1525,4 +1525,4 @@ private int checkLength(CharSequence text) { if (lengthChecker==null) return text.length(); return lengthChecker.getLength(text); } -} \ No newline at end of file +}